Commit Graph

1048 Commits

Author SHA1 Message Date
James Willcox
ff11ba4baf Bug 1014614 - Add GLBlitHelper::BlitImageToFramebuffer and support SurfaceTexture images r=jgilbert
--HG--
extra : rebase_source : e823897f3ff6593af7286432903618dc483877dd
2014-10-21 08:53:02 -05:00
James Willcox
c71c99d61f Bug 1014614 - Support attach/detach of GLContext to AndroidSurfaceTexture r=jgilbert
--HG--
extra : rebase_source : f8ac8c505b5f9a4f307044b932aef50b99d38d4f
2014-10-21 08:53:01 -05:00
James Willcox
bde370d6d2 Bug 1014614 - Expose Android native window via AndroidNativeWindow wrapper r=blassey
--HG--
extra : rebase_source : e8fef05b2fdc3ef2b7c43a01655f2c7bf3789208
2014-10-21 08:53:00 -05:00
James Willcox
ffcd3c3420 Bug 1014614 - Expose more SurfaceTexture API in AndroidSurfaceTexture r=blassey
--HG--
extra : rebase_source : 863f769375474b486ca55d649e7ed332efbef6fe
2014-10-21 08:53:00 -05:00
James Willcox
c4d4f1478e Bug 1014614 - Rename nsSurfaceTexture to AndroidSurfaceTexture r=jgilbert
--HG--
extra : rebase_source : 4f148d8a0c2f9ec2d939f9d9939dab897b435bef
2014-10-21 08:53:00 -05:00
Mike Hommey
a4e5d75302 Fixup bug 1084696 on a busted tree. r=me 2014-10-18 16:14:45 +09:00
Jeff Gilbert
48c46c05ca Bug 1084696 - Actually use the RAII helper for locking the DrawTarget. - r=kamidphish 2014-10-17 21:31:27 -07:00
Wes Kocher
a074f0af18 Backed out 9 changesets (bug 1014614) for Android mochitest bustage on a CLOSED TREE
Backed out changeset 40f99ba7f616 (bug 1014614)
Backed out changeset 8fbc3c85adfc (bug 1014614)
Backed out changeset 40dbd7c6ce65 (bug 1014614)
Backed out changeset f2b504bdd7c5 (bug 1014614)
Backed out changeset c878e29fbef9 (bug 1014614)
Backed out changeset 511dcc817f5d (bug 1014614)
Backed out changeset 2b72e71f1fdf (bug 1014614)
Backed out changeset 8b530a9a2f99 (bug 1014614)
Backed out changeset 7fa1b78de684 (bug 1014614)
2014-10-17 16:34:01 -07:00
Wes Kocher
b9f04fe4f1 Backed out changeset 869a28961b5c (bug 1084514) 2014-10-17 16:33:35 -07:00
Ralph Giles
7bd68ff089 Bug 1084514 - Fix AndroidSourceTexture namespace issues. r=dholbert CLOSED TREE
This worked in the unified build because it borrowed includes
and namespace references from other files.
2014-10-17 11:31:00 -07:00
James Willcox
ca5589094b Bug 1014614 - Add GLBlitHelper::BlitImageToFramebuffer and support SurfaceTexture images r=jgilbert
--HG--
extra : rebase_source : 2718fddef7754bb84ef893fc81f175d963b01760
extra : histedit_source : efba21204779c8995e55623ca398d3f0b8336c31
2014-10-17 10:35:13 -05:00
James Willcox
849fe663e7 Bug 1014614 - Support attach/detach of GLContext to AndroidSurfaceTexture r=jgilbert
--HG--
extra : rebase_source : b309ea1761abdb26261fe8f2eda03de66952c018
2014-10-17 10:35:11 -05:00
James Willcox
537fa24fe0 Bug 1014614 - Expose more SurfaceTexture API in AndroidSurfaceTexture r=blassey
--HG--
extra : rebase_source : b6ee26cf973e7d4821fefbcd3b8dba0585779d86
2014-10-17 10:35:10 -05:00
James Willcox
a935256483 Bug 1014614 - Expose Android native window via AndroidNativeWindow wrapper r=blassey
--HG--
extra : rebase_source : a2d27a4223c1bd1189c4c6a32431cc306a3e93c6
2014-10-17 10:35:10 -05:00
James Willcox
102235ca35 Bug 1014614 - Rename nsSurfaceTexture to AndroidSurfaceTexture r=jgilbert
--HG--
extra : rebase_source : 70d12286eb15808a4a540bae0d6785e560e97b29
2014-10-17 10:35:10 -05:00
Jeff Muizelaar
20b8931e29 Bug 1070308. Add Acquire and Release semantics to SharedSurface. r=jgilbert
This is needed for D3D11 keyed mutex support. The added assertions
also ensure we're doing things at the right times.

--HG--
extra : rebase_source : 7af4dccca745ee62e4ae97972de8a8eb83f2e8d3
2014-10-09 16:33:22 -04:00
Benoit Jacob
012dfb0c0a Bug 1083936 - WebGL2: Add texImage3D - r=jgilbert,smaug 2014-10-16 22:03:34 -04:00
Chris Jones
da7f85e29b Bug 1082902 - Make it possible to have GL debugging in release builds. r=jgilbert 2014-10-14 18:24:53 -07:00
Jim Chen
e31fbbaeaa Bug 1077662 - Label GL calls in profiler; r=snorp 2014-10-14 23:20:16 -04:00
Jeff Gilbert
6771bde885 Bug 1081363 - Don't do readback eagerly in ShSurf_Basic. - r=kamidphish 2014-10-10 14:36:17 -07:00
David Anderson
e8609c1ba4 WebGL2: Implement invalidateFramebuffer and invalidateSubFramebuffer (bug 1076456, r=jgilbert).
--HG--
extra : rebase_source : 5ce9c956475388896fe193ca37c9595978adf15c
2014-10-14 14:49:49 -07:00
Dan Glastonbury
59fee7075c Bug 1081666 - Fix detection of ARB_transform_feedback2 GL extension.; r=jgilbert
--HG--
extra : rebase_source : da5cfd6bc33a5d7c99aadd6edd20e4b6c1999865
2014-10-13 12:26:16 +10:00
Benoit Jacob
42de88496d Bug 1081125 - WebGL2 3D textures - Part 2: update our texture state tracking to handle 3D textures - r=jgilbert 2014-10-13 19:42:20 -04:00
Jeff Gilbert
bae4221d52 Bug 1066280 - Fix non-unified bustage. CLOSED TREE 2014-10-10 13:57:19 -07:00
jdashg
7eaef7f7e5 Bug 1066280 - Review fixes. - r=kamidphish,mattwoodrow 2014-10-08 13:04:19 -07:00
jdashg
48843827a7 Bug 1066280 - Fixes for SurfaceStream removal. - r=kamidphish,mattwoodrow 2014-10-07 21:16:14 -07:00
jdashg
04beb50da5 Bug 1066280 - Remove SurfaceStream. - r=kamidphish,mattwoodrow 2014-10-07 21:15:39 -07:00
jdashg
4e9300d191 Bug 1066280 - Fixes. - r=kamidphish,mattwoodrow
From 4e9f52ab105333e8b1120342e9583b2d833a4465 Mon Sep 17 00:00:00 2001
---
 dom/canvas/WebGLContext.cpp                | 10 +++++--
 gfx/gl/GLContext.cpp                       | 20 --------------
 gfx/gl/GLContext.h                         |  3 --
 gfx/gl/GLReadTexImageHelper.cpp            |  5 +++-
 gfx/gl/GLScreenBuffer.cpp                  | 13 +++++++--
 gfx/gl/GLUploadHelpers.cpp                 | 27 ++++++++++++++++++
 gfx/gl/SharedSurfaceGralloc.cpp            | 14 ++++------
 gfx/gl/SharedSurfaceGralloc.h              | 10 +++++--
 gfx/gl/SurfaceTypes.cpp                    |  2 ++
 gfx/gl/SurfaceTypes.h                      |  1 +
 gfx/layers/client/CanvasClient.cpp         | 44 ++++++++++++++++++------------
 gfx/layers/client/CanvasClient.h           |  8 +++---
 gfx/layers/client/ClientCanvasLayer.cpp    |  6 ++++
 gfx/layers/client/ClientCanvasLayer.h      |  2 +-
 gfx/layers/client/TextureClient.cpp        | 11 ++++----
 gfx/layers/client/TextureClient.h          |  6 ++--
 gfx/layers/composite/TextureHost.cpp       | 15 +++++-----
 gfx/layers/composite/TextureHost.h         | 10 +++----
 gfx/layers/d3d10/CanvasLayerD3D10.cpp      |  9 ++++--
 gfx/layers/d3d9/CanvasLayerD3D9.cpp        |  8 ++++--
 gfx/layers/ipc/LayersSurfaces.ipdlh        |  4 +--
 gfx/layers/moz.build                       |  4 ++-
 gfx/layers/opengl/GrallocTextureClient.cpp | 26 +++++++++++++++++-
 gfx/layers/opengl/GrallocTextureClient.h   |  3 ++
 24 files changed, 171 insertions(+), 90 deletions(-)
2014-10-07 21:11:54 -07:00
jdashg
2a692a2b9c Bug 1066280 - Add TexClient for ShSurf. - r=kamidphish,mattwoodrow
From a7c09c0f17e19fd2254cb1d7a8ddd07b327151ad Mon Sep 17 00:00:00 2001
---
 gfx/2d/HelpersCairo.h                   |   2 +
 gfx/gl/GLContext.cpp                    |   3 +-
 gfx/gl/GLContext.h                      |   2 -
 gfx/gl/GLReadTexImageHelper.cpp         |  21 +--
 gfx/gl/GLReadTexImageHelper.h           |   6 +
 gfx/gl/GLScreenBuffer.h                 |   6 +-
 gfx/gl/ScopedGLHelpers.cpp              |  40 +++++
 gfx/gl/ScopedGLHelpers.h                |  26 ++-
 gfx/gl/SharedSurface.cpp                |  94 +++++++++++
 gfx/gl/SharedSurface.h                  |  19 +++
 gfx/gl/SharedSurfaceIO.h                |   4 +
 gfx/layers/CopyableCanvasLayer.cpp      |   3 +-
 gfx/layers/client/CanvasClient.cpp      | 276 +++++++++++++++++++++++++++++---
 gfx/layers/client/CanvasClient.h        |  34 ++++
 gfx/layers/client/ClientCanvasLayer.cpp |  21 ++-
 gfx/layers/client/ClientCanvasLayer.h   |   9 +-
 gfx/layers/client/TextureClient.cpp     |  35 ++++
 gfx/layers/client/TextureClient.h       |  85 +++++++++-
 gfx/layers/composite/TextureHost.cpp    | 131 ++++++++++++++-
 gfx/layers/composite/TextureHost.h      |  64 ++++++++
 gfx/layers/d3d10/CanvasLayerD3D10.cpp   |   5 +-
 gfx/layers/ipc/LayersSurfaces.ipdlh     |   5 +
 22 files changed, 828 insertions(+), 63 deletions(-)
2014-10-07 21:01:51 -07:00
jdashg
b34e879eb0 Bug 1066280 - Implement GLScreenBuffer simplification. - r=kamidphish
From 2aa5dfd3c1e0ef8d8033ad1daf864455fb01f87b Mon Sep 17 00:00:00 2001
---
 gfx/gl/GLScreenBuffer.cpp | 70 +++++++++++++++++++++++------------------------
 gfx/gl/GLScreenBuffer.h   | 36 ++++++++----------------
 2 files changed, 45 insertions(+), 61 deletions(-)
2014-10-07 21:01:07 -07:00
jdashg
7fdc437010 Bug 1066280 - Implement ShSurfHandle. - r=kamidphish
From 09b5a1bc279f051e1e491b33e20a5b492ea7ef51 Mon Sep 17 00:00:00 2001
---
 gfx/gl/SharedSurface.cpp | 10 ++++++++++
 gfx/gl/SharedSurface.h   | 38 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)
2014-10-07 20:59:37 -07:00
jdashg
eefb25b36a Bug 1080296 - Clear out glGetError after checking it. - r=kamidphish 2014-10-07 15:17:42 -07:00
Matt Woodrow
c54d31d14c Bug 1078109 - Make sure we initialize tiled textures to the format we're going to upload with. r=jgilbert
--HG--
extra : rebase_source : a779c602a9ef55f8a36e0e5886302f3d3d9624f0
2014-10-08 13:10:59 +13:00
Benoit Jacob
9fc8a1b4bc Bug 1077183 - Untangle the confusion between effective and unsized internalformats in the WebGL implementation - r=jgilbert 2014-10-07 19:52:58 -04:00
Vladimir Vukicevic
03d8b2d53c Bug 912196. Add support for ANGLE D3D11 path. r=jgilbert
There are currently problems with the color format chosen
which breaks MSAA resolution. But we might as well land this
now.

--HG--
extra : rebase_source : 1287e5c059e263d03b0d612ce5cf17e93bc5b033
2014-04-03 13:29:22 +08:00
Dan Glastonbury ext:(%20and%20Benoit%20Jacob%20%3Cbjacob%40mozilla.com%3E)
913c3a5c89 Bug 1075195 - WebGL2: implement texStorage2D - r=bjacob,djg 2014-07-15 09:55:56 +10:00
Jeff Gilbert
101160baec Bug 1048108 - Don't require alpha on ANGLE. - r=kamidphish 2014-10-01 17:05:34 -07:00
Jeff Gilbert
6bc5648c2b Bug 1048108 - Actually iterate through configs. - r=kamidphish 2014-10-01 17:05:33 -07:00
Dan Glastonbury
5a4670ae49 Bug 1048747 - WebGL2 - GL symbols for GetIntegeri_v and GetInteger64i_v.; r=jgilbert
--HG--
extra : rebase_source : d4c5a1a6e4a5c6f772a4f69c2ff3edab50d0d6e4
extra : source : 9929d6519682ca1b0dac4e7390349a2254d711c5
2014-05-27 20:21:30 +10:00
Wes Kocher
924010ceed Backed out 2 changesets (bug 1048108) for b2g build bustage
Backed out changeset dc8fac10012d (bug 1048108)
Backed out changeset 5da1e1c4c706 (bug 1048108)
2014-09-25 16:33:28 -07:00
Jeff Gilbert
43c71fe2b6 Bug 1048108 - Actually iterate through configs. - r=kamidphish 2014-09-25 16:00:43 -07:00
Dan Glastonbury
1760781406 Bug 1048741 - WebGL2 - GL symbols for texture storage.; r=jgilbert 2014-09-23 15:49:19 +10:00
Jeff Gilbert
feb7643d1e Bug 1048108 - Exclude RGBA configs when alpha:false. - r=kamidphish 2014-09-24 16:42:27 -07:00
Carsten "Tomcat" Book
b378e812bf Backed out changeset 231c5214e07c (bug 1048741) for crashtest and m2 test failures on a CLOSED TREE 2014-09-24 08:15:19 +02:00
Dan Glastonbury
dbd1edb471 Bug 1048741 - WebGL2 - GL symbols for 3D textures.; r=jgilbert
--HG--
extra : rebase_source : f1ab1982187f5c611a0f13fbcdb38414b2fe8942
2014-09-23 15:50:10 +10:00
Dan Glastonbury
24be65d689 Bug 1048741 - WebGL2 - GL symbols for texture storage.; r=jgilbert
--HG--
extra : rebase_source : 4465ba102179f3ae338f19632d77547686df0220
2014-09-23 15:49:19 +10:00
Dan Glastonbury
41848793bf Bug 1048724 - WebGL2 - GL symbols for Transform Feedback.; r=jgilbert
--HG--
extra : rebase_source : f47b2a8203b0dc23dd871987c2b2f7dae28b2723
extra : source : a0ecb0468b8a2998b676da63678938d9f9d58f52
2014-09-23 15:47:28 +10:00
Dan Glastonbury
423c48f63d Bug 1048745 - WebGL2 - GL symbols for gpu_shader_4.; r=jgilbert
--HG--
extra : rebase_source : 9da56a67fc59ef27a8ff28e960bfc1175a6fc936
extra : source : 0c1b303c73fa1f7dad836235d4916ae6b618bfe2
2014-09-23 15:27:55 +10:00
Dan Glastonbury
406dbe957b Bug 1048745 - WebGL2 - GL symbols for VertexAttribI.; r=jgilbert
--HG--
extra : rebase_source : 57ceb97a1f21c85427c8108ea7ff41f93fe24789
extra : source : 0d1c61620e601c851f61cd062e42204c2e50e3e0
2014-09-23 15:38:01 +10:00
Dan Glastonbury
2d90864858 Bug 1048745 - WebGL2 - GL symbols for uniformui & non-square uniform matrix.; r=jgilbert
--HG--
extra : rebase_source : bd47b6bbde06ba7f8a945aa55f751d8a3c074946
extra : source : 5b135f5f9492b2606c593ad0c800488f6a51274c
2014-09-23 15:33:55 +10:00