Commit Graph

83 Commits

Author SHA1 Message Date
Nicolas Silva
7af3bc6aad Bug 973892 - Make TextureClient::GetAsDrawTarget work with canvas. r=bas 2014-03-17 22:35:20 +01:00
Tor Arvid Lund
7af55748fb Bug 973976 - Revert to Thebes path for CopyableCanvasLayer. r=jmuizelaar
The performance on the Mac platform degraded after porting the code to
Moz2D in Bug 948765. This patch chooses the old thebes path instead of the
Moz2D path, so that performance is unaffected. This way we can easily
revert this patch at a later time when the perf issue has been fixed.
2014-03-17 10:49:21 -04:00
Bas Schouten
bde06b3dca Bug 963073 - Merge tiling branch. r=Bas,jrmuizel,BenWa
http://hg.mozilla.org/users/bschouten_mozilla.com/tiling/summary

This work is mainly porting tiled layers to new textures, implementing
double-buffered tiles and implementing a texture client pool, to be used by
tiled content clients.

Any questions regarding this patch should go to:
Bas Schouten <bschouten@mozilla.com>
Chris Lord <clord@mozilla.com>
Nicolas Silva <nsilva@mozilla.com>

In their absence questions can be directed to:
Jeff Muizelaar <jmuizelaar@mozilla.com>
Benoit Girard <bgirard@mozilla.com>
2014-03-07 22:34:04 +01:00
James Willcox
15d30be7c6 Bug 939276 - Use a single GLContext for all SkiaGL canvases r=jgilbert,vlad,gwright,bjacob
--HG--
rename : gfx/gl/GLContextSkia.cpp => gfx/gl/SkiaGLGlue.cpp
2014-03-05 15:49:37 -06:00
Wes Kocher
09174e398b Backed out changeset cf6a31bca4e0 (bug 939276) for webgl reftest crash
--HG--
rename : gfx/gl/SkiaGLGlue.cpp => gfx/gl/GLContextSkia.cpp
2014-02-20 15:23:52 -08:00
James Willcox
1715424e2c Bug 939276 - Use a single GLContext for all SkiaGL canvases r=vlad,gwright,bjacob
--HG--
rename : gfx/gl/GLContextSkia.cpp => gfx/gl/SkiaGLGlue.cpp
extra : rebase_source : 8e85dd34a67c2e193480e9f1f5baf68a898790fe
2014-02-20 16:20:28 -06:00
Ryan VanderMeulen
41ed3ca169 Backed out changesets a6831c02d8cf, 5ab4f97a3220, 2784838dbc94, and 6364146ddb19 (bug 973892) for B2G bustage.
CLOSED TREE
2014-02-19 14:28:05 -05:00
Nicolas Silva
69010e7545 Bug 973892 - part 2) Specify the moz2d backend when creating a TextureClient. r=Bas 2014-02-19 18:17:49 +01:00
Nicolas Silva
84f9e2482e Bug 973875 - Make CanvasClient2D not keep a TextureClient's DrawTarget after unlocking its memory. r=bjacob 2014-02-19 16:53:26 +01:00
Sotaro Ikeda
85774eaa54 Bug 972494 - Use RefPtr to hold GrallocTextureClientOGL pointer r=nical 2014-02-18 06:46:13 -08:00
Ehsan Akhgari
de8052b706 Backed out 2 changesets (bug 939276) because of build bustage
Backed out changeset 1cedc759f877 (bug 939276)
Backed out changeset 61cef3b533ba (bug 939276)

--HG--
rename : gfx/gl/SkiaGLGlue.cpp => gfx/gl/GLContextSkia.cpp
2014-02-14 18:48:05 -05:00
James Willcox
48175fc2e0 Bug 939276 - Use a single GLContext for all SkiaGL canvases r=bjacob,gwright,dglastonbury
--HG--
rename : gfx/gl/GLContextSkia.cpp => gfx/gl/SkiaGLGlue.cpp
2014-02-14 15:55:58 -06:00
Tor Arvid Lund
09df5cf35c Bug 948765 - Port CopyableCanvasLayer to Moz2D. r=nical
This patch deprecates the UpdateSurface and PaintWithOpacity methods in the
CCL class. To do this, many other changes were made in the process.

BasicImplData::Paint was deprecated, and its mOperator was ported to Moz2D.
This caused changes in several *Layer subclasses.

GLScreenBuffer::Readback was deprecated.

I want to change the usages of the (now) deprecated functions, so that they
use the new Moz2D ones: CanvasClient::Update has been updated, but the big
one (BasicLayerManager::PaintSelfOrChildren) will have to be its own
project.
2014-02-12 10:07:46 -05:00
Sotaro Ikeda
5bfce7e8fc Bug 962101 - Handle Remove Texture in Compositable level. r=nical 2014-02-10 15:52:35 -05:00
Matt Woodrow
938e9aa493 Bug 926745 - Don't call ForceRemove manually in compositable code. r=nical,sotaro 2014-02-10 15:24:27 +13:00
Ryan VanderMeulen
faf802a81e Merge m-c to inbound. 2014-01-23 15:58:06 -05:00
Sotaro Ikeda
f903a20e0d Bug 951732 - Keep TextureClient until Transaction complete. r=nical 2014-01-23 09:31:12 -05:00
Benoit Jacob
67a17b1047 Bug 959448 - Convert most of LayersTypes.h to typed enums - r=nrc
find content/media dom/ipc widget/ gfx/tests gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)LAYERS_\(NONE\|BASIC\|OPENGL\|D3D9\|D3D10\|D3D11\|CLIENT\|LAST\)\($\|[^A-Za-z0-9_]\)/\1LayersBackend::LAYERS_\2\3/g'

find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::BUFFER_\2\3/g'

find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(BUFFERED\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(DRAW\|DRAW_SNAPPED\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::CLIP_\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SURFACE_\(NONE\|OPAQUE\|SINGLE_CHANNEL_ALPHA\|COMPONENT_ALPHA\)\($\|[^A-Za-z0-9_]\)/\1SurfaceMode::SURFACE_\2\3/g'

find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(STRETCH\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::\2\3/g'

find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::SCALE_\2\3/g'
2014-01-23 13:26:41 -05:00
Benoit Jacob
93826fc6b0 Bug 959380 - 4/5 - Make gfxContentType a typed enum - r=jrmuizel
find . -type f | grep -v '\./obj' | grep -v '\.hg' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)GFX_CONTENT_\(COLOR\|ALPHA\|COLOR_ALPHA\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1gfxContentType::\2\3/g'
2014-01-23 13:26:40 -05:00
Nick Lebedev
940cdd21fd Bug 958984. Move SurfaceMode enum out of Layer class so we could forward declare it instead of including header. r=nical 2014-01-17 15:00:00 +01:00
Morris Tseng
b631d4766c Bug 893304 - Convert CanvasClient to new TextureClint/Host and replace SurfaceDescriptors with TextureClients inside SharedSurfaces. r=nical, r=snorp, r=jgilbert, r=bjacob 2014-01-10 08:06:06 -05:00
Nicolas Silva
89a1de2117 Bug 938591 - Use texture flags in DataTextureSource + D3D9/11 fixes. r=nrc 2014-01-07 17:20:11 +01:00
Ryan VanderMeulen
62b4fec0e9 Backed out changeset 403ab3213879 (bug 893304) for bustage. 2014-01-07 10:07:32 -05:00
Morris Tseng
69820ceefc Bug 893304 - Convert CanvasClient to new TextureClint/Host and replace SurfaceDescriptors with TextureClients inside SharedSurfaces. r=nical, r=snorp, r=jgilbert, r=bjacob 2014-01-07 09:58:03 -05:00
Ryan VanderMeulen
c8efa29df1 Backed out changeset 96b0ddfc63f7 (bug 893304) for causing bug 950589. 2013-12-16 22:49:02 -05:00
Morris Tseng
d39f34dbbd Bug 893304 - Convert CanvasClient to new TextureClient/Host. r=nical, r=snorp, r=jgilbert 2013-12-13 12:45:13 -05:00
Benoit Jacob
81c944e909 Bug 897452 - Part 12 - remove CompositableClient::OnActorDestroy - r=nrc 2013-12-11 20:45:05 -05:00
Benoit Jacob
c9c5a7012c Bug 897452 - Part 11 - remove TextureClient::OnActorDestroy - r=nrc 2013-12-11 20:45:03 -05:00
Nicolas Silva
0f1647175e Bug 897452 - Part 2 - PTexture deallocation logic - r=sotaro,bjacob 2013-12-11 20:44:45 -05:00
Ryan VanderMeulen
f9166936cb Backed out 17 changesets (bug 897452) for OSX crashes on a CLOSED TREE.
Backed out changeset 11ad8608bc27 (bug 897452)
Backed out changeset 6bcc629e76f9 (bug 897452)
Backed out changeset b91c858a43f5 (bug 897452)
Backed out changeset 38ba49ee3e97 (bug 897452)
Backed out changeset ea184ef84762 (bug 897452)
Backed out changeset 686cc5122149 (bug 897452)
Backed out changeset 3685a8018e49 (bug 897452)
Backed out changeset be7ef6240068 (bug 897452)
Backed out changeset f95c20e70947 (bug 897452)
Backed out changeset 4a370d2a1c62 (bug 897452)
Backed out changeset 1222f6ab66d2 (bug 897452)
Backed out changeset 5e9d3c681ee9 (bug 897452)
Backed out changeset 3b9ddce12b7a (bug 897452)
Backed out changeset 7aec6387f3e9 (bug 897452)
Backed out changeset eb1fe464fdaf (bug 897452)
Backed out changeset 07deaa53b6fd (bug 897452)
Backed out changeset ddab7d071d69 (bug 897452)
2013-12-11 14:52:50 -05:00
Benoit Jacob
505b29e412 Bug 897452 - Part 12 - remove CompositableClient::OnActorDestroy - r=nrc 2013-12-11 13:05:32 -05:00
Benoit Jacob
ea86bd47f3 Bug 897452 - Part 11 - remove TextureClient::OnActorDestroy - r=nrc 2013-12-11 13:05:29 -05:00
Nicolas Silva
5a8009c28f Bug 897452 - Part 2 - PTexture deallocation logic - r=sotaro,bjacob 2013-12-11 13:05:11 -05:00
Birunthan Mohanathas
4fc8d6dc86 Bug 798033 - Remove 'using namespace' from gfx/ headers. r=jrmuizel 2013-12-08 21:53:26 -05:00
Nicholas Cameron
27a1b501f8 Bug 907463. Dealloc shmem on ActorDestroy. r=nical 2013-09-27 21:48:42 +12:00
Gregor Wagner
b7612c58f1 Backout Bug 907463 for causing bug 930575 2013-10-25 09:25:17 -07:00
Nicholas Cameron
40a07cfc33 Bug 907463. Dealloc shmem on ActorDestroy. r=nical 2013-09-27 21:48:42 +12:00
Nicolas Silva
2c83b3fd6e Bug 919022 - Fix warning by not overloading CreateBufferTextureClient. r=nrc 2013-10-13 17:24:12 -07:00
Nicolas Silva
b1f842a367 Bug 923917 - Make CompositableClient not crash when texture serialization fails. r=nrc 2013-10-09 16:18:29 -07:00
Nicolas Silva
db5d7b4954 Bug 916118 - Simplify the TextureClient deallocation protocol. r=nrc 2013-10-02 13:52:04 -07:00
Ed Morley
66291f30cc Backed out changeset 08d9bbb1044f (bug 907463) 2013-09-27 11:37:00 +01:00
Nicholas Cameron
df88f4aef2 Bug 907463. Dealloc shmem on ActorDestroy. r=nical 2013-09-27 21:48:42 +12:00
Nicolas Silva
642baa4241 Bug 916118 - Backed out changeset bafb8bf3b279 on a CLOSED TREE 2013-09-26 19:06:12 +02:00
Nicolas Silva
92664921c0 Bug 916118 - Simplify the deallocation flags in TextureClient/Host. r=nrc 2013-09-26 18:00:23 +02:00
Benoit Jacob
c1d7f88886 Bug 913872 - Take nested enums out of gfxASurface - 1/3 : automatic changes - r=jrmuizel
Generated by these regexes:

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/gfx[A-Za-z0-9_]*Surface\:\:[a-z]*\(\(ImageFormat\|SurfaceType\|ContentType\|MemoryLocation\)[0-9A-Za-z_]*\)/gfx\1/g'

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/gfx[A-Za-z0-9_]*Surface\:\:[a-z]*\(\(CONTENT_\|MEMORY_\)[0-9A-Za-z_]*\)/GFX_\1/g'

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(CONTENT_COLOR\|CONTENT_ALPHA\|CONTENT_COLOR_ALPHA\|CONTENT_SENTINEL\|MEMORY_IN_PROCESS_HEAP\|MEMORY_IN_PROCESS_NONHEAP\|MEMORY_OUT_OF_PROCESS\)\($\|[^A-Za-z0-9_]\)/\1GFX_\2\3/g'

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(ImageFormatARGB32\|ImageFormatRGB24\|ImageFormatA8\|ImageFormatA1\|ImageFormatRGB16_565\|ImageFormatUnknown\|SurfaceTypeImage\|SurfaceTypePDF\|SurfaceTypePS\|SurfaceTypeXlib\|SurfaceTypeXcb\|SurfaceTypeGlitz\|SurfaceTypeQuartz\|SurfaceTypeWin32\|SurfaceTypeBeOS\|SurfaceTypeDirectFB\|SurfaceTypeSVG\|SurfaceTypeOS2\|SurfaceTypeWin32Printing\|SurfaceTypeQuartzImage\|SurfaceTypeScript\|SurfaceTypeQPainter\|SurfaceTypeRecording\|SurfaceTypeVG\|SurfaceTypeGL\|SurfaceTypeDRM\|SurfaceTypeTee\|SurfaceTypeXML\|SurfaceTypeSkia\|SurfaceTypeSubsurface\|SurfaceTypeD2D\|SurfaceTypeMax\)\($\|[^A-Za-z0-9_]\)/\1gfx\2\3/g'
2013-09-24 16:45:13 -04:00
Nicholas Cameron
08e9952e97 No bug. Fixbuild bustage in CanvasClient.cpp. r=bustage 2013-09-24 13:59:59 +12:00
Nicholas Cameron
a3183c442b Bug 912766. Funky refcounting to keep the gfxWindowsSurface alive during transport. r=mattwoodrow 2013-09-24 13:14:12 +12:00
Nicholas Cameron
789ebcc522 Bug 912766. Use the DIB texture client/host. r=mattwoodrow 2013-09-24 13:14:12 +12:00
Nicholas Cameron
9436c08495 Bug 915944. Don't set TEXTURE_DEALLOCATE_HOST for deprecated canvas clients. r=mattwoodrow 2013-09-13 14:33:07 +12:00
Matt Woodrow
3f30003af6 Bug 912173 - Always AddRef and Release the GLContext when sharing a SurfaceStream to avoid mismatches. r=nrc 2013-09-09 14:35:20 +12:00