Title: [118225] trunk
- Revision
- 118225
- Author
- [email protected]
- Date
- 2012-05-23 12:22:03 -0700 (Wed, 23 May 2012)
Log Message
REGRESSION(117918) - 4 webgl/tex-iomage-and-sub-image-2d-with-image tests failing on Mac bots.
https://bugs.webkit.org/show_bug.cgi?id=87136
Reviewed by Stephen White.
Source/WebCore:
Fixed longstanding bug in GraphicsContext3D constructor in Mac
port, and logic error in tracking of texture bound to unit 0. Also
fixed up Cairo port's constructor by code inspection. This code is
ripe for cleanup; Bug 87198 filed for this.
Covered by existing tests.
* platform/graphics/cairo/GraphicsContext3DCairo.cpp:
(WebCore::GraphicsContext3D::GraphicsContext3D):
Initialize missing members.
* platform/graphics/mac/GraphicsContext3DMac.mm:
(WebCore::GraphicsContext3D::GraphicsContext3D):
Correctly initialize m_activeTexture.
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::bindTexture):
Fix logic error in tracking of texture bound to unit 0.
LayoutTests:
Unskipped tests.
* platform/mac/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (118224 => 118225)
--- trunk/LayoutTests/ChangeLog 2012-05-23 19:12:36 UTC (rev 118224)
+++ trunk/LayoutTests/ChangeLog 2012-05-23 19:22:03 UTC (rev 118225)
@@ -1,3 +1,14 @@
+2012-05-23 Kenneth Russell <[email protected]>
+
+ REGRESSION(117918) - 4 webgl/tex-iomage-and-sub-image-2d-with-image tests failing on Mac bots.
+ https://bugs.webkit.org/show_bug.cgi?id=87136
+
+ Reviewed by Stephen White.
+
+ Unskipped tests.
+
+ * platform/mac/Skipped:
+
2012-05-23 Chris Fleizach <[email protected]>
Regression(r112694): Crash in WebCore::AXObjectCache::postNotification
Modified: trunk/LayoutTests/platform/mac/Skipped (118224 => 118225)
--- trunk/LayoutTests/platform/mac/Skipped 2012-05-23 19:12:36 UTC (rev 118224)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-05-23 19:22:03 UTC (rev 118225)
@@ -854,12 +854,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=86859
editing/spelling/spellcheck-async-remove-frame.html
-# https://bugs.webkit.org/show_bug.cgi?id=87136
-fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html
-fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html
-fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html
-fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html
-
# https://bugs.webkit.org/show_bug.cgi?id=87199
compositing/video/video-poster.html
Modified: trunk/Source/WebCore/ChangeLog (118224 => 118225)
--- trunk/Source/WebCore/ChangeLog 2012-05-23 19:12:36 UTC (rev 118224)
+++ trunk/Source/WebCore/ChangeLog 2012-05-23 19:22:03 UTC (rev 118225)
@@ -1,3 +1,27 @@
+2012-05-23 Kenneth Russell <[email protected]>
+
+ REGRESSION(117918) - 4 webgl/tex-iomage-and-sub-image-2d-with-image tests failing on Mac bots.
+ https://bugs.webkit.org/show_bug.cgi?id=87136
+
+ Reviewed by Stephen White.
+
+ Fixed longstanding bug in GraphicsContext3D constructor in Mac
+ port, and logic error in tracking of texture bound to unit 0. Also
+ fixed up Cairo port's constructor by code inspection. This code is
+ ripe for cleanup; Bug 87198 filed for this.
+
+ Covered by existing tests.
+
+ * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+ Initialize missing members.
+ * platform/graphics/mac/GraphicsContext3DMac.mm:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+ Correctly initialize m_activeTexture.
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::bindTexture):
+ Fix logic error in tracking of texture bound to unit 0.
+
2012-05-23 Dana Jansens <[email protected]>
[chromium] Layers on main thread should get a RenderSurface for animating transform only if masksToBounds is true also
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp (118224 => 118225)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2012-05-23 19:12:36 UTC (rev 118224)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2012-05-23 19:22:03 UTC (rev 118225)
@@ -71,6 +71,8 @@
, m_fbo(0)
, m_depthStencilBuffer(0)
, m_boundFBO(0)
+ , m_activeTexture(GL_TEXTURE0)
+ , m_boundTexture0(0)
, m_multisampleFBO(0)
, m_multisampleDepthStencilBuffer(0)
, m_multisampleColorBuffer(0)
Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (118224 => 118225)
--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2012-05-23 19:12:36 UTC (rev 118224)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2012-05-23 19:22:03 UTC (rev 118225)
@@ -114,7 +114,7 @@
, m_layerComposited(false)
, m_internalColorFormat(0)
, m_boundFBO(0)
- , m_activeTexture(0)
+ , m_activeTexture(GL_TEXTURE0)
, m_boundTexture0(0)
, m_multisampleFBO(0)
, m_multisampleDepthStencilBuffer(0)
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (118224 => 118225)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2012-05-23 19:12:36 UTC (rev 118224)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2012-05-23 19:22:03 UTC (rev 118225)
@@ -345,7 +345,7 @@
void GraphicsContext3D::bindTexture(GC3Denum target, Platform3DObject texture)
{
makeContextCurrent();
- if (m_activeTexture && target == GL_TEXTURE_2D)
+ if (m_activeTexture == GL_TEXTURE0 && target == GL_TEXTURE_2D)
m_boundTexture0 = texture;
::glBindTexture(target, texture);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
