Commit Graph

141 Commits

Author SHA1 Message Date
Ethan Lin
0e3c3ed07d Bug 1042696 - Set allocator to TextureClient from constructor. r=nical 2014-12-22 03:49:00 -05:00
Nicolas Silva
fceeb7a2e3 Bug 1110268 - avoid crashing in canvas code when failing to allocate a frame. r=Bas. 2014-12-18 19:28:16 +01:00
Bas Schouten
55948b2feb Bug 1088414: Use a single synchronization texture for D3D11. r=jrmuizel
This patch adds a cross platform 'sync object' that is used to synchronize the drawing of individual textures. For the D3D11 implementation all textures that are written to will have one pixel copied into the D3D11 sync texture while holding its lock. The compositor will then, before composition acquire and release sync once, this should ensure all drawing on the content side has completed.
2014-12-13 01:50:47 +00:00
Wes Kocher
84deca1a09 Backed out changeset 2cd43e5ae2c1 (bug 1088414) for breaking non-Windows builds on a CLOSED TREE 2014-12-12 18:11:59 -08:00
Bas Schouten
0ca40e581f Bug 1088414: Use a single synchronization texture for D3D11. r=jrmuizel
This patch adds a cross platform 'sync object' that is used to synchronize the drawing of individual textures. For the D3D11 implementation all textures that are written to will have one pixel copied into the D3D11 sync texture while holding its lock. The compositor will then, before composition acquire and release sync once, this should ensure all drawing on the content side has completed.
2014-12-13 01:50:47 +00:00
Nicolas Silva
36a576bead Bug 1102917 - Remove the TextureInfo member from client compositables. r=sotaro 2014-11-25 20:19:13 +01:00
Sotaro Ikeda
578bd6996f Bug 1093728 - Add AddTextureClient() to CanvasClientSharedSurface::Update() r=nical 2014-11-05 08:15:48 -08:00
Ehsan Akhgari
22d38b6803 Bug 1088838 - Don't export CompositorChild.h, CompositorParent.h and ShadowLayersManager.h twice; r=BenWa 2014-10-27 08:57:36 -04:00
jdashg
bc7e26ddd9 Bug 1066280 - Review fixes. - r=kamidphish,mattwoodrow 2014-10-08 13:04:19 -07:00
jdashg
7faaf9266c Bug 1066280 - Fixes for SurfaceStream removal. - r=kamidphish,mattwoodrow 2014-10-07 21:16:14 -07:00
jdashg
f4e7d402a7 Bug 1066280 - Remove SurfaceStream. - r=kamidphish,mattwoodrow 2014-10-07 21:15:39 -07:00
jdashg
fd685b2322 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
e48648f8ea 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
Jeff Gilbert
4237c2e5cb Bug 1049957 - Use UniquePtr for SharedSurface, SurfaceFactory. - r=kamidphish 2014-08-15 17:38:08 -07:00
Jeff Gilbert
e9a9e7bc3d Bug 1037151 - Merge SharedSurface_GL into SharedSurface. - r=mattwoodrow 2014-07-11 15:10:49 -07:00
Nicolas Silva
985c0c65af Bug 1027601 - Create and allocate TextureClient in a single step in some of the cases. r=sotaro 2014-07-10 13:45:40 +02:00
Carsten "Tomcat" Book
7bf031036d Backed out changeset e072a46f0b6a (bug 1027601) for test bustages on a CLOSED TREE 2014-07-09 13:23:08 +02:00
Carsten "Tomcat" Book
d9eddca0d3 Backed out changeset ba77f00867e8 (bug 1027601) 2014-07-09 13:22:47 +02:00
Nicolas Silva
329f071d17 Bug 1027601 - Build fix on a CLOSED TREE 2014-07-09 12:23:38 +02:00
Nicolas Silva
2b5d60e4a8 Bug 1027601 - Create and allocate TextureClients in a single step in some cases. r=sotaro 2014-07-09 11:59:49 +02:00
Jeff Gilbert
b8791ff2a1 Bug 1000640 - Crash if we try to use the Gralloc path in TextureHost. - r=mattwoodrow 2014-06-18 17:04:06 -07:00
Jeff Gilbert
6b722909fc Bug 1000640 - Use new StreamTextureClient/Host with OMTC. - r=mattwoodrow 2014-06-18 17:04:06 -07:00
Sotaro Ikeda
3912807ace Bug 1022167 - Ensure fence delivery of thebes layer in b2g process r=nical 2014-06-18 12:13:27 -07:00
Nicolas Silva
dc075c6966 Bug 1023350 - Rename TextureClient::GetAsDrawTarget into TextureClient::BorrowDrawTarget and fix TextureClientX11. r=bjacob 2014-06-11 14:57:58 -04:00
Nicolas Silva
2b19aa2a5a Bug 1008211 - Don't use CreateBufferTextureClient with CanvasClient2D on Windows. r=bas 2014-06-10 14:02:16 -04:00
Sotaro Ikeda
998892d3ad Bug 1001417 - Forward fence objects in SharedSurfaceGralloc to Compositor r=jgilbert,nical 2014-06-08 06:18:53 -07:00
Sotaro Ikeda
bfb70c0a66 Bug 1019877 - fix deadlock at AsyncTransactionTrackersHolder r=nical 2014-06-05 07:24:05 -07:00
Wes Kocher
5de84ad908 Backed out changeset 3a764e34c366 (bug 1000640) 2014-06-04 18:27:22 -07:00
Jeff Gilbert
c1ad500e63 Bug 1000640 - Use new StreamTextureClient/Host with OMTC. - r=mattwoodrow 2014-06-04 15:20:26 -07:00
Sotaro Ikeda
272c9282a9 Bug 1006957 - Handle buffer ownership between SurfaceStream and CanvasClient r=nical 2014-05-24 09:14:45 -07:00
Steve Fink
278d129227 Backed out changeset 171edffe0641 (bug 1006957) for crash at BaseAutoLock<mozilla::Mutex>::BaseAutoLock(mozilla::Mutex&) from layers::AsyncTransactionTrackersHolder::ClearAllAsyncTransactionTrackers on a CLOSED TREE 2014-05-23 21:16:02 -07:00
Sotaro Ikeda
e3ea215fb9 Bug 1006957 - Handle buffer ownership between SurfaceStream and CanvasClient r=nical 2014-05-23 17:52:43 -07:00
Nicolas Silva
d206f42072 Bug 1010969 - Call RemoveTextureFromCompositable at the end of updates. r=sotaro 2014-05-16 17:25:23 +02:00
Ryan VanderMeulen
be6ccfea53 Revert to revision 63dfac3c9c87 due to mass bustage pile-ups that landed after it on a CLOSED TREE. 2014-05-16 12:29:37 -04:00
Nicolas Silva
256412874c Bug 1010969 - Call RemoveTextureFromCompositable at the end of updates. r=sotaro 2014-05-16 17:25:23 +02:00
Nicolas Silva
67654198bb Bug 1008211 - Backed out changeset 4e1e052624c2 because of a regression on B2G 2014-05-16 14:22:46 +02:00
Bas Schouten
04609e4e8a Bug 1008729: Use Cairo DrawTargets when reading back from GL. r=nical 2014-05-15 00:31:23 +02:00
Nicolas Silva
282a928246 Bug 1008211 - Don't use BufferTextureClient in CanvasClient2D. r=Bas 2014-05-13 14:05:30 +02:00
Benoit Jacob
6f2d2f66cd Bug 987311 - 5/6 - Convert the rest of CompositorTypes.h to typed enums, auto regex changes - r=nical
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)DIAGNOSTIC_\(NONE\|TILE_BORDERS\|LAYER_BORDERS\|BIGIMAGE_BORDERS\|FLASH_BORDERS\)\($\|[^A-Za-z0-9_]\)/\1DiagnosticTypes::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/DiagnosticTypes\:\:NONE/DiagosticTypes::NO_DIAGNOSTIC/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)DIAGNOSTIC_\(IMAGE\|CONTENT\|CANVAS\|COLOR\|CONTAINER\|TILE\|BIGIMAGE\|COMPONENT_ALPHA\|REGION_RECT\)\($\|[^A-Za-z0-9_]\)/\1DiagnosticFlags::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)EFFECT_\(MASK\|MAX_SECONDARY\|RGB\|YCBCR\|COMPONENT_ALPHA\|SOLID_COLOR\|RENDER_TARGET\|MAX\)\($\|[^A-Za-z0-9_]\)/\1EffectTypes::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)TEXTURE_\(CONTENT\|SHMEM\|YCBCR\|SHARED_GL\|SHARED_GL_EXTERNAL\|STREAM_GL\|FALLBACK\)\($\|[^A-Za-z0-9_]\)/\1DeprecatedTextureClientType::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(BUFFER_UNKNOWN\|BUFFER_IMAGE_SINGLE\|BUFFER_IMAGE_BUFFERED\|BUFFER_BRIDGE\|BUFFER_CONTENT\|BUFFER_CONTENT_DIRECT\|BUFFER_CONTENT_INC\|BUFFER_TILED\|BUFFER_SIMPLE_TILED\|COMPOSITABLE_IMAGE\|COMPOSITABLE_CONTENT_SINGLE\|COMPOSITABLE_CONTENT_DOUBLE\|BUFFER_COUNT\)\($\|[^A-Za-z0-9_]\)/\1CompositableType::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/CompositableType\:\:COMPOSITABLE_/CompositableType::/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)TEXTURE_HOST_\(DEFAULT\|TILED\|COPY_PREVIOUS\)\($\|[^A-Za-z0-9_]\)/\1DeprecatedTextureHostFlags::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)Texture\(Front\|Back\|OnWhiteFront\|OnWhiteBack\)\($\|[^A-Za-z0-9_]\)/\1TextureIdentifier::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(OPEN_NONE\|OPEN_READ\|OPEN_WRITE\|OPEN_READ_WRITE\|OPEN_READ_ONLY\|OPEN_WRITE_ONLY\)\($\|[^A-Za-z0-9_]\)/\1OpenMode::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(MaskNone\|Mask2d\|Mask3d\|NumMaskTypes\)\($\|[^A-Za-z0-9_]\)/\1MaskType::\2\3/g'
find gfx -type f | xargs sed -i 's/Diagostic/Diagnostic/g'
2014-04-25 22:34:06 -04:00
Benoit Jacob
849b6bea23 Bug 987311 - 3/6 - Make TextureFlags a typed enum, final manual changes - r=nical 2014-04-25 22:34:05 -04:00
Benoit Jacob
3de8fa4fb5 Bug 987311 - 2/6 - Make TextureFlags a typed enum, auto regex changes - r=nical
find gfx/layers -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)TEXTURE_\(USE_NEAREST_FILTER\|NEEDS_Y_FLIP\|DISALLOW_BIGIMAGE\|ALLOW_REPEAT\|NEW_TILE\|COMPONENT_ALPHA\|RB_SWAPPED\|FRONT\|ON_WHITE\|ON_BLACK\|TILE\|RECYCLE\|COPY_PREVIOUS\|DEALLOCATE_CLIENT\|IMMUTABLE\|IMMEDIATE_UPLOAD\|DOUBLE_BUFFERED\|ALLOC_FALLBACK\)\($\|[^A-Za-z0-9_]\)/\1TextureFlags::\2\3/g'
find gfx/layers -type f | xargs sed -i 's/TEXTURE_FLAGS_DEFAULT/TextureFlags::DEFAULT/g'
2014-04-25 22:34:05 -04:00
Blair McBride
2628f554b1 Backed out 9 changesets (bug 987311, bug 989027, bug 989144). r=sheriff
Backed out changeset 046c061d91c2 (bug 989144)
Backed out changeset 3f1b41adeaef (bug 987311)
Backed out changeset 8d5a171564bd (bug 987311)
Backed out changeset dcc0d016de7a (bug 987311)
Backed out changeset 27f338fbc835 (bug 989027)
Backed out changeset 4a67f5144ea4 (bug 989027)
Backed out changeset 62ba0a377450 (bug 987311)
Backed out changeset 6a2542a5c865 (bug 987311)
Backed out changeset 1dfd9a457f34 (bug 987311)
2014-04-27 19:45:08 +12:00
Benoit Jacob
3b4f604917 Bug 987311 - 5/6 - Convert the rest of CompositorTypes.h to typed enums, auto regex changes - r=nical 2014-04-25 22:34:06 -04:00
Benoit Jacob
dc2f2c47c0 Bug 987311 - 3/6 - Make TextureFlags a typed enum, final manual changes - r=nical 2014-04-25 22:34:05 -04:00
Benoit Jacob
1960158bd9 Bug 987311 - 2/6 - Make TextureFlags a typed enum, auto regex changes - r=nical 2014-04-25 22:34:05 -04:00
Jonathan Watt
55c20bd03b Bug 996901 - Remove lots of gfxASurface.h and gfxImageSurface.h includes and forward declarations that are no longer needed. r=mattwoodrow 2014-04-16 01:41:40 +01:00
Nicolas Silva
9b40141ba1 Bug 990876 - Remove TextureClientSurface. r=mattwoodrow 2014-04-14 21:29:42 +02:00
Nicolas Silva
fd477b6661 Bug 994024 - Discard TextureClients that we failed to allocate or lock. r=bjacob 2014-04-11 18:48:10 +02:00
Nicolas Silva
dca99e78f0 Bug 990871 - Move TextureClientDrawTarget into TextureClient. r=mattwoodrow 2014-04-10 10:14:28 +02:00
Carsten "Tomcat" Book
5adb9c9e75 Backed out changeset 3747c80a1cde (bug 990871) for bustage on a CLOSED TREE 2014-04-10 13:15:47 +02:00