[Texmap] Consolidte redundant code for ARB_RECT texture
Created attachment 178857 [details] Patch
Thanks for fixing the typo... was just about to do it myself.
Comment on attachment 178857 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178857&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperGL.h:48 > + ShouldUseRectTexture = 0x04 ShouldUseARBTextureRect seems more correct.
Created attachment 178919 [details] Patch for landing
Comment on attachment 178919 [details] Patch for landing Rejecting attachment 178919 [details] from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: m/graphics/texmap/TextureMapperGL.cpp patching file Source/WebCore/platform/graphics/texmap/TextureMapperGL.h patching file Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.cpp Hunk #2 succeeded at 243 (offset 18 lines). Hunk #3 succeeded at 256 (offset 18 lines). patching file Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.h Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/15272520
It broke the Qt build: cc1plus: warnings being treated as errors /home/webkitbuildbot/slaves/release32bit-NRWT/buildslave/qt-linux-32-release-NRWT/build/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp: In member function 'void WebCore::TextureMapperGL::drawTexturedQuadWithProgram(WebCore::TextureMapperShaderProgram*, uint32_t, int, const WebCore::IntSize&, const WebCore::TextureMapperGL::DrawQuad&, const WebCore::TransformationMatrix&, float, const WebCore::BitmapTexture*)': [1;31m/home/webkitbuildbot/slaves/release32bit-NRWT/buildslave/qt-linux-32-release-NRWT/build/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:579: error: enumeral mismatch in conditional expression: 'WebCore::Extensions3D::ExtensionsEnumType' vs 'WebCore::GraphicsContext3D::<anonymous enum>'[0m
and the EFL build: /home/buildslave-1/webkit-buildslave/efl-linux-64-release-wk2/build/Source/WebCore/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp: In member function ‘void WebCore::GraphicsSurface::platformPaintToTextureMapper(WebCore::TextureMapper*, const WebCore::FloatRect&, const WebCore::TransformationMatrix&, float, WebCore::BitmapTexture*)’: /home/buildslave-1/webkit-buildslave/efl-linux-64-release-wk2/build/Source/WebCore/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp:442:14: error: ‘SupportsBlending’ is not a member of ‘WebCore::TextureMapperGL’ make[2]: *** [Source/WebCore/CMakeFiles/webcore_efl.dir/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp.o] Error 1 make[2]: *** Waiting for unfinished jobs.... /home/buildslave-1/webkit-buildslave/efl-linux-64-release-wk2/build/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp: In member function ‘void WebCore::TextureMapperGL::drawTexturedQuadWithProgram(WebCore::TextureMapperShaderProgram*, uint32_t, WebCore::TextureMapperGL::Flags, const WebCore::IntSize&, const WebCore::TextureMapperGL::DrawQuad&, const WebCore::TransformationMatrix&, float, const WebCore::BitmapTexture*)’: /home/buildslave-1/webkit-buildslave/efl-linux-64-release-wk2/build/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:579:114: error: enumeral mismatch in conditional expression: ‘WebCore::Extensions3D::ExtensionsEnumType’ vs ‘WebCore::GraphicsContext3D::<anonymous enum>’ [-Werror] cc1plus: all warnings being treated as errors and the GTK build: ../../Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp: In member function ‘virtual void WebCore::GraphicsContext3DPrivate::paintToTextureMapper(WebCore::TextureMapper*, const WebCore::FloatRect&, const WebCore::TransformationMatrix&, float, WebCore::BitmapTexture*)’: ../../Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp:141:101: error: ‘SupportsBlending’ is not a member of ‘WebCore::TextureMapperGL’ make[1]: *** [Source/WebCore/platform/graphics/cairo/libWebCore_la-GraphicsContext3DPrivate.lo] Error 1 make[1]: *** Waiting for unfinished jobs.... ../../Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp: In member function ‘void WebCore::TextureMapperGL::drawTexturedQuadWithProgram(WebCore::TextureMapperShaderProgram*, uint32_t, WebCore::TextureMapperGL::Flags, const WebCore::IntSize&, const WebCore::TextureMapperGL::DrawQuad&, const WebCore::TransformationMatrix&, float, const WebCore::BitmapTexture*)’: ../../Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:579:114: warning: enumeral mismatch in conditional expression: ‘WebCore::Extensions3D::ExtensionsEnumType’ vs ‘WebCore::GraphicsContext3D::<anonymous enum>’ [-Wenum-compare] make[1]: Leaving directory `/home/slave/webkitgtk/gtk-linux-64-release/build/WebKitBuild/Release'
I meant https://trac.webkit.org/changeset/137428. It's strange for me if CQ landed it but didn't comment and close the bug. How is it possible?
Rollout landed in http://trac.webkit.org/changeset/137431 You can simple avoid this situations if you upload appliable patches and wait a little bit for EWS bubbles to become green. Or land the patch manually and wait for the buildbots.
And how could CQ landed it if it wasn't appliable? ...
Created attachment 179032 [details] Patch
(In reply to comment #10) > And how could CQ landed it if it wasn't appliable? ... Yes, I wonder. I would expect this kind of problem if I landed manually, not with CQ.
Comment on attachment 179032 [details] Patch Attachment 179032 [details] did not pass qt-ews (qt): Output: http://queues.webkit.org/results/15296131
Comment on attachment 179032 [details] Patch Attachment 179032 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/15260869
Created attachment 179037 [details] Patch
btw this is the kind of breakage that is really easy to fix without a rollout.
Comment on attachment 179037 [details] Patch Attachment 179037 [details] did not pass qt-ews (qt): Output: http://queues.webkit.org/results/15259997
Comment on attachment 179037 [details] Patch Attachment 179037 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/15282523
Created attachment 179042 [details] Patch
Created attachment 179053 [details] Patch
If you don't set the r?, you should press the "Submit for EWS" button to make the bots test the patch. ;) (I pressed it for you now.)
(In reply to comment #16) > btw this is the kind of breakage that is really easy to fix without a rollout. Actually I take it back. I should have seen this rollout coming :)
Comment on attachment 179053 [details] Patch Clearing flags on attachment: 179053 Committed r137498: <http://trac.webkit.org/changeset/137498>
All reviewed patches have been landed. Closing bug.