Title: [92337] trunk/Source/WebCore
- Revision
- 92337
- Author
- [email protected]
- Date
- 2011-08-03 17:22:21 -0700 (Wed, 03 Aug 2011)
Log Message
[Qt][Texmap][REGRESSION] http://webkit.org/blog-files/transform-style.html doesn't show composited content
https://bugs.webkit.org/show_bug.cgi?id=65629
Reviewed by Benjamin Poulain.
Some non-ES2 initialization was wrongfully #ifdefed in CPU(X86) and thus compiled-out.
When put it in the correct #ifdef, composited layers which require an intermediate buffer
work again.
No new tests. Existing opacity tests in LayoutTests/compositing test this.
* platform/graphics/opengl/TextureMapperGL.cpp:
(WebCore::BitmapTextureGL::bind):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92336 => 92337)
--- trunk/Source/WebCore/ChangeLog 2011-08-04 00:16:43 UTC (rev 92336)
+++ trunk/Source/WebCore/ChangeLog 2011-08-04 00:22:21 UTC (rev 92337)
@@ -1,3 +1,19 @@
+2011-08-03 No'am Rosenthal <[email protected]>
+
+ [Qt][Texmap][REGRESSION] http://webkit.org/blog-files/transform-style.html doesn't show composited content
+ https://bugs.webkit.org/show_bug.cgi?id=65629
+
+ Reviewed by Benjamin Poulain.
+
+ Some non-ES2 initialization was wrongfully #ifdefed in CPU(X86) and thus compiled-out.
+ When put it in the correct #ifdef, composited layers which require an intermediate buffer
+ work again.
+
+ No new tests. Existing opacity tests in LayoutTests/compositing test this.
+
+ * platform/graphics/opengl/TextureMapperGL.cpp:
+ (WebCore::BitmapTextureGL::bind):
+
2011-08-03 Mark Rowe <[email protected]>
Bring some order to FeatureDefines.xcconfig to make it easier to follow.
Modified: trunk/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp (92336 => 92337)
--- trunk/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp 2011-08-04 00:16:43 UTC (rev 92336)
+++ trunk/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp 2011-08-04 00:22:21 UTC (rev 92337)
@@ -594,7 +594,7 @@
GL_CMD(glBindRenderbuffer(GL_RENDERBUFFER, 0))
GL_CMD(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, id(), 0))
GL_CMD(glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_rbo))
-#if CPU(X86)
+#ifndef TEXMAP_OPENGL_ES_2
GL_CMD(glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_rbo));
#endif
GL_CMD(glClearColor(0, 0, 0, 0))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
