Commit Graph

127 Commits

Author SHA1 Message Date
Nicolas Silva
0f10b9b7be Bug 984618 - Clear the CompositorOGL's unused textures when aborting a frame. r=Bas. 2014-03-26 16:56:30 +01:00
Ed Morley
1207c28e56 Backed out changeset 4c963fa4683b (bug 985487) 2014-03-26 15:14:54 +00:00
James Willcox
8678be73d5 Bug 985487 - Don't try to use GL_TEXTURE_RECTANGLE_ARB on ES2 r=mwoodrow 2014-03-26 09:11:42 -05:00
Nicolas Silva
b253190ddb Bug 984618 - Clear the compositor's unused textures when a frame was entirely composited by hwcomposer. r=cwiiis 2014-03-25 17:14:48 +01:00
Nicolas Silva
8178319bae Bug 984823 - Use clamp to edges with tiles on b2g. r=Cwiiis 2014-03-21 13:54:13 +01:00
Wes Kocher
679d927c40 Merge inbound to m-c 2014-03-18 14:15:03 -07:00
Nicolas Silva
8ffce5061a Bug 980647 - Part 1 - Move the compositor's texture recycling startegy behind a pool interface. r=Cwiiis 2014-03-12 17:28:47 +01:00
Sotaro Ikeda
3f3e2f2bbe Bug 974152 - Use FrameBuffer's Acquire Fence as Layer buffer's ReleaseFence on gonk r=sushil,nical 2014-03-17 18:36:56 -07:00
Bas Schouten
75c94ab14f Bug 983157: Backout bug 980647 (31844306c2f1, dcd632ee9a3e). r=backout 2014-03-13 18:55:52 +01:00
Matt Woodrow
2f0784d0c0 Bug 971914 - Make TextureSourceOGL responsible for tracking filter state. r=nical 2014-03-13 13:37:17 +13:00
Matt Woodrow
aa48f8996c Bug 971914 - Don't set and restore state constantly inside CompositorOGL. r=nical 2014-03-13 13:37:17 +13:00
Nicolas Silva
7d15ed1003 Bug 980647 - Part 1 - Move the compositor's texture recycling startegy behind a pool interface. r=Cwiiis 2014-03-12 17:28:47 +01:00
Bas Schouten
d301df5d45 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
Ryan VanderMeulen
e151bee907 Backed out changeset 96f2905b175d (bug 978479) for OSX reftest failures.
CLOSED TREE
2014-03-06 14:14:52 -05:00
Andreas Gal
eea7eaf509 Bug 978479 - Remove flipped quad texture from mQuadVBO. r=bjacob 2014-03-06 12:50:29 -05:00
Andreas Gal
044a8b635b Bug 975772 - Cleanup RectTriangles and allow DrawQuads to take triangles or triangle strips. r=bjacob 2014-03-05 14:18:38 -05:00
Sushil Chauhan
9443c9c242 Bug 978341 - CompositorOGL::clearFBRect api needs to map the rect to OGL coordinates. r=jgilbert 2014-03-04 18:07:32 -08:00
Sushil Chauhan
a0bfa0aca9 Bug 976717 - Pass the Framebuffer rectangle to be cleared to LayerComposite. r=ncameron 2014-02-27 11:07:34 -08:00
Milan Sreckovic
710bd9d8f9 Bug 971942: 3. layers.bufferrotation.enabled, layers.componentalpha.enabled, layers.scroll-graph, layers.acceleration.disabled, layers.acceleration.force-enabled moved to gfxPrefs. r=clord 2014-02-26 21:53:27 -05:00
Morris Tseng
644084917e Bug 975121 - Fix reversed colors with gfx.xrender.enabled = false. r=gal 2014-02-24 10:09:55 -05:00
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