Commit Graph

190 Commits

Author SHA1 Message Date
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
469c52e3f9 Bug 1061699 - Only crash debug builds if BorrowDrawTarget is called on an unlocked TextureClient. r=Bas 2014-09-16 14:32:24 +02:00
Jeff Muizelaar
15cef6b1bb Bug 1062492. Only use DIBTextureClient with cairo drawing. r=bas
We don't want DIBTextureClient unless we're going to be using cairo for
drawing.
2014-09-08 17:18:04 -04:00
Matt Woodrow
059026bca8 Bug 1059033 - Part 4: Avoid recreating DrawTargets too often. r=nical 2014-09-03 09:20:56 +12:00
Phil Ringnalda
c4fecf2e67 Backed out 8 changesets (bug 982338, bug 1057212, bug 1059033) for build bustage
CLOSED TREE

Backed out changeset 4df1bd30364d (bug 982338)
Backed out changeset b68664a02904 (bug 1057212)
Backed out changeset 07b3695aa02f (bug 1059033)
Backed out changeset bb3885b57d48 (bug 1059033)
Backed out changeset 76897f52ac2c (bug 1059033)
Backed out changeset 31e89a2a409f (bug 1059033)
Backed out changeset 8e81f6f74182 (bug 1059033)
Backed out changeset c5bbf22f2f28 (bug 1059033)
2014-09-01 18:07:57 -07:00
Matt Woodrow
28c78475e8 Bug 1059033 - Part 4: Avoid recreating DrawTargets too often. r=nical 2014-09-02 12:35:10 +12:00
Phil Ringnalda
f22588c601 Backed out 8 changesets (bug 1057212, bug 1059033) for Windows build bustage
CLOSED TREE

Backed out changeset a54dbdca597b (bug 1059033)
Backed out changeset d8d79e4fbfc4 (bug 1059033)
Backed out changeset 87494588e493 (bug 1057212)
Backed out changeset 3e4105ea0a73 (bug 1059033)
Backed out changeset e59430ea4256 (bug 1059033)
Backed out changeset 301fdfea8fbf (bug 1059033)
Backed out changeset 1ef5a3a9bb06 (bug 1059033)
Backed out changeset a7eaac164c36 (bug 1059033)
2014-08-31 23:55:31 -07:00
Matt Woodrow
31a3d01eed Bug 1059033 - Part 4: Avoid recreating DrawTargets too often. r=nical 2014-09-01 15:22:57 +12:00
Kartikaya Gupta
2383d93a79 Bug 1055605 - Replace MOZ_ANDROID_OMTC with MOZ_WIDGET_ANDROID. r=BenWa 2014-08-22 15:26:56 -04:00
Bas Schouten
94f8ce2d0c Bug 947781 - Part 2: Add the ability to readback texture data to TextureClient. r=nical 2014-07-30 15:38:46 +02:00
Ed Morley
01f678a316 Backed out changeset c4ecea1452e9 (bug 947781) 2014-07-30 14:54:08 +01:00
Bas Schouten
fba89a7b36 Bug 947781 - Part 2: Add the ability to readback texture data to TextureClient. r=nical 2014-07-30 15:38:46 +02:00
Nicolas Silva
1d8fc4d3aa Bug 1043389 - Remove TextureFlags::ALLOC_FALLBACK and handle fallback in the creation function directly. r=sotaro 2014-07-29 13:16:57 +02:00
Nicolas Silva
f8d771a884 Bug 1042052 - Add TextureClient::CreateSimilar and have component alpha buffer be of the same type. r=sotaro 2014-07-25 11:24:46 +02:00
Nicolas Silva
6c15014118 Bug 1015718 - Keep the client-side D3D11 texture alive longer so that its destruction does not race with its deserialization. r=bas 2014-07-22 17:49:05 +02:00
Nicolas Silva
208aa83c35 Bug 1040028 - Create and allocate in one step when we used to call CreateBufferTextureClient and CreateTextureClientForDrawing. r=sotaro 2014-07-22 14:17:31 +02: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
Corentin Wallez
e481199fca Bug 1021637: remove unnecessary includes in TextureClient.cpp. r=nical 2014-07-15 09:59:34 +02:00
Jeff Gilbert
e9a9e7bc3d Bug 1037151 - Merge SharedSurface_GL into SharedSurface. - r=mattwoodrow 2014-07-11 15:10:49 -07:00
Nicolas Silva
369e329cca Bug 1027601 - Create and Allocate TextureClients in a single step in SharedPlanarYCbCrImage. r=sotaro 2014-07-10 13:48:29 +02: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
425aa7ee75 Backed out changeset ef24cd472cfb (bug 1027601) 2014-07-09 13:22:50 +02:00
Nicolas Silva
a2717d608b Bug 1027601 - Create and Allocate TextureClients in a single step in SharedPlanarYCbCrImage. r=sotaro 2014-07-09 11:59:53 +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
Sotaro Ikeda
a14aa64967 Bug 1029719 - Release TextureClient on correct thread r=jmuizelaar 2014-06-27 06:26:51 -07:00
Benoit Jacob
d895989aed Bug 1027251 - Fix or whitelist dangerous public destructors in gfx/ - r=jrmuizel 2014-06-18 22:28:59 -04:00
Jeff Gilbert
6b722909fc Bug 1000640 - Use new StreamTextureClient/Host with OMTC. - r=mattwoodrow 2014-06-18 17:04:06 -07:00
Bas Schouten
7c209d842b Bug 1019909: Properly initialize white buffer to white. r=nical 2014-06-18 00:55:31 +02: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
Ed Morley
2274be649a Backed out changeset c4681bf6680c (bug 1000640) 2014-06-11 17:07:10 +01:00
Jeff Gilbert
3ac9e2c958 Bug 1000640 - Use new StreamTextureClient/Host with OMTC. - r=mattwoodrow 2014-06-04 15:20:26 -07:00
Chris Lord
1e5e7dea16 Bug 1011572 - Only do platform-sync on layer transactions when !IsSameProcess. r=nical
There's no need to do platform syncing when the compositor is in the same
process as the content thread, as they'll share a connection to the display
server.
2014-06-11 14:52:20 +01:00
Chris Lord
46041cdb7a Bug 1011569 - Remove PreferMemoryOverShmem in favour of IsSameProcess. r=nical 2014-06-11 14:52:19 +01: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
b913310465 Bug 1014360 - memory leak when DEALLOCATE_CLIENT is set r=nical 2014-05-28 13:37:13 -07:00
Nicolas Silva
8a0c258ce9 Bug 1013292 - Fix some using namespace + unified build issues in gfx code. r=kats 2014-05-22 12:11:45 +02:00
Carsten "Tomcat" Book
670f72d234 Backed out changeset a6f85ff386c1 (bug 1011569) for m5 test failures on OS X 2014-05-19 13:46:02 +02:00
Chris Lord
8a939b2610 Bug 1011569 - Remove PreferMemoryOverShmem in favour of IsSameProcess. r=nical 2014-05-19 10:45:12 +01:00
Sotaro Ikeda
49e7b8aab1 Bug 971946 - Remove TextureClientData r=nical 2014-05-14 06:29:52 -07:00
Sotaro Ikeda
1f301915df Bug 1000660 - Remove TextureParent::RecvRemoveTextureSync() r=nical 2014-05-12 18:18:22 -07:00
Sotaro Ikeda
b226cd7960 Bug 1000525 - Defer Fence release until IPC delivery complete r=nical 2014-05-05 18:56:40 -07:00
Bas Schouten
1af96eff00 Bug 997517: Never try to use D2D for BufferTextureClients. r=nical 2014-04-29 22:33:10 +02:00
Benoit Jacob
d8f30bb270 Bug 987311 - 6/6 - Convert the rest of CompositorTypes.h to typed enums, final manual changes - r=nical 2014-04-25 22:34:06 -04: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
Nicolas Silva
ec14ee1a8f Bug 997699 - fixup some #includes of ipdl actors in layers. r=bjacob 2014-04-28 13:29:13 +02:00
John Schoenick
3740e78164 Bug 977963 - Fix and re-enable linux glX texture_from_pixmap support r=mattwoodrow 2014-04-27 21:52:55 -07:00