Changeset 188666 in webkit

Timestamp:

Aug 19, 2015 5:27:00 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

GraphicsContext3D::activeTexture should not be called with zero-based index
​https://bugs.webkit.org/show_bug.cgi?id=148020

Patch by Jinyoung Hur <​hur.ims@navercorp.com> on 2015-08-19
Reviewed by Alex Christensen.

Source/WebCore:

GraphicsContext3D::activeTexture should be called with an argument that is greater than or equal to
GraphicsContext3D::TEXTURE0.

Test: fast/canvas/webgl/texture-complete.html

• html/canvas/WebGLRenderingContextBase.cpp:

(WebCore::WebGLRenderingContextBase::checkTextureCompleteness):

LayoutTests:

Insert WebGLRenderingContext.activeTexture call during the texture complete test to verify
a meaningless change of the active texture doesn't make any gl errors.

• fast/canvas/webgl/texture-complete.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/texture-complete-expected.txt (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/texture-complete.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-08-19  Jinyoung Hur  <hur.ims@navercorp.com>
+
+        GraphicsContext3D::activeTexture should not be called with zero-based index
+        https://bugs.webkit.org/show_bug.cgi?id=148020
+
+        Reviewed by Alex Christensen.
+
+        Insert WebGLRenderingContext.activeTexture call during the texture complete test to verify
+        a meaningless change of the active texture doesn't make any gl errors.
+
+        * fast/canvas/webgl/texture-complete.html:
+
 2015-08-19  Zalan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/fast/canvas/webgl/texture-complete-expected.txt

@@ -3 +3 @@
 
 PASS texture that is not -texture-complete- when TEXTURE_MIN_FILTER not NEAREST or LINEAR should draw with 0,0,0,255
+PASS getError was expected value: NO_ERROR : Should be no errors from setup.
+PASS meaningless change of the active texture should not affect the black-texture fallback.
+PASS getError was expected value: NO_ERROR : Should be no errors from setup.
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/canvas/webgl/texture-complete.html

@@ -91 +91 @@
       "texture that is not -texture-complete- when " +
       "TEXTURE_MIN_FILTER not NEAREST or LINEAR should draw with 0,0,0,255");
+  glErrorShouldBe(gl, gl.NO_ERROR, "Should be no errors from setup.");
+
+  gl.activeTexture(gl.TEXTURE1);
+  checkBuffer(0,0,0,255,
+      "meaningless change of the active texture should not affect the black-texture fallback.");
+  glErrorShouldBe(gl, gl.NO_ERROR, "Should be no errors from setup.");
+  gl.activeTexture(gl.TEXTURE0);
 
   function checkBuffer(r, g, b, a, msg) {

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-08-19  Jinyoung Hur  <hur.ims@navercorp.com>
+
+        GraphicsContext3D::activeTexture should not be called with zero-based index
+        https://bugs.webkit.org/show_bug.cgi?id=148020
+
+        Reviewed by Alex Christensen.
+
+        GraphicsContext3D::activeTexture should be called with an argument that is greater than or equal to 
+        GraphicsContext3D::TEXTURE0.
+
+        Test: fast/canvas/webgl/texture-complete.html
+
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::checkTextureCompleteness):
+
 2015-08-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

@@ -4036 +4036 @@
             || (m_textureUnits[ii].textureCubeMapBinding && m_textureUnits[ii].textureCubeMapBinding->needToUseBlackTexture(extensions))) {
             if (ii != m_activeTextureUnit) {
-                m_context->activeTexture(ii);
+                m_context->activeTexture(ii + GraphicsContext3D::TEXTURE0);
                 resetActiveUnit = true;
             } else if (resetActiveUnit) {
-                m_context->activeTexture(ii);
+                m_context->activeTexture(ii + GraphicsContext3D::TEXTURE0);
                 resetActiveUnit = false;
             }
@@ -4062 +4062 @@
     }
     if (resetActiveUnit)
-        m_context->activeTexture(m_activeTextureUnit);
+        m_context->activeTexture(m_activeTextureUnit + GraphicsContext3D::TEXTURE0);
 }