Commit Graph

107 Commits

Author SHA1 Message Date
Morris Tseng
d4cdf301e3 Bug 926128 - Use a single configurable shader in OpenGL layers backend. r=vlad, r=nical, r=gal 2013-11-07 22:22:05 -08:00
Bill McCloskey
ac6dae6f29 Bug 963952 - [e10s] Don't use basic compositor when using D3D11 compositor (r=mattwoodrow) 2014-02-13 08:53:50 -08:00
Benoit Girard
0f3a70b95f 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
Jeff Muizelaar
e020a18a88 Bug 962721. Handle the flip for CopyTexImage2D. r=bjacob
This fixes a regression from b75d69931d4a. This call to CopyTexImage2D was
forgotten during the move to handling the flip in the compositor.
2014-01-31 10:59:14 -05:00
Vladimir Vukicevic
466a30db76 b=951799, cache uniforms in OGLShaderProgram, part 2 - fix LayerProgramProjectionMatrix; r=bjacob 2014-01-29 17:53:38 -05:00
David Zbarsky
a28df4889b Bug 952977: Convert CompositingRenderTargetOGL to gfx::Matrix4x4 r=nical 2014-01-27 15:25:21 -05:00
David Zbarsky
c3de69e906 Bug 952977: Convert PrepareViewport to gfx::Matrix4x4 r=nical 2014-01-27 15:25:20 -05:00
David Zbarsky
25f1d1607d Bug 952977: Convert OGLShaderProgram to gfx::Matrix r=nical 2014-01-27 15:25:20 -05:00
David Zbarsky
7cb634da66 Bug 952977: Convert GetTextureTransform to gfx::Matrix4x4 r=nical 2014-01-24 17:49:02 -08:00
Benoit Jacob
61df69f208 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
e5ed95579b 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
Dan Glastonbury
a262f2f053 Bug 879663 - Check for GL Context validity in Pause()/Resume(). r=bjacob 2014-01-22 08:45:35 +10:00
Sushil Chauhan
d008525ff7 Bug 953303 - HwcComposer2D should honor HWC_HINT_CLEAR_FB set by hwcomposer. r=ncameron 2014-01-17 18:55:30 -08:00
Ryan VanderMeulen
9d1744d14d Backed out changeset 8a5c1027e6e6 (bug 953303) for bustage. 2014-01-17 14:50:58 -05:00
Sushil Chauhan
52c6e6f829 Bug 953303 - HwcComposer2D should honor HWC_HINT_CLEAR_FB set by hwcomposer. r=ncameron 2014-01-17 11:09:01 -08:00
Bas Schouten
fdb4be9e33 Bug 960254 - Part 2: Update some callers that write to DataSourceSurface. r=jrmuizel 2014-01-16 13:17:23 +01:00
Bas Schouten
6a885186bb Backed out 5 changesets (bug 960254, bug 960354)
Backed out changeset 4441c32c724c (bug 960254)
Backed out changeset 4aecc5ca2a19 (bug 960254)
Backed out changeset 9f499e5f7954 (bug 960354)
Backed out changeset fd9b6b044a5a (bug 960354)
Backed out changeset c1f6fbc397bd (bug 960354)
2014-01-16 14:36:53 +01:00
Bas Schouten
faa7d6f7e2 Bug 960354 - Part 2: Update some callers that write to DataSourceSurfaces. r=jrmuizel 2014-01-16 13:17:23 +01:00
David Zbarsky
3e4ce3885c Bug 952977: Switch GL world transform to gfx::Matrix r=nical 2014-01-16 02:22:19 -05:00
Benoit Jacob
f447d87c57 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
a1e7c32630 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
Markus Stange
6d5b2b38a2 Bug 958025 - Only enable GL_SCISSOR_TEST when we know that we have a useful scissor rect. r=bjacob 2014-01-09 17:59:32 +01:00
Markus Stange
160a80b3d7 Bug 956266 - Don't rebuffer quad vertex + texture coordinates when drawing simple quads in CompositorOGL. r=nrc 2014-01-08 13:00:04 +01:00
Markus Stange
4379a54037 Backing out changeset 1ff04cca465b (bug 956266) due to compilation failures on Android. 2014-01-08 11:36:13 +01:00
Markus Stange
95f05c9276 Bug 956266 - Don't rebuffer quad vertex + texture coordinates when drawing simple quads in CompositorOGL. r=nrc 2014-01-08 10:31:07 +01:00
Benoit Jacob
341c6ae819 Bug 956401 - 7/9 - CompositorOGL::{Begin,End}Frame do not need to touch the scissor rect - r=nrc 2014-01-07 15:02:19 -05:00
Benoit Jacob
0b2996dff5 Bug 956401 - 6/9 - Remove Compositor::SaveState and Compositor::RestoreState - r=nrc 2014-01-07 15:02:19 -05:00
Benoit Jacob
4a640f0b43 Bug 956401 - 3/9 - Let DrawQuadInternal use ScopedScissorRect - r=nrc 2014-01-07 15:02:18 -05:00
Benoit Jacob
2fc9601b41 Bug 956401 - 1/9 - SetRenderTarget doesn't need to touch the scissor rect - r=nrc 2014-01-07 15:02:18 -05:00
Benoit Jacob
bb2984e1eb Bug 956141 - Move y-flipping feature out of GLContext, into CompositorOGL - r=jgilbert,nrc 2014-01-07 15:02:18 -05:00
Nicolas Silva
e8b4b086ed Bug 938591 - Use texture flags in DataTextureSource + D3D9/11 fixes. r=nrc 2014-01-07 17:20:11 +01:00
Benoit Jacob
1c4c105204 Bug 949819 - Move remaining ReadPixels and GetTexImage helpers out of GLContext - r=jgilbert 2014-01-02 10:17:29 -05:00
Benoit Jacob
555568c44c Bug 950203 - Let GfxInfo on Android create its own GL context to get GL strings, instead of waiting on the compositor's - r=jrmuizel 2013-12-18 15:49:13 -05:00
Nicholas Cameron
93e90b7ec1 Bug 950504. Remove MatrixForThebesMatrix. r=mattwoodrow
--HG--
extra : rebase_source : 77103221abbb55d23f9d399d4973ef0b8f269079
2013-12-16 11:17:58 +13:00
Dan Glastonbury
12a898ec8b Bug 942506 - Remove Bind method from AutoBindTexture - r=bjacob
Refactored the places where AutoBindTexture::Bind was used. Replaced with a
simplier class that just saves the texture id bound to a texture unit. The
texture is bound directly instead of via the helper.

I didn't eliminate all occurences of AutoBindTexture because I a few places it
was cleaner than using AutoSaveTexture + TextureSourceOGL->BindTexture.

I extracted the cut'n'paste code that bound the mask texture to program into
BindMaskTextureForProgram. I dislike cut'n'paste code in multiple spots.
2013-12-10 16:50:52 +10:00
Dan Glastonbury
01884a573b Bug 942506 - Remove ApplyFilterToBoundTexture from GLContext - r=bjacob
Move it to CompositorOGL.
2013-12-09 14:07:18 +10:00
Birunthan Mohanathas
3440613a39 Bug 713082 - Part 2: Rename Util.h to ArrayUtils.h. r=Waldo
--HG--
rename : mfbt/Util.h => mfbt/ArrayUtils.h
2013-12-08 21:52:54 -05:00
Dan Glastonbury
1a74976806 Bug 942507 - GLContext doesn't need to have userdata. r=bjacob 2013-12-06 10:23:16 -05:00
Benoit Jacob
6896c52e8a Bug 942499 - Part 2: Move CanUploadNonPowerOfTwo out of GLContext; remove the gfx.textures.poweroftwo.force-enabled preference - r=gal,BenWa 2013-12-03 13:44:38 -05:00
Benoit Jacob
30d72ed7e8 Bug 942499 - Part 1: Move CanUploadSubTextures and WantsSmallTiles out of GLContext - r=BenWa 2013-12-03 13:44:38 -05:00
Nicolas Silva
ad0f0f87ff Bug 929506 - Check that gl->MakeCurrent returns true when using OpenGL on the Compositor side. r=bjacob 2013-12-03 11:44:46 +01:00
Ryan VanderMeulen
3c8b758627 Merge inbound to m-c. 2013-12-02 16:39:00 -05:00
Benoit Girard
55a288a123 Bug 944866 - Pat 1: Add DrawLines to Compositor.h and implement for OGL. r=gal 2013-12-01 15:54:46 -05:00
Dan Glastonbury
7f73b68e55 Bug 830881 - Port layerscope GL changes to new layers. r=vlad 2013-11-29 14:11:49 +10:00
Benoit Jacob
3b791ff17d Bug 944172 - Move DecomposeIntoNoRepeatTriangles out of GLContext - r=BenWa 2013-11-28 15:57:19 -05:00
Nicolas Silva
717653dea3 Bug 924403 - Send non-OMTC GL layers into oblivion. r=nrc 2013-11-27 11:15:17 +13:00
David Anderson
54fffb1db4 Only composite changed areas in the software compositor (bug 882447, r=mattwoodrow,nrc). 2013-11-21 11:25:16 -08:00
Robert O'Callahan
cdd20f889b Bug 938316. Work around fractional texture resampling issues by switching to NEAREST sampling when we're doing a pixel-aligned compositing operation. r=jrmuizel
--HG--
extra : rebase_source : ec49c8c8993af402a24b57efbaea743d39dcd89c
2013-11-13 23:56:11 +13:00
Benoit Jacob
acdb7ab005 Bug 937204 - 3/3. Kill GfxInfoThread. Instead, get GL strings from the compositor - r=kats,jrmuizel 2013-11-15 11:28:43 -05:00
Matt Woodrow
9f29749647 Bug 35380 - Part 5: Remove aOffset from everywhere. r=nrc 2013-11-07 22:53:08 +13:00