Matt Woodrow
d2d5e5b9a3
Bug 1150944 - Add a flags parameter to GLContextProvider functions instead of a bool. r=jgilbert
2015-07-29 16:35:55 -04:00
Wes Kocher
ec1078c65a
Backed out 6 changesets (bug 1150944, bug 1034370) for build failures in WebGLContext.cpp CLOSED TREE
...
Backed out changeset e2a6160242e5 (bug 1150944)
Backed out changeset 1c510537d20b (bug 1150944)
Backed out changeset 7ae813666ed5 (bug 1150944)
Backed out changeset 2f29ac2e31cd (bug 1150944)
Backed out changeset bf7681b1567e (bug 1150944)
Backed out changeset 79c6b8d014d2 (bug 1034370)
2015-07-29 14:16:17 -07:00
Matt Woodrow
501c8bec02
Bug 1150944 - Add a flags parameter to GLContextProvider functions instead of a bool. r=jgilbert
2015-07-29 16:35:55 -04:00
Vladimir Vukicevic
a0b4b85e51
Bug 1179935, introduce complex viewport projections to Compositor, remove PrepareViewport; r=mstange
...
---
gfx/layers/Compositor.h | 10 ---
gfx/layers/basic/BasicCompositor.h | 2 -
gfx/layers/composite/TextureHost.h | 34 +++++++-
gfx/layers/d3d11/CompositorD3D11.cpp | 47 +++++++---
gfx/layers/d3d11/CompositorD3D11.h | 4 +-
gfx/layers/d3d9/CompositorD3D9.h | 2 +-
gfx/layers/opengl/CompositingRenderTargetOGL.cpp | 23 +++--
gfx/layers/opengl/CompositingRenderTargetOGL.h | 2 +
gfx/layers/opengl/CompositorOGL.cpp | 104 +++++++++++++----------
gfx/layers/opengl/CompositorOGL.h | 6 +-
10 files changed, 145 insertions(+), 89 deletions(-)
2015-05-19 13:51:26 -04:00
Sotaro Ikeda
7905fa06eb
Bug 1187048 - Code clean up around nsScreenGonk's EGLSurface handling r=mwu
2015-07-24 10:56:05 -07:00
Birunthan Mohanathas
a8939590de
Bug 1182996 - Fix and add missing namespace comments. rs=ehsan
...
The bulk of this commit was generated by running:
run-clang-tidy.py \
-checks='-*,llvm-namespace-comment' \
-header-filter=^/.../mozilla-central/.* \
-fix
2015-07-13 08:25:42 -07:00
Robert O'Callahan
39d3278ef9
Bug 1143575. Make GL context current before cleaning up programs. r=nical
...
Otherwise we can get a crash with the following stack:
Program received signal SIGSEGV, Segmentation fault.
[Switching to Thread 14711]
0x5d99974e in mozilla::gl::GLContext::BeforeGLCall (this=0x6dbf0800,
funcName=0x60f251a4 <mozilla::gl::GLContext::raw_fDeleteProgram(unsigned int)::__PRETTY_FUNCTION__> "void mozilla::gl::GLContext::raw_fDeleteProgram(GLuint)") at /home/roc/mozilla-inbound/gfx/gl/GLContext.h:683
683 MOZ_ASSERT(IsCurrent());
(gdb) where
#0 0x5d99974e in mozilla::gl::GLContext::BeforeGLCall (this=0x6dbf0800,
funcName=0x60f251a4 <mozilla::gl::GLContext::raw_fDeleteProgram(unsigned int)::__PRETTY_FUNCTION__> "void mozilla::gl::GLContext::raw_fDeleteProgram(GLuint)") at /home/roc/mozilla-inbound/gfx/gl/GLContext.h:683
#1 0x5d99bed6 in mozilla::gl::GLContext::raw_fDeleteProgram (this=0x6dbf0800, program=210003)
at /home/roc/mozilla-inbound/gfx/gl/GLContext.h:2232
#2 0x5d99c10a in mozilla::gl::GLContext::fDeleteProgram (this=0x6dbf0800, program=210003)
at /home/roc/mozilla-inbound/gfx/gl/GLContext.h:2270
#3 0x5daa0ae6 in mozilla::layers::ShaderProgramOGL::~ShaderProgramOGL (this=0x6d7df000, __in_chrg=<optimized out>)
at /home/roc/mozilla-inbound/gfx/layers/opengl/OGLShaderProgram.cpp:491
#4 0x5da86bdc in mozilla::layers::CompositorOGL::CleanupResources (this=0x67ae4d70)
at /home/roc/mozilla-inbound/gfx/layers/opengl/CompositorOGL.cpp:177
--HG--
extra : commitid : LPnSogXNNio
extra : rebase_source : 0564dd5688916271c4a709ae6f15ba7ad493a761
2015-06-12 03:18:46 +12:00
Nicolas Silva
820e9182e7
Bug 1170189 - Remove the TiledLayerComposer interface. r=BenWa
2015-07-01 13:51:03 +02:00
Nathan Froyd
974d8120f2
Bug 1161627 - part 2 - machine-convert TemporaryRef<T> to already_AddRefed<T>; r=ehsan
...
This conversion was done with the script:
find . -name '*.cpp' -o -name '*.h' -o -name '*.mm' -o -name '*.idl' | \
egrep -v 'cairo-win32-refptr.h|RefPtr.h|TestRefPtr.cpp' | \
xargs sed -i -e 's/mozilla::TemporaryRef</already_AddRefed</g' \
-e 's/TemporaryRef</already_AddRefed</g'
Manual fixups were performed in the following instances:
- We handled mfbt/RefPtr.h manually so as to not convert TemporaryRef itself
into already_AddRefed.
- The following files had explicit Move() calls added to make up for the lack
of a copy constructor on already_AddRefed:
dom/base/ImageEncoder.cpp
dom/media/MediaTaskQueue.{h,cpp}
dom/media/webaudio/PannerNode.cpp
- A redundant overload for MediaTaskQueue::Dispatch was deleted.
- A few manual fixups were required in mfbt/tests/TestRefPtr.cpp.
- Comments, using declarations, and forward declarations relating to
TemporaryRef in dom/canvas/ and gfx/layers/ were changed to refer to
already_AddRefed.
2015-06-17 10:00:52 -04:00
Wes Kocher
516ac5b38c
Merge b2ginbound to central, a=merge
2015-06-09 19:25:38 -07:00
JerryShih
379b1ccd1d
Bug 1170966 - Check quad's effective region before drawing. r=nical, a=me
2015-06-09 10:53:00 -04:00
Shelly Lin
fba7c0fcc2
Bug 1138287 - Part 2: Support multi-screen on Gonk platform. r=mwu, r=sotaro, r=jgilbert, r=mattwoodrow
...
--HG--
extra : histedit_source : 02c96bba0e933c85d9af2566d1c9c8d04d120a31
2015-06-05 11:29:30 +08:00
Ryan VanderMeulen
5dbfe24c4c
Backed out changeset 89807785d4d4 (bug 1170966) for OSX 10.10 reftest failures.
2015-06-05 11:12:09 -04:00
JerryShih
9abcf66979
Bug 1170966 - check quad's effective region before drawing. r=nical
...
--HG--
extra : rebase_source : b86ad435e279070e4f685dc52b7e128f533832d9
2015-06-03 08:04:00 +02:00
Kearwood (Kip) Gilbert
4c0de7c81a
Bug 766345 - Part 3 - Implement correct clipping of DEAA edges for quads that cross the w=0 plane (v3 Patch). r=vlad
...
- Use Matrix4x4::ProjectAndClipRect for accurate calculation of DEAA edge
line coefficients of quads clipped by the view frustum.
2015-05-08 11:21:45 -07:00
Kearwood (Kip) Gilbert
e25ede39ea
Bug 766345 - Part 1 - Implement DEAA Antialiasing for transformed layers (v5 Patch). r=vladimir, r=djg
2014-12-17 16:28:45 -08:00
Amanda Sambath
7cade29011
Bug 1158120 - Replace gfxIntSize by mozilla::gfx::IntSize in gfx/layers. r=nical
2015-05-28 11:59:15 +02:00
CJKu
1b6a5e265d
Bug 1163908 - Export GL draw data to layerscope for drawing heat-map view. r=:djg
2015-05-22 11:36:00 +02:00
Nathan Froyd
db188ea282
Bug 1160485 - remove implicit conversion from RefPtr<T> to TemporaryRef<T>; r=ehsan
...
Having this implicit conversion means that we can silently do extra
refcounting when it's completely unnecessary. It's also an obstacle to
making RefPtr more nsRefPtr-like, so let's get rid of it.
2015-05-01 09:14:16 -04:00
Ethan Lin
cdc345235c
Bug 1155498 - Part 3 - Use new FenceHandle to handle the fence in Compositor. r=sotaro
...
--HG--
extra : rebase_source : cca9aa2fbb07f2c00741fb33ce33d7e2db1ba0f2
2015-05-13 00:37:00 +02:00
Thibaud Backenstrass
f8d4cbad76
Bug 1158122 - Remove the remaining occurences of nsIntRect in gfx/layers. r=nical
2015-05-07 11:07:53 +02:00
Thibaud Backenstrass
f8fc65a155
Bug 1157661 - Fix a null-check in CompositorOGL::DrawQuad. r=nical
2015-05-05 18:31:41 +02:00
Sotaro Ikeda
5879b59690
Bug 1152370 part 3 - Use DisplaySurface r=mwu
2015-04-23 06:49:40 -07:00
Sotaro Ikeda
053aaa45c3
Bug 1152135 - Split EGLSurface buffer swap and HWC buffer swap r=mwu,nical,jgilbert
2015-04-17 09:28:41 -07:00
Carsten "Tomcat" Book
eba45dcee4
Backed out changeset abe6234be8a3 (bug 1152135) for Android 4 opt/debug perma failure
2015-04-17 12:04:55 +02:00
Sotaro Ikeda
7078be3faa
Bug 1152135 - Split EGLSurface buffer swap and HWC buffer swap r=mwu,nical,jgilbert
2015-04-16 18:15:26 -07:00
Sotaro Ikeda
a3181c2cc5
Backed out changeset 29d01ad10d0b (bug 1152135)
2015-04-13 12:28:06 -07:00
Sotaro Ikeda
1a785adc42
Bug 1152135 - Split EGLSurface buffer swap and HWC buffer swap r=mwu,nical,jgilbert
2015-04-12 11:23:46 -07:00
Milan Sreckovic
76dd5cd892
Bug 1140113 - Catch direct (and some indirect) callers of CreateDrawTarget* and deal with failure. r=mstange
2015-03-09 15:48:20 -04:00
Jeff Gilbert
d3813c406b
Bug 1124394 - Support Core profiles for GLContext. - r=kamidphish
2015-02-12 19:00:41 -08:00
Nicholas Nethercote
242708cf72
Bug 1127201 (attempt 2, part 1) - Replace most NS_ABORT_IF_FALSE calls with MOZ_ASSERT. r=Waldo.
...
--HG--
extra : rebase_source : 488e401ff87e31a2074c4108c4df0572d9536667
2015-02-09 14:34:50 -08:00
Andrew McCreight
d3826daa16
Back out Bug 1127201 (part 2) for various problems.
2015-02-06 15:04:32 -08:00
Jeff Gilbert
56b00391c3
Backout 80a88a3badba for causing bug 1130086.
2015-02-06 11:37:04 -08:00
Nicholas Nethercote
d34f0301b8
Bug 1127201 (part 2) - Convert all NS_ABORT_IF_FALSE calls to MOZ_ASSERT. r=Waldo.
...
--HG--
extra : rebase_source : 99182e70335d2b5ff95f8c528ae992d37294be3a
2015-02-04 20:05:36 -08:00
Jeff Gilbert
680ae080b6
Bug 1124394 - Support WebGL 2 with Core Profiles on Mac. - r=kamidphish
2015-02-04 16:34:55 -08:00
Wes Kocher
d7313c3320
Backed out changeset 176166c0bae9 (bug 1124394) for b2g device bustage on a CLOSED TREE
2015-01-29 14:23:37 -08:00
Jeff Gilbert
95f269cb3f
Bug 1124394 - Support WebGL on Core Profiles on Mac. - r=kamidphish
2015-01-29 00:44:19 -08:00
Benoit Girard
9b8c2dc37d
Bug 1068190 - Part 1: Add foundation for compositor unit tests. r=mstange
2015-01-14 17:24:09 -05:00
Nicholas Nethercote
b4adaf93a3
Bug 1117639 - Remove AbortFrame() because it is dead. r=bas.
...
--HG--
extra : rebase_source : 7df4840fb99dc025ee102d9697097caa4034fa6d
2015-01-05 15:54:51 -08:00
Vladimir Vukicevic
e80e04cd17
Bug 1036602 - Add GL support for VR rendering; r=BenWa
...
From aec0bd50768482fe516111010bad2e57f01ede36 Mon Sep 17 00:00:00 2001
---
gfx/layers/moz.build | 1 +
gfx/layers/opengl/CompositingRenderTargetOGL.h | 4 +
gfx/layers/opengl/CompositorOGL.cpp | 14 ++
gfx/layers/opengl/CompositorOGL.h | 38 +++
gfx/layers/opengl/CompositorOGLVR.cpp | 326 +++++++++++++++++++++++++
5 files changed, 383 insertions(+)
create mode 100644 gfx/layers/opengl/CompositorOGLVR.cpp
2014-07-09 12:28:27 -07:00
Jeff Muizelaar
31512f67b3
Bug 1073036. layers: Track program state more carefully to avoid setting unnecessarily. r=nical
...
This introduces some infrastructure to start tracking the program state more carefully. Currently
it only tracks the program because UseProgram was showing up the most in profiles, but more
state could also be added as needed.
--HG--
extra : rebase_source : 289ab867ef63032f7604a6cbe6d0230fd0a9411a
2014-11-10 14:34:06 -05:00
Carsten "Tomcat" Book
7f42025e12
Backed out changeset 48667a14f94d (bug 1092360) for test bustage / crashes on a CLOSED TREE
2014-11-14 08:14:22 +01:00
Benoit Girard
db4fbee6fb
Bug 1092360 - Avoid redundant framebuffer switches. r=jrmuizel
2014-11-12 17:39:17 -05:00
Jeff Muizelaar
f2786d3f9f
Bug 1097877. Move GLBlitTextureImageHelper from gfx/gl to gfx/layers/opengl. r=nical
...
The only user is in layers/opengl. This is needed to do better state tracking
in the compositor.
--HG--
rename : gfx/gl/GLBlitTextureImageHelper.cpp => gfx/layers/opengl/GLBlitTextureImageHelper.cpp
rename : gfx/gl/GLBlitTextureImageHelper.h => gfx/layers/opengl/GLBlitTextureImageHelper.h
extra : rebase_source : bba00cbfac9253ca933721659dadbda2bfbe65c5
2014-11-10 14:49:05 -05:00
Douglas Crosher
3425fffc61
Bug 1021367 - Assertion failure in GetShaderConfigFor. r=nical
2014-06-09 20:10:28 +10:00
Jeff Gilbert
d41ee052e4
Bug 1088345 - Improve glGetError handling. - r=kamidphish
2014-10-24 16:52:35 -07:00
Jeff Gilbert
44490638fd
Bug 1088417 - DecomposeIntoNoRepeatRects for D3D11. - r=nical
2014-10-23 17:08:06 -07:00
Benoit Girard
e56f3b4b68
Bug 737967 - Add simple platform GPU Profiling based on GL_TIME_ELAPSED_EXT. r=ehsan,jgilbert
2014-05-24 16:14:14 +00:00
Ryan VanderMeulen
fce5fdc4c8
Backed out changeset 157b1f4e4ed2 (bug 737967) for Windows B2G desktop bustage.
...
CLOSED TREE
2014-10-22 12:44:49 -04:00
Benoit Girard
03e4a59d59
Bug 737967 - Add simple platform GPU Profiling based on GL_TIME_ELAPSED_EXT. r=ehsan,jgilbert
2014-05-24 16:14:14 +00:00
Sotaro Ikeda
bae6e432e4
Bug 1067455 - Reduce Fence::merge() call on compositor thread r=nical
2014-10-06 15:45:03 -07:00
Phil Ringnalda
674424f954
Back out ef1cd14c8cac (bug 1067455) for Windows assertion failures
...
CLOSED TREE
2014-10-05 19:16:56 -07:00
Sotaro Ikeda
41fa2ab6fd
Bug 1067455 - Reduce Fence::merge() call on compositor thread r=nical
2014-10-05 14:14:33 -07:00
Chris Lord
493252838e
Bug 1006797 - Only apply the window render offset when actually rendering to the window. r=nical
...
--HG--
extra : rebase_source : 24f2d8c50e5c0ddfa6683291040a78574d631678
2014-10-03 13:22:32 +13:00
Nicolas Silva
24ab6f3545
Bug 1054581 - Have all compositor backends behave consistently when creating a zero-sized intermediate render target. r=jrmuizel
2014-09-26 15:02:35 -04:00
Jeff Muizelaar
abf0ba5dbd
Bug 1073039. Change uniform workaround to use raw gl. r=mstange
...
Bug 1073036 is changing the way we track shader state. Making
this use raw gl instead of Activate() allows CompositorOGL
to remain ignorant of it.
--HG--
extra : rebase_source : ed7e98b35b3fb7c7ea902ee921e09f9cf620b245
2014-09-24 15:06:09 -04:00
Milan Sreckovic
0c06648d5e
Bug 1000634 - Only ask for the composer if we have a compositable host, when doing fencing. r=sikeda,nsilva
2014-09-08 14:05:41 -04:00
Jeff Muizelaar
34032eed5e
Bug 1064479. Redo how screen rotation is implemented on B2G/Layers. r=nical,mwoodrow
...
Currently we use a world transform on the LayerManager. This gets passed to the
screen render target which adjusts the gl transform to accomplish the rotation.
This causes a lot of the system to have to know about the transform.
Instead we can just bake the transform into the root layer's shadow transform.
Everything now mostly just works.
--HG--
extra : rebase_source : e0e170d191eef5887a2e6b17f71ac79037033006
2014-09-10 15:59:00 -04:00
Jonathan Watt
423fda249a
Bug 1065031, part 2 - Changes to Moz2D consuming code to update callers of Moz2D Matrix's Translate, Scale and Rotate methods to use these methods' new names. r=Bas
2014-09-10 18:29:35 +01:00
Jeff Muizelaar
6458e7d04e
Bug 1049564. Remove sketchy sizing code from CompositorOGL. r=nical
...
This came from the layers refactoring and taking it out doesn't
seem to cause any test failures.
2014-09-08 10:54:26 -04:00
Michael Comella
bd98315700
Bug 1046017 - Backed out changesets 1c213218173f & 8588817f7f86 (bugs 1017427
& 1006797)
2014-09-04 18:07:59 -07:00
Nicolas Silva
c1d9ac4e02
Bug 1059793 - Mark the compositor's gl context destroyed before the widget is gone. r=jgilbert
2014-09-02 14:05:00 +02:00
Botond Ballo
a5db405d9f
Bug 1057642 - Revert [Int]::PointTyped::[x|y] to be of primitive type. r=kats
...
--HG--
extra : rebase_source : 55e56423f6c8f5278315a6dc9dfcb9fb983c9309
2014-08-28 12:45:48 -04:00
Milan Sreckovic
4455d895e8
Bug 1033310: Handle CreateDataSourceSurface* returning nullptr. f=nsilva, r=bschouten
2014-08-27 11:57:43 -04:00
Kartikaya Gupta
08b5038258
Bug 1055605 - Replace MOZ_ANDROID_OMTC with MOZ_WIDGET_ANDROID. r=BenWa
2014-08-22 15:26:56 -04:00
Markus Stange
956961d1a3
Bug 1055585 - Support OP_SOURCE blend mode in CompositorOGL. r=mattwoodrow
2014-08-20 17:23:57 +02:00
chiajung hung
d7c7e3a117
Bug 1002823 - [Stingray] Add a new kind of image layer without graphic buffer for overlaying video input. r=nical
2014-08-18 22:14:00 -04:00
Botond Ballo
ffebd18f0b
Bug 923512 - Introduce strongly-typed coordinate classes. r=kats,Bas
...
--HG--
extra : rebase_source : 22e5fe577ea503aede765c70e16c0bf875c4a9fd
2014-08-19 13:08:16 -04:00
Jeff Muizelaar
df48ffb1b7
Bug 1016539. Add support for accelerated a11y filters. r=mwoodrow
...
This adds the ability to render to a temporary surface and use that
to apply a filter effect to all of the content.
2014-08-07 17:44:08 -04:00
Benoit Girard
07510ca060
Bug 1052857 - Overdraw should report dst pixels, not src pixels. r=jrmuizel
2014-08-12 18:46:16 -04:00
David Zbarsky
b3e61c206f
Bug 952977: More gfx::Matrix cleanups r=nical
2014-08-01 08:31:49 -04:00
Wes Kocher
3c155637a3
Backed out 11 changesets (bug 952977) for reftest-no-accel failures
...
Backed out changeset ea2367c19da3 (bug 952977)
Backed out changeset c401c8748eb3 (bug 952977)
Backed out changeset a93e9ff1043b (bug 952977)
Backed out changeset 765b7f67163e (bug 952977)
Backed out changeset 3d8cf4f5777f (bug 952977)
Backed out changeset 8993710a3ab3 (bug 952977)
Backed out changeset 1298c39b745a (bug 952977)
Backed out changeset be0b899fbe5e (bug 952977)
Backed out changeset f69bea1f1feb (bug 952977)
Backed out changeset 1a745777f07e (bug 952977)
Backed out changeset 5ad1d18dfe17 (bug 952977)
2014-07-29 18:58:46 -07:00
David Zbarsky
ecf49e22a2
Bug 952977: More gfx::Matrix cleanups r=nical
2014-07-29 19:18:51 -04:00
David Zbarsky
cde5243eed
Fixup changeset f17694ec185b for bug 952977 r=me
2014-07-21 22:05:18 -04:00
David Zbarsky
09ac7edd0d
Bug 952977: Switch some remaining gfxMatrix uses in layers to gfx::Matrix r=nical
2014-07-21 21:37:57 -04:00
Kartikaya Gupta
120f705ed7
Bug 1031494 - Move the FBO texture clamping code so that the OGL CompositingRenderTarget gets the unclamped size. r=BenWa
2014-07-04 20:21:36 -04:00
Boris Chiou
b86e69633f
Bug 975346 - Part 2: Support LayerScope for HwcComposer2D. r=dglastonbury
...
1. Retrieve buffer from GPU.
2. Refactor - use SenderHelper class to manage the Sender
static function structure.
2014-07-03 01:17:00 +02:00
Chris Peterson
146b02353e
Bug 1031165 - Fix non-unified OS X build's warnings-as-errors in gfx/layers. r=bjacob
2014-06-26 23:36:27 -07:00
Markus Stange
05bc7e1458
Bug 987497 - Force buggy drivers to pick up the TexturePass2 uniform change. r=bjacob
...
--HG--
extra : rebase_source : 8784c1240c5e538d95608e10a7b161b4373037cb
2014-06-26 14:40:11 +02:00
Benoit Jacob
bbe96eeda6
Bug 1029673 - Correctly report OMTC compositing in crash reports - r=Bas
2014-06-24 22:09:14 -04:00
Benoit Jacob
7784d25921
Bug 1028420 - Non-unified build fails when using --enable-warnings-as-errors - bustage fix, no review
2014-06-23 14:49:09 -04:00
Jonathan Watt
6200c18bc8
Bug 1025490
- Stop using gfxImageSurface in the layers code. r=Bas
2014-06-17 18:35:51 +01:00
Sotaro Ikeda
2a12607713
Bug 1025781 - Add CreateDataSourceSurface() failure checks r=nical
2014-06-16 16:47:28 -07:00
Chris Lord
0c3504655d
Bug 1017427
- Fix CompositorOGL RenderOffset not offsetting clipping rect. r=nical
2014-06-09 16:53:35 +01:00
Tatiana Meshkova
b6333c93ee
Bug 1019405 - Fix offscreen rendering for top level Layer manager. r=jgilbert
2014-06-03 20:41:00 +02:00
Carsten "Tomcat" Book
d4c8237c25
Backed out changeset 07a74e6e53b2 (bug 1017427
) for reftest failures on a CLOSED TREE
2014-06-04 16:05:24 +02:00
Chris Lord
cc1a8300cb
Bug 1017427
- Fix CompositorOGL RenderOffset not offsetting clipping rect. r=nical
2014-06-04 13:26:57 +01:00
Phil Ringnalda
ea43347d66
Back out 710b11cd8e47 (bug 1016086) for Android robocop bustage
2014-06-01 13:16:44 -07:00
Andreas Gal
1d8c6b36e5
Bug 1016086 - Part 4: Setup attribute configuration when we start compositing instead of for every draw command (r=Bas)
2014-06-01 10:44:42 -07:00
Phil Ringnalda
3e5340dd29
Merge f-t to m-c
2014-05-31 20:31:07 -07:00
Andreas Gal
f95f79bea7
Bug 1017571 - Use TRIANGLES instead of TRIANGLE_STRIP to fix rendering glitchs on MacOSX with uniform array access (r=Bas)
2014-05-30 22:34:14 -04:00
Victor Porof
9ce7e9c089
Bug 1007203 - Always add categories when pushing to the pseudostack, r=djvj
2014-05-23 17:12:29 -04:00
Andreas Gal
ee8dee4c76
Bug 1016086 - Part 1: Use a single attribute in all shaders (r=Bas)
2014-05-29 10:19:37 -04:00
Wes Kocher
f108ef46c1
Backed out 3 changesets (bug 1016086) for robocop bustage on a CLOSED TREE
...
Backed out changeset 450878674b08 (bug 1016086)
Backed out changeset e6b0a5086a81 (bug 1016086)
Backed out changeset 9e572e6623e7 (bug 1016086)
2014-05-28 15:10:32 -07:00
Andreas Gal
823b7c091b
Bug 1016086 - Part 3: Setup attribute configuration when we start compositing instead of for every draw command (r=Bas)
2014-05-28 16:18:46 -04:00
Andreas Gal
39be2ca1b2
Bug 1016086 - Part 1: Use a single attribute in all shaders (r=Bas)
2014-05-28 16:18:36 -04:00
Andreas Gal
47abe4ef63
Bug 1012407 - Part 8: Remove VBOArena which is now dead code (r=Bas)
2014-05-28 14:04:07 -04:00
Andreas Gal
c5c9b67596
Bug 1012407 - Part 7: Use a single GL draw call to draw up to 4 texture quads (r=Bas)
2014-05-28 10:15:31 -04:00
Matt Woodrow
0726340c00
Bug 1013767 - Restrict BasicCompositor snapshots to the bounds of the invalid region. r=nical
2014-05-28 13:21:32 +12:00
Chris Lord
896c1a9861
Bug 1006797 - Fix application of OGL compositor screen render offset. r=nical
2014-05-27 13:31:01 +01:00
Andreas Gal
1a4978569a
Bug 1012407 - Part 9: Ensure texture coordinates are within (0,0)(1,1) and nits for Part 6 (r=Bas)
2014-05-24 02:49:41 +02:00
Nathan Froyd
3087f2eca6
Backout d6c58a2a6da4 (bug 1012407) for various bustages on a CLOSED TREE
2014-05-23 23:36:28 -04:00
Nathan Froyd
a31a0e4ff3
Backout 471244c106e9:634be002dbc9 (bug 1012407)
2014-05-23 23:34:43 -04:00
Andreas Gal
aca5916189
Bug 1012407 - Part 7: Use a single GL draw call to draw up to 4 texture quads (r=Bas)
2014-05-24 04:16:27 +02:00
Andreas Gal
6d44ef02e1
Bug 1012407 - Follow-up nits for part 6.
2014-05-24 04:15:45 +02:00
Andreas Gal
095d4eb7ff
Bug 1012407 - Part 9: Normalize texture coordinates in DecomposeIntoNoRepeatRects (r=BenWa)
2014-05-24 02:49:41 +02:00
Carsten "Tomcat" Book
1c7db51a21
Backed out changeset c4a259f05a18 (bug 1012407) for reftest 5 test failures
2014-05-23 10:37:03 +02:00
Andreas Gal
9d1fa78b53
Bug 1012407 - Part 7: Use a single GL draw call to draw up to 4 texture quads (r=Bas)
2014-05-23 06:10:51 +02:00
Andreas Gal
9c600b1760
Bug 1012407 - Part 6: Eliminate VBO use and DrawQuads and manually draw no-repeat quads (r=Bas)
2014-05-22 12:29:56 +02:00
Andreas Gal
859d692d6a
Bug 1012407 - Part 5: Allow passing a texture rectangle to BindAndDrawQuad (r=Bas)
2014-05-22 12:29:54 +02:00
Wes Kocher
fd7188a2e3
Backed out 4 changesets (bug 1012407) for b2g reftest5 orange on an otherwise CLOSED TREE
...
Backed out changeset 08e17f48aed1 (bug 1012407)
Backed out changeset b17b7b59cf88 (bug 1012407)
Backed out changeset 1c692df3f080 (bug 1012407)
Backed out changeset 560bd45d52de (bug 1012407)
2014-05-21 18:05:15 -07:00
Andreas Gal
9f4e0487b4
Bug 1012407 - Part 8: Remove VBOArena which is now dead code (r=Bas)
2014-05-22 00:47:02 +02:00
Andreas Gal
9a083957f6
Bug 1012407 - Part 7: Use a single GL draw call to draw up to 4 texture quads (r=Bas)
2014-05-22 00:44:40 +02:00
Andreas Gal
8ddd1bd742
Bug 1012407 - Part 6: Eliminate VBO use and DrawQuads and manually draw no-repeat quads (r=Bas)
2014-05-22 00:23:21 +02:00
Andreas Gal
fe26dacc29
Bug 1012407 - Part 5: Allow passing a texture rectangle to BindAndDrawQuad (r=Bas)
2014-05-22 00:23:18 +02:00
Andreas Gal
df606d1b94
Bug 1012407 - Part 4: Always pass the layer rect to BindAndDrawQuad (r=Bas)
2014-05-21 23:36:56 +02:00
Andreas Gal
bab0b9f3d2
Bug 1012407 - Part 3: Eliminate DrawQuadInternal since we no longer need it (r=Bas)
2014-05-21 23:26:38 +02:00
Andreas Gal
013ca12b06
Bug 1012407 - Part 2: Use Moz2D to draw velocity graph and elminiate use of GL_LINE_STRIP (r=Bas)
2014-05-21 23:24:16 +02:00
Chris Peterson
c98852402b
Bug 1010706 - Fix uninitialized variable warnings in gfx/layers/opengl/CompositorOGL.cpp. r=mwoodrow
2014-05-16 00:35:13 -07:00
Chris Peterson
c59284444f
Backed out changeset 9c586b1649d7 for wrong bug number: s/1007708/1010706/
2014-05-16 00:33:16 -07:00
Chris Peterson
c357a77634
Bug 1007708 - Fix uninitialized variable warnings in gfx/layers/opengl/CompositorOGL.cpp. r=mwoodrow
2014-05-14 20:15:36 -07:00
Matt Woodrow
96efeab991
Bug 950312 - Part 5: Implement SCREEN and MULTIPLY for CompositorOGL. r=mtseng
2014-05-09 22:06:18 +12:00
Benoit Jacob
f789513539
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
2a54bb27d4
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
d8c1730c9a
Bug 989144 - Convert EffectChain::mSecondaryEffects to be an EnumeratedArray - r=nical
2014-04-25 22:34:06 -04:00
Benoit Jacob
5004258047
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
2cf9a19eef
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
24b74a2af7
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
8956abd16d
Bug 989144 - Convert EffectChain::mSecondaryEffects to be an EnumeratedArray - r=nical
2014-04-25 22:34:06 -04:00
Benoit Jacob
a53edd3151
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
dc0b0c8367
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
200e95e9eb
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
2343facec1
Bug 984490 - Make Compositor::GetCurrentRenderTarget() const. r=nical
2014-04-02 03:27:42 -04:00
Andreas Gal
1353ac955e
Bug 978479 - Remove flipped quad texture from mQuadVBO. r=bjacob
2014-04-02 09:02:07 -04:00
Benoit Jacob
b8b30aeafd
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
dcf7236aab
Bug 987828 - 3/4 - Use IsGLES instead of IsGLES2 - r=jgilbert
2014-03-31 05:10:49 -04:00
Andreas Gal
e509f31630
Bug 978479 - remove flipped quad texture from mQuadVBO. r=bjacob
2014-03-29 20:49:00 +01:00
Andreas Gal
260e56ecba
Bug 980364 - Add GLDrawRectHelper and use it from GLBlitTextureImageHelper. r=bjacob
2014-03-30 17:37:00 +02:00
Matt Woodrow
3f532a294e
Bug 980642 - Clean up Compositor::clearFBRect API. r=roc
2014-03-28 16:38:32 +13:00
Ryan VanderMeulen
2e5f87b07d
Merge m-c to b2g-inbound.
2014-03-26 23:09:04 -04:00
Sotaro Ikeda
f788f213cf
Bug 977880 - Handle ReleaseFence on tiled thebes layer r=cwiiis,nical,BenWa
2014-03-26 18:01:15 -07: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
James Willcox
9a0238890e
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
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
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