Commit Graph

426 Commits

Author SHA1 Message Date
Tor Arvid Lund
471e8c6b58 Bug 948765 - Simplify (and fix issue) with CanvasLayerD3D9. r=nical
There seemed to be some duplication of code in the UpdateSurface method,
as well as an issue with updating that caused some reftests to fail.

In this patch, I remove the mSurface member variable from
CanvasLayerD3D9.h, and instead call mDrawTarget->Snapshot() as needed.

I also reuse the code to draw into the D3DLOCKED_RECT so that we don't
duplicate that portion anymore. It seems now to be more similar to the way
CanvasLayerD3D10 works.

The reftests now pass.
2014-02-12 10:07:47 -05:00
Tor Arvid Lund
edf342c191 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
Nicolas Silva
a98bb5a45e Bug 957560 - Fix some issues with CairoTextureClientD3D9 and DataTextureSourceD3D. r=Bas 2014-02-11 17:13:14 +01:00
Benoit Girard
fd8eb83796 Bug 963821 - Port FPS counter to the Compositor API. r=bas
--HG--
rename : gfx/layers/opengl/FPSCounter.h => gfx/layers/composite/FPSCounter.h
2014-02-10 17:14:11 -05:00
Nicolas Silva
2714633f7e Bug 965096 - Use image surfaces for ARGB content with non-deprecated textures. r=BenWa 2014-02-07 14:30:01 +01:00
Nicolas Silva
3896b4682e Bug 965096 - Backed out changeset 224e15123ae0 because of wrong bug number. r=me 2014-02-07 14:24:30 +01:00
Nicolas Silva
4005c9bb4a Bug 955096 - Use image surfaces for ARGB content with non-deprecated textures. r=BenWa 2014-02-07 14:20:19 +01:00
Tor Arvid Lund
7e2593eb94 Bug 968746 - Remove unused CanvasLayer::Data::mSurface. r=nical
Since no code path ever set CanvasLayer::Data::mSurface, remove the field
entirely
2014-02-06 09:46:30 -05:00
Nicolas Silva
613575978b Bug 952507 - Flush the back buffer after syncing with the front buffer in the buffered ContentClient. r=Bas 2014-02-04 21:35:22 +01:00
Benoit Jacob
3ee7a2d643 Bug 962784 - Convert ImageTypes.h to typed enums - r=jrmuizel
find content/media media/webrtc gfx/layers gfx/tests dom/camera dom/plugins image/src layout/base -type f | grep -v 'gfx/layers/ImageTypes.h' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(GRALLOC_PLANAR_YCBCR\|PLANAR_YCBCR\|SHARED_RGB\|CAIRO_SURFACE\|MAC_IOSURFACE\|REMOTE_IMAGE_BITMAP\|SHARED_TEXTURE\|REMOTE_IMAGE_DXGI_TEXTURE\|D3D9_RGB32_TEXTURE\)\($\|[^A-Za-z0-9_]\)/\1ImageFormat::\2\3/g'

find content/media media/webrtc gfx/layers gfx/tests dom/camera dom/plugins image/src layout/base -type f | grep -v 'gfx/layers/ImageTypes.h' | xargs sed -i 's|ImageFormat\:\:ImageFormat|ImageFormat|g'

find content/media media/webrtc gfx/layers gfx/tests dom/camera dom/plugins image/src layout/base -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)STEREO_MODE_\(MONO\|LEFT_RIGHT\|RIGHT_LEFT\|BOTTOM_TOP\|TOP_BOTTOM\)\($\|[^A-Za-z0-9_]\)/\1StereoMode::\2\3/g'

find content/media media/webrtc gfx/layers gfx/tests dom/camera dom/plugins image/src layout/base -type f | grep -v 'gfx/layers/ImageTypes.h' | xargs sed -i 's|StereoMode\:\:StereoMode|StereoMode|g'
2014-01-30 17:58:49 -05:00
Nicolas Silva
9bfe1542f1 Bug 965250 - Fix TextureHostD3D9. r=Bas 2014-01-29 17:27:01 +01:00
Nicholas Cameron
5a4d989e54 Bug 944087. Missing comment change addressing reviewer comment. r=Bas DONTBUILD (comment only) 2014-01-28 21:44:15 +13:00
David Zbarsky
ac7a35fed2 Bug 952977: Convert PrepareViewport to gfx::Matrix4x4 r=nical 2014-01-27 15:25:20 -05:00
David Zbarsky
9bac52255b Bug 952977: Perform some cleanup r=nical 2014-01-27 15:25:19 -05:00
David Zbarsky
77f928fb9b Bug 952977: Convert ComputeEffectiveTransforms to gfx::Matrix4x4 r=nical 2014-01-27 10:28:04 -05:00
Nicholas Cameron
130f86ef7c Bug 944087. Fix main thread unlocking and tidy up. r=Bas 2014-01-27 17:10:40 +13:00
David Zbarsky
1a8648fa9e Bug 952977: Convert GetEffectiveTransform to gfx::Matrix4x4 r=nical 2014-01-24 17:49:19 -08:00
Nicolas Silva
53a4585145 Bug 952507 - Fix locking in double buffered ContentClient. r=nrc 2014-01-24 15:25:04 +01:00
Ali Akhtarzada
43a832d438 Bug 962288 - Don't call DeprecatedGetAsSurface unless it's Cairo. r=mattwoodrow
Changeset from Bug 959123 caused a performance decrease because
DeprecatedGetAsSurface was being called on an image that may not
be a CAIRO_SURFACE.

Reverted CairoImage surface members to public access as they were
before the patch from bug 959123.
2014-01-24 08:42:12 -05:00
Benoit Jacob
15ef84b8b5 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
28ff3ad25f 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
Benoit Jacob
638dd1b5c9 Bug 959380 - 3/5 - Make gfxSurfaceType a typed enum - r=jrmuizel
find . -type f | grep -v '\./obj' | grep -v '\.hg' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)gfxSurfaceType\(Image\|PDF\|PS\|Xlib\|Xcb\|Glitz\|Quartz\|Win32\|BeOS\|DirectFB\|SVG\|OS2\|Win32Printing\|QuartzImage\|Script\|QPainter\|Recording\|VG\|GL\|DRM\|Tee\|XML\|Skia\|Subsurface\|D2D\|Max\)\($\|[^A-Za-z0-9_]\)/\1gfxSurfaceType::\2\3/g'
2014-01-23 13:26:40 -05:00
Benoit Jacob
981c6431d3 Bug 959380 - 2/5 - Make gfxImageFormat a typed enum - r=jrmuizel
find . -type f | grep -v \./obj | grep -v \.hg | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)gfxImageFormat\(ARGB32\|RGB24\|A8\|A1\|RGB16_565\|Unknown\)\($\|[^A-Za-z0-9_]\)/\1gfxImageFormat::\2\3/g'
2014-01-23 13:26:40 -05:00
Carsten "Tomcat" Book
bc815aa84d Backed out changeset 24668220c9a4 (bug 952507) for OS X Build Bustage on a CLOSED TREE 2014-01-23 15:50:14 +01:00
Nicolas Silva
627e8e82f4 Bug 952507 - Fix locking in double buffered ContentClient. r=nrc 2014-01-23 15:27:06 +01:00
Wes Kocher
8dc107fef4 Backed out changeset e0f69ad55edf (bug 962288) under suspicion of leaking on a CLOSED TREE 2014-01-22 14:18:13 -08:00
Ali Akhtarzada
1051e4fa02 Bug 962288 - Don't call DeprecatedGetAsSurface unless it's Cairo. r=mattwoodrow
Changeset from Bug 959123 caused a performance decrease because
DeprecatedGetAsSurface was being called on an image that may not
be a CAIRO_SURFACE.
2014-01-22 14:12:02 -05:00
Nicolas Silva
5657910425 Bug 957560 - Clear the newly allocated d3d TextureClient if the allocation flags says so. r=nrc 2014-01-20 14:52:12 +01:00
Ali Akhtarzada
09cc9a436c Bug 959123 - Implement CairoImage::GetAsSourceSurface. r=nical
Deprecate CairoImage::Data::mSurface and add an mSourceSurface.
Also change all the callers of CairoImage::SetData to set the
SourceSurface as well.

Also change scope of CairoImage::mSource to private
2014-01-17 11:22:09 -05:00
David Zbarsky
7474ed0454 Bug 952977: Switch GL world transform to gfx::Matrix r=nical 2014-01-16 02:22:19 -05:00
Andreas Pehrson
07bfb2b3d0 Bug 877115 - Moz2Dify CanvasLayerD3D9 drawing shared surface into D3DLOCKED_RECT. r=nical 2014-01-13 20:05:24 +01:00
Ryan VanderMeulen
7c98a0a107 Backed out changesets bfd0864f189d and dba042cbc381 (bug 877115) for Windows bustage.
CLOSED TREE
2014-01-13 10:46:09 -05:00
Andreas Pehrson
6b3d768916 Bug 877115 - Moz2Dify CanvasLayerD3D9 drawing shared surface into D3DLOCKED_RECT. r=nical 2014-01-13 13:59:02 +01:00
Benoit Jacob
873406e3f0 Bug 958375 - 8/9 - Make remaining Moz2D enums typed - r=Bas
Specifically:
  r=Bas for manual changes
  f=Bas for automatic changes
See attachments on the bug for the specific breakdown.
2014-01-10 14:06:17 -05:00
Benoit Jacob
300f4ba3a9 Bug 958375 - 6/9 - Make BackendType and NativeSurfaceType typed enums - r=Bas
Specifically:
  r=Bas for manual changes
  f=Bas for automatic changes
See attachments on the bug for the specific breakdown.
2014-01-10 14:06:16 -05:00
Benoit Jacob
535a216635 Bug 958375 - 4/9 - Make SurfaceFormat a typed enum - r=Bas
Specifically:
  r=Bas for manual changes
  f=Bas for automatic changes
See attachments on the bug for the specific breakdown.
2014-01-10 14:06:16 -05:00
Nicolas Silva
909730f4fa Bug 900244 - Implement the D3D9 specific TextureClients. r=nrc 2014-01-07 17:20:40 +01:00
Matt Woodrow
b6d62a28f6 Bug 900244 - Implement a shared D3D9 TextureClient. r=nical 2014-01-07 17:20:22 +01:00
Nicolas Silva
ad476e2176 Bug 938591 - Use texture flags in DataTextureSource + D3D9/11 fixes. r=nrc 2014-01-07 17:20:11 +01:00
Nicolas Silva
db6939af11 Bug 900244 - New D3D9 Textures for BufferTextures. r=nrc 2014-01-07 17:20:03 +01:00
Birunthan Mohanathas
dfbad43639 Bug 784739 - Switch from NULL to nullptr in remaining directories; r=ehsan
--HG--
extra : rebase_source : 1ff19b2c8fd0e77fa8e822f5007a9fa3a6b6d474
2014-01-06 10:06:04 -05:00
Andreas Pehrson
f3b2403568 Bug 877115 - [Moz2Dify] Part 3. Change gfxIntSize to gfx::IntSize in GLContext::OffscreenSize and dependendent classes. r=nical 2013-12-10 17:11:58 +01:00
Ms2ger
98586cdbc1 Bug 950143 - Remove the implicit conversion operator from nsIntSize to IntSize; r=roc 2013-12-31 10:06:12 +01:00
Tor Arvid Lund
bbfc9d5dc7 Bug 950677 - Change all remaining gfxIntSize -> IntSize refs. r=nical 2013-12-20 11:46:30 -05:00
Tor Arvid Lund
03a5dadfb2 Bug 950677 - gfxIntSize -> IntSize in ThebesLayer* classes. r=nical 2013-12-20 11:46:30 -05:00
Tor Arvid Lund
5aafe907f1 Bug 950677 - gfxIntSize -> IntSize for Texture* classes. r=nical 2013-12-20 11:46:30 -05:00
Tor Arvid Lund
19ca402f3f Bug 950677 - More gfxIntSize -> IntSize changes in Layer* classes. r=nical 2013-12-20 11:46:29 -05:00
Tor Arvid Lund
48371ada8e Bug 950677 - Change gfxIntSize to gfx::IntSize in DirectX files. r=nical 2013-12-20 11:46:29 -05:00
Wes Kocher
546f98d63d Backed out 6 changesets (bug 877115) for mochitest-1 and reftest orange on this CLOSED TREE
Backed out changeset 65ad9d8860d6 (bug 877115)
Backed out changeset bf8095c168fb (bug 877115)
Backed out changeset 290ad5863615 (bug 877115)
Backed out changeset 4488ec28910e (bug 877115)
Backed out changeset 45f8859c6fd6 (bug 877115)
Backed out changeset 111cc426fa9e (bug 877115)
2013-12-16 16:33:07 -08:00
Andreas Pehrson
3d28bdc5dd Bug 877115 - [Moz2Dify] Part 3. Change gfxIntSize to gfx::IntSize in GLContext::OffscreenSize and dependendent classes. r=nical 2013-12-10 17:11:58 +01:00