Commit Graph

151 Commits

Author SHA1 Message Date
Chris Peterson
143832c938 Bug 1010706 - Fix uninitialized variable warnings in gfx/layers/opengl/CompositorOGL.cpp. r=mwoodrow 2014-05-16 00:35:13 -07:00
Chris Peterson
398a6f5a8d Backed out changeset 9c586b1649d7 for wrong bug number: s/1007708/1010706/ 2014-05-16 00:33:16 -07:00
Chris Peterson
1c759c64ad Bug 1007708 - Fix uninitialized variable warnings in gfx/layers/opengl/CompositorOGL.cpp. r=mwoodrow 2014-05-14 20:15:36 -07:00
Matt Woodrow
dbd6f4096d Bug 950312 - Part 5: Implement SCREEN and MULTIPLY for CompositorOGL. r=mtseng 2014-05-09 22:06:18 +12:00
Benoit Jacob
7d4874a620 Bug 1005658 - Don't pass stack pointers to the GL for buffers, and have GLContext try to guard against it - r=jgilbert 2014-05-08 21:03:37 -04:00
Jonathan Watt
d7d9854e2c Bug 1001683 - Convert a bunch of ReadPixelsIntoImageSurface callers to ReadPixelsIntoDataSurface callers (Moz2D migration). r=mattwoodrow 2014-04-29 00:26:54 +01:00
Benoit Jacob
b2aed07c9a Bug 989144 - Convert EffectChain::mSecondaryEffects to be an EnumeratedArray - r=nical 2014-04-25 22:34:06 -04:00
Benoit Jacob
d6cc951507 Bug 987311 - 6/6 - Convert the rest of CompositorTypes.h to typed enums, final manual changes - r=nical 2014-04-25 22:34:06 -04:00
Benoit Jacob
dd92d414d0 Bug 987311 - 5/6 - Convert the rest of CompositorTypes.h to typed enums, auto regex changes - r=nical
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)DIAGNOSTIC_\(NONE\|TILE_BORDERS\|LAYER_BORDERS\|BIGIMAGE_BORDERS\|FLASH_BORDERS\)\($\|[^A-Za-z0-9_]\)/\1DiagnosticTypes::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/DiagnosticTypes\:\:NONE/DiagosticTypes::NO_DIAGNOSTIC/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)DIAGNOSTIC_\(IMAGE\|CONTENT\|CANVAS\|COLOR\|CONTAINER\|TILE\|BIGIMAGE\|COMPONENT_ALPHA\|REGION_RECT\)\($\|[^A-Za-z0-9_]\)/\1DiagnosticFlags::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)EFFECT_\(MASK\|MAX_SECONDARY\|RGB\|YCBCR\|COMPONENT_ALPHA\|SOLID_COLOR\|RENDER_TARGET\|MAX\)\($\|[^A-Za-z0-9_]\)/\1EffectTypes::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)TEXTURE_\(CONTENT\|SHMEM\|YCBCR\|SHARED_GL\|SHARED_GL_EXTERNAL\|STREAM_GL\|FALLBACK\)\($\|[^A-Za-z0-9_]\)/\1DeprecatedTextureClientType::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(BUFFER_UNKNOWN\|BUFFER_IMAGE_SINGLE\|BUFFER_IMAGE_BUFFERED\|BUFFER_BRIDGE\|BUFFER_CONTENT\|BUFFER_CONTENT_DIRECT\|BUFFER_CONTENT_INC\|BUFFER_TILED\|BUFFER_SIMPLE_TILED\|COMPOSITABLE_IMAGE\|COMPOSITABLE_CONTENT_SINGLE\|COMPOSITABLE_CONTENT_DOUBLE\|BUFFER_COUNT\)\($\|[^A-Za-z0-9_]\)/\1CompositableType::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/CompositableType\:\:COMPOSITABLE_/CompositableType::/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)TEXTURE_HOST_\(DEFAULT\|TILED\|COPY_PREVIOUS\)\($\|[^A-Za-z0-9_]\)/\1DeprecatedTextureHostFlags::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)Texture\(Front\|Back\|OnWhiteFront\|OnWhiteBack\)\($\|[^A-Za-z0-9_]\)/\1TextureIdentifier::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(OPEN_NONE\|OPEN_READ\|OPEN_WRITE\|OPEN_READ_WRITE\|OPEN_READ_ONLY\|OPEN_WRITE_ONLY\)\($\|[^A-Za-z0-9_]\)/\1OpenMode::\2\3/g'
find gfx/layers -type f | grep -v CompositorTypes.h | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(MaskNone\|Mask2d\|Mask3d\|NumMaskTypes\)\($\|[^A-Za-z0-9_]\)/\1MaskType::\2\3/g'
find gfx -type f | xargs sed -i 's/Diagostic/Diagnostic/g'
2014-04-25 22:34:06 -04:00
Blair McBride
3b0373f215 Backed out 9 changesets (bug 987311, bug 989027, bug 989144). r=sheriff
Backed out changeset 046c061d91c2 (bug 989144)
Backed out changeset 3f1b41adeaef (bug 987311)
Backed out changeset 8d5a171564bd (bug 987311)
Backed out changeset dcc0d016de7a (bug 987311)
Backed out changeset 27f338fbc835 (bug 989027)
Backed out changeset 4a67f5144ea4 (bug 989027)
Backed out changeset 62ba0a377450 (bug 987311)
Backed out changeset 6a2542a5c865 (bug 987311)
Backed out changeset 1dfd9a457f34 (bug 987311)
2014-04-27 19:45:08 +12:00
Benoit Jacob
c4a910a1bd Bug 989144 - Convert EffectChain::mSecondaryEffects to be an EnumeratedArray - r=nical 2014-04-25 22:34:06 -04:00
Benoit Jacob
9a5c85f26f Bug 987311 - 6/6 - Convert the rest of CompositorTypes.h to typed enums, final manual changes - r=nical 2014-04-25 22:34:06 -04:00
Benoit Jacob
1eb595b102 Bug 987311 - 5/6 - Convert the rest of CompositorTypes.h to typed enums, auto regex changes - r=nical 2014-04-25 22:34:06 -04:00
Jonathan Watt
0a0470e24e Bug 996901 - Remove lots of gfxASurface.h and gfxImageSurface.h includes and forward declarations that are no longer needed. r=mattwoodrow 2014-04-16 01:41:40 +01:00
Botond Ballo
a250e38342 Bug 984490 - Make Compositor::GetCurrentRenderTarget() const. r=nical 2014-04-02 03:27:42 -04:00
Andreas Gal
98a1b26a3b Bug 978479 - Remove flipped quad texture from mQuadVBO. r=bjacob 2014-04-02 09:02:07 -04:00
Benoit Jacob
a1ecb819d5 Bug 990233 - Back out Bug 978479 and Bug 980364 because of a 5% tresize regression on Mac OSX 10.6 - no review, just a backout on a CLOSED TREE 2014-03-31 22:31:24 -04:00
Benoit Jacob
89317548d7 Bug 987828 - 3/4 - Use IsGLES instead of IsGLES2 - r=jgilbert 2014-03-31 05:10:49 -04:00
Andreas Gal
52c87fb66f Bug 978479 - remove flipped quad texture from mQuadVBO. r=bjacob 2014-03-29 20:49:00 +01:00
Andreas Gal
bc0a24c671 Bug 980364 - Add GLDrawRectHelper and use it from GLBlitTextureImageHelper. r=bjacob 2014-03-30 17:37:00 +02:00
Matt Woodrow
6fa7f32cb8 Bug 980642 - Clean up Compositor::clearFBRect API. r=roc 2014-03-28 16:38:32 +13:00
Ryan VanderMeulen
23aa865b55 Merge m-c to b2g-inbound. 2014-03-26 23:09:04 -04:00
Sotaro Ikeda
f0adcd4de5 Bug 977880 - Handle ReleaseFence on tiled thebes layer r=cwiiis,nical,BenWa 2014-03-26 18:01:15 -07:00
Nicolas Silva
a50a1c238f 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
cce7a0f617 Bug 984823 - Use clamp to edges with tiles on b2g. r=Cwiiis 2014-03-21 13:54:13 +01:00
James Willcox
4e281c3ced Bug 985487 - Don't try to use GL_TEXTURE_RECTANGLE_ARB on ES2 r=mwoodrow 2014-03-26 13:23:44 -05:00
Nicolas Silva
dff3008712 Bug 984618 - Clear the CompositorOGL's unused textures when aborting a frame. r=Bas. 2014-03-26 16:56:30 +01:00
Ed Morley
bf4fce1ce6 Backed out changeset 4c963fa4683b (bug 985487) 2014-03-26 15:14:54 +00:00
James Willcox
cc466ea568 Bug 985487 - Don't try to use GL_TEXTURE_RECTANGLE_ARB on ES2 r=mwoodrow 2014-03-26 09:11:42 -05:00
Wes Kocher
01bb0237bc Merge inbound to m-c 2014-03-18 14:15:03 -07:00
Nicolas Silva
85b1390416 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
c50c5a7897 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
71aa8e63c2 Bug 983157: Backout bug 980647 (31844306c2f1, dcd632ee9a3e). r=backout 2014-03-13 18:55:52 +01:00
Matt Woodrow
2dffa5241b Bug 971914 - Make TextureSourceOGL responsible for tracking filter state. r=nical 2014-03-13 13:37:17 +13:00
Matt Woodrow
3c5f73d2c4 Bug 971914 - Don't set and restore state constantly inside CompositorOGL. r=nical 2014-03-13 13:37:17 +13:00
Nicolas Silva
a8433b2959 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
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
Ryan VanderMeulen
686f33d9bb Backed out changeset 96f2905b175d (bug 978479) for OSX reftest failures.
CLOSED TREE
2014-03-06 14:14:52 -05:00
Andreas Gal
4ff50539b6 Bug 978479 - Remove flipped quad texture from mQuadVBO. r=bjacob 2014-03-06 12:50:29 -05:00
Andreas Gal
cd70980d39 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
7445b1e2ba 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
7d55b28a7d Bug 976717 - Pass the Framebuffer rectangle to be cleared to LayerComposite. r=ncameron 2014-02-27 11:07:34 -08:00
Milan Sreckovic
6d1dbe84a1 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
5cfad48454 Bug 975121 - Fix reversed colors with gfx.xrender.enabled = false. r=gal 2014-02-24 10:09:55 -05:00
Morris Tseng
6998680bed 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
785a0402ee Bug 963952 - [e10s] Don't use basic compositor when using D3D11 compositor (r=mattwoodrow) 2014-02-13 08:53:50 -08:00
Benoit Girard
828b60ea42 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
33d1508c1d 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
2862b29b17 b=951799, cache uniforms in OGLShaderProgram, part 2 - fix LayerProgramProjectionMatrix; r=bjacob 2014-01-29 17:53:38 -05:00
David Zbarsky
b03cdd7b39 Bug 952977: Convert CompositingRenderTargetOGL to gfx::Matrix4x4 r=nical 2014-01-27 15:25:21 -05:00