Commit Graph

210 Commits

Author SHA1 Message Date
Ryan VanderMeulen
7a57c1a082 Backed out changeset d16adf321576 (bug 1077301) for B2G bustage.
CLOSED TREE
2014-10-16 14:38:29 -04:00
Nicolas Silva
1619f4f6ab Bug 1077301 - Simplify the gralloc texture code. r=sotaro 2014-10-16 19:08:32 +02:00
jdashg
bc7e26ddd9 Bug 1066280 - Review fixes. - r=kamidphish,mattwoodrow 2014-10-08 13:04:19 -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
Nicolas Silva
7a57c1cd43 Bug 1077307 - Merge NewTextureSource and TextureSource. r=sotaro 2014-10-07 15:58:59 +02:00
Sotaro Ikeda
58627884b4 Bug 1067455 - Reduce Fence::merge() call on compositor thread r=nical 2014-10-06 15:45:03 -07:00
Phil Ringnalda
8c416baa34 Back out ef1cd14c8cac (bug 1067455) for Windows assertion failures
CLOSED TREE
2014-10-05 19:16:56 -07:00
Sotaro Ikeda
7af905ca5f Bug 1067455 - Reduce Fence::merge() call on compositor thread r=nical 2014-10-05 14:14:33 -07:00
Sotaro Ikeda
a9bf07a253 Bug 1017351 - Handle Sharing GrallocTextureHostOGL among ImageHosts r=nical 2014-09-26 04:30:11 -07:00
Jeff Gilbert
4943991010 Bug 1037147 - Remove SharedTextureHandle and friends r=mattwoodrow,snorp 2014-09-17 08:13:29 -05:00
James Willcox
e07d73a455 Back out a84f9edfe968 for bustage 2014-09-12 14:01:26 -05:00
Jeff Gilbert
63c2e0ad7f Bug 1037147 - Replace SharedTextureHandle with a TextureClient variant r=mattwoodrow,snorp 2014-09-12 13:39:20 -05:00
Matt Woodrow
5731f924c4 Bug 1060114 - Fix partial surface uploading through BufferTextureClient. r=Bas 2014-08-29 15:06:26 +12:00
Milan Sreckovic
e5735c90c6 Bug 1033310: Handle CreateDataSourceSurface* returning nullptr. f=nsilva, r=bschouten 2014-08-27 11:57:43 -04:00
Bas Schouten
4f93ed2797 Bug 1040187: Combine update regions properly when upload hasn't executed yet. r=nical 2014-08-26 13:06:17 +00:00
Sotaro Ikeda
f9084025e5 Bug 1053927 - Add memory leak check to GrallocTextureHostOGL r=nical 2014-08-25 06:45:26 -07:00
Ehsan Akhgari
6ad78acff0 Bug 1050609 - Fix more bad implicit constructors in gfx/layers; r=roc 2014-08-20 00:55:14 -04:00
Nicolas Silva
44f22b99a0 Bug 1043929 - Ensure that a locked TextureHost can give access to a valid TextureSource for some of the texture types. r=Bas 2014-07-28 14:58:38 +02:00
Jeff Muizelaar
5a2a17b5d7 Bug 1041690. ShmTextureHost: Remove unnecessary manual deletion 2014-07-22 16:55:19 -04:00
Jeff Muizelaar
4bb189d002 Bug 1041690. Make ShmemTextureHost's mShmem member a UniquePtr. r=nical
This makes the ownership clear and removes some code.
2014-07-21 18:55:02 -04:00
Bas Schouten
8f04d976d0 Bug 1036785: Use DIBs for drawing when not using opaque surfaces. r=nical 2014-07-10 23:29:40 +02:00
Jeff Gilbert
e9a9e7bc3d Bug 1037151 - Merge SharedSurface_GL into SharedSurface. - r=mattwoodrow 2014-07-11 15:10:49 -07:00
Jeff Gilbert
85dc1d1021 Bug 1030934 - Handle a null-frame update. - r=bas 2014-06-30 15:09:55 -07:00
Benoit Girard
c36e97ca50 Bug 1027496 - Stream display list and layers dump. r=mattwoodrow 2014-06-19 18:36:25 -04: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
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
5bcd509591 Bug 1006957 - WebRTC crash fix r=nical 2014-05-26 10:09:25 -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
Sotaro Ikeda
d5f237884c Bug 950079 - Add release Fence handling to SurfaceStream on gonk 2014-05-14 15:40:15 -07:00
Sotaro Ikeda
1f301915df Bug 1000660 - Remove TextureParent::RecvRemoveTextureSync() r=nical 2014-05-12 18:18:22 -07:00
Sotaro Ikeda
11b8b8da01 Bug 984434 - Change ImageBridgeChild::FlushAllImages() to use async ipc r=nical 2014-05-12 07:39:25 -07:00
Sotaro Ikeda
b226cd7960 Bug 1000525 - Defer Fence release until IPC delivery complete r=nical 2014-05-05 18:56:40 -07: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
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
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
Sotaro Ikeda
c96495636b Bug 990080 - Prepare for the next reycle, only if TextureClient request it r=BenWa 2014-04-11 17:42:35 -07:00
Matt Woodrow
463de89741 Bug 904890 - Part 5: Add a d3d9 texture host for DXGI surfaces. r=nical 2014-04-07 15:23:06 +12:00
Matt Woodrow
ea5c198fb6 Bug 991028 - Remove deprecated IPDL SurfaceDescriptor types. r=nical 2014-04-07 13:32:49 +12:00
Phil Ringnalda
9724e72fe9 Backed out 4 changesets (bug 991028) for nonunified bustage
CLOSED TREE

Backed out changeset 147581a518c3 (bug 991028)
Backed out changeset e5bacc566e58 (bug 991028)
Backed out changeset 6dc852777a4d (bug 991028)
Backed out changeset 780bec5571b9 (bug 991028)
2014-04-06 21:21:38 -07:00
Matt Woodrow
f63bc4cb77 Bug 991028 - Remove deprecated IPDL SurfaceDescriptor types. r=nical 2014-04-07 13:32:49 +12:00
Nicolas Silva
6fe09cdc9a Bug 989904 - Remove the remaining deprecated textures code. r=mattwoodrow 2014-04-03 14:04:04 +08:00