Commit Graph

116 Commits

Author SHA1 Message Date
Nicolas Silva
b8b1cfaac0 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
bcf9cda593 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
d6c886f88a Backed out changeset 96f2905b175d (bug 978479) for OSX reftest failures.
CLOSED TREE
2014-03-06 14:14:52 -05:00
Andreas Gal
15e889b292 Bug 978479 - Remove flipped quad texture from mQuadVBO. r=bjacob 2014-03-06 12:50:29 -05:00
Andreas Gal
d56add9268 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
38930a4634 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
741ab85bf5 Bug 976717 - Pass the Framebuffer rectangle to be cleared to LayerComposite. r=ncameron 2014-02-27 11:07:34 -08:00
Milan Sreckovic
049b2dfae4 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
46f05bc3e9 Bug 975121 - Fix reversed colors with gfx.xrender.enabled = false. r=gal 2014-02-24 10:09:55 -05:00
Morris Tseng
cc3e76aa1d 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
dd0fa98cbb Bug 963952 - [e10s] Don't use basic compositor when using D3D11 compositor (r=mattwoodrow) 2014-02-13 08:53:50 -08:00
Benoit Girard
956bc94123 Bug 963821 - Port FPS counter to the Compositor API. r=bas 2014-02-10 17:14:11 -05:00
Jeff Muizelaar
4acab7d640 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
3450acc2de b=951799, cache uniforms in OGLShaderProgram, part 2 - fix LayerProgramProjectionMatrix; r=bjacob 2014-01-29 17:53:38 -05:00
David Zbarsky
c8159d0d05 Bug 952977: Convert CompositingRenderTargetOGL to gfx::Matrix4x4 r=nical 2014-01-27 15:25:21 -05:00
David Zbarsky
7b78004f40 Bug 952977: Convert PrepareViewport to gfx::Matrix4x4 r=nical 2014-01-27 15:25:20 -05:00
David Zbarsky
3b43ea2aab Bug 952977: Convert OGLShaderProgram to gfx::Matrix r=nical 2014-01-27 15:25:20 -05:00
David Zbarsky
b325701220 Bug 952977: Convert GetTextureTransform to gfx::Matrix4x4 r=nical 2014-01-24 17:49:02 -08:00
Benoit Jacob
49238a878d 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
844232d97c 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
1fccfa890a Bug 879663 - Check for GL Context validity in Pause()/Resume(). r=bjacob 2014-01-22 08:45:35 +10:00
Sushil Chauhan
9b28947dfe Bug 953303 - HwcComposer2D should honor HWC_HINT_CLEAR_FB set by hwcomposer. r=ncameron 2014-01-17 18:55:30 -08:00
Ryan VanderMeulen
2da8f3cf88 Backed out changeset 8a5c1027e6e6 (bug 953303) for bustage. 2014-01-17 14:50:58 -05:00
Sushil Chauhan
d75271b2bc Bug 953303 - HwcComposer2D should honor HWC_HINT_CLEAR_FB set by hwcomposer. r=ncameron 2014-01-17 11:09:01 -08:00
Bas Schouten
e12bfacb46 Bug 960254 - Part 2: Update some callers that write to DataSourceSurface. r=jrmuizel 2014-01-16 13:17:23 +01:00
Bas Schouten
b8d550e3c7 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
805c5c39cd Bug 960354 - Part 2: Update some callers that write to DataSourceSurfaces. r=jrmuizel 2014-01-16 13:17:23 +01:00
David Zbarsky
86845f42da Bug 952977: Switch GL world transform to gfx::Matrix r=nical 2014-01-16 02:22:19 -05:00
Benoit Jacob
61c6bc7c4e 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
f634d4797a 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
e41915242b 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
cf5e562313 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
5f0d2032f8 Backing out changeset 1ff04cca465b (bug 956266) due to compilation failures on Android. 2014-01-08 11:36:13 +01:00
Markus Stange
2c234a3e44 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
76b5845f24 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
780fedca03 Bug 956401 - 6/9 - Remove Compositor::SaveState and Compositor::RestoreState - r=nrc 2014-01-07 15:02:19 -05:00
Benoit Jacob
8e30aa82ec Bug 956401 - 3/9 - Let DrawQuadInternal use ScopedScissorRect - r=nrc 2014-01-07 15:02:18 -05:00
Benoit Jacob
7d3721dc39 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
9a00169b79 Bug 956141 - Move y-flipping feature out of GLContext, into CompositorOGL - r=jgilbert,nrc 2014-01-07 15:02:18 -05:00
Nicolas Silva
6fd420766e Bug 938591 - Use texture flags in DataTextureSource + D3D9/11 fixes. r=nrc 2014-01-07 17:20:11 +01:00
Benoit Jacob
221d75d7c4 Bug 949819 - Move remaining ReadPixels and GetTexImage helpers out of GLContext - r=jgilbert 2014-01-02 10:17:29 -05:00
Benoit Jacob
55194a48ab 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
fe9ec04962 Bug 950504. Remove MatrixForThebesMatrix. r=mattwoodrow 2013-12-16 11:17:58 +13:00
Dan Glastonbury
db624cee33 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
00b34256be Bug 942506 - Remove ApplyFilterToBoundTexture from GLContext - r=bjacob
Move it to CompositorOGL.
2013-12-09 14:07:18 +10:00
Birunthan Mohanathas
88a0348924 Bug 713082 - Part 2: Rename Util.h to ArrayUtils.h. r=Waldo 2013-12-08 21:52:54 -05:00
Dan Glastonbury
322cce7ba6 Bug 942507 - GLContext doesn't need to have userdata. r=bjacob 2013-12-06 10:23:16 -05:00
Benoit Jacob
7c0a80f305 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
3ad5f0eb75 Bug 942499 - Part 1: Move CanUploadSubTextures and WantsSmallTiles out of GLContext - r=BenWa 2013-12-03 13:44:38 -05:00
Nicolas Silva
5a656fd2d9 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