Title: [91674] trunk/Source/WebCore
- Revision
- 91674
- Author
- [email protected]
- Date
- 2011-07-25 10:39:18 -0700 (Mon, 25 Jul 2011)
Log Message
glActiveTexture(0) is invalid
https://bugs.webkit.org/show_bug.cgi?id=65115
Patch by Andrew Wason <[email protected]> on 2011-07-25
Reviewed by Kenneth Russell.
Existing WebGL layout tests.
Fix invalid glActiveTexture(0) call.
* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
(WebCore::GraphicsContext3D::prepareTexture):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91673 => 91674)
--- trunk/Source/WebCore/ChangeLog 2011-07-25 17:06:02 UTC (rev 91673)
+++ trunk/Source/WebCore/ChangeLog 2011-07-25 17:39:18 UTC (rev 91674)
@@ -1,3 +1,17 @@
+2011-07-25 Andrew Wason <[email protected]>
+
+ glActiveTexture(0) is invalid
+ https://bugs.webkit.org/show_bug.cgi?id=65115
+
+ Reviewed by Kenneth Russell.
+
+ Existing WebGL layout tests.
+
+ Fix invalid glActiveTexture(0) call.
+
+ * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+ (WebCore::GraphicsContext3D::prepareTexture):
+
2011-07-25 Sheriff Bot <[email protected]>
Unreviewed, rolling out r91665.
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (91673 => 91674)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2011-07-25 17:06:02 UTC (rev 91673)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2011-07-25 17:39:18 UTC (rev 91674)
@@ -333,7 +333,7 @@
::glBlitFramebufferEXT(0, 0, m_currentWidth, m_currentHeight, 0, 0, m_currentWidth, m_currentHeight, GL_COLOR_BUFFER_BIT, GL_LINEAR);
}
::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
- ::glActiveTexture(0);
+ ::glActiveTexture(GL_TEXTURE0);
::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
::glCopyTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, 0, 0, m_currentWidth, m_currentHeight, 0);
::glBindTexture(GL_TEXTURE_2D, m_boundTexture0);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
