Changeset 70784 in webkit

Timestamp:

Oct 28, 2010 9:51:15 AM (13 years ago)

Author:

zmo@google.com

Message:

2010-10-27 Zhenyao Mo <​zmo@google.com>

Reviewed by Kenneth Russell.

Work around a Mac driver bug in generateMipmap
​https://bugs.webkit.org/show_bug.cgi?id=48489

• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::generateMipmap): Make sure minFilter is set to NEAREST_MIPMAP_LINEAR before generateMipmap, and after the call, set it back to the original value.
• html/canvas/WebGLTexture.h: (WebCore::WebGLTexture::getMinFilter): Return the cached minFilter value.

2010-10-27 Zhenyao Mo <​zmo@google.com>

Reviewed by Kenneth Russell.

Work around a Mac driver bug in generateMipmap
​https://bugs.webkit.org/show_bug.cgi?id=48489

• fast/canvas/webgl/texture-npot-expected.txt: Add back the failing part due to the generateMipmap Mac driver bug.
• fast/canvas/webgl/texture-npot.html: Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/texture-npot-expected.txt (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/texture-npot.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (1 diff)
• WebCore/html/canvas/WebGLTexture.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-27  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Work around a Mac driver bug in generateMipmap
+        https://bugs.webkit.org/show_bug.cgi?id=48489
+
+        * fast/canvas/webgl/texture-npot-expected.txt: Add back the failing part due to the generateMipmap Mac driver bug.
+        * fast/canvas/webgl/texture-npot.html: Ditto.
+
 2010-10-28  Mikhail Naganov  <mnaganov@chromium.org>
 

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

@@ -25 +25 @@
 PASS POT cubemap with TEXTURE_MIN_FILTER set to LINEAR_MIPMAP_LINEAR but no mips draw with 0,0,0,255
 PASS getError was expected value: NO_ERROR : gl.generateMipmap with POT texture should return succeed
+PASS POT cubemap with TEXTURE_MIN_FILTER set to LINEAR_MIPMAP_LINEAR should draw.
 PASS successfullyParsed is true
 

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

@@ -189 +189 @@
     "gl.generateMipmap with POT texture should return succeed");
 
-// FIXME: add the test back once the bug is fixed.
-//wtu.drawQuad(gl);
-//wtu.checkCanvas(
-//    gl, [0, 192, 128, 255],
-//    "POT cubemap with TEXTURE_MIN_FILTER set to LINEAR_MIPMAP_LINEAR should draw.");
+wtu.drawQuad(gl);
+wtu.checkCanvas(
+    gl, [0, 192, 128, 255],
+    "POT cubemap with TEXTURE_MIN_FILTER set to LINEAR_MIPMAP_LINEAR should draw.");
 
 successfullyParsed = true;

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-27  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Work around a Mac driver bug in generateMipmap
+        https://bugs.webkit.org/show_bug.cgi?id=48489
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::generateMipmap): Make sure minFilter is set to NEAREST_MIPMAP_LINEAR before generateMipmap, and after the call, set it back to the original value.
+        * html/canvas/WebGLTexture.h:
+        (WebCore::WebGLTexture::getMinFilter): Return the cached minFilter value.
+
 2010-10-28  Mikhail Naganov  <mnaganov@chromium.org>
 

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -1152 +1152 @@
         return;
     }
+    // generateMipmap won't work properly if minFilter is not NEAREST_MIPMAP_LINEAR
+    // on Mac.  Remove the hack once this driver bug is fixed.
+#if OS(DARWIN)
+    bool needToResetMinFilter = false;
+    if (tex->getMinFilter() != GraphicsContext3D::NEAREST_MIPMAP_LINEAR) {
+        m_context->texParameteri(target, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::NEAREST_MIPMAP_LINEAR);
+        needToResetMinFilter = true;
+    }
+#endif
     m_context->generateMipmap(target);
+#if OS(DARWIN)
+    if (needToResetMinFilter)
+        m_context->texParameteri(target, GraphicsContext3D::TEXTURE_MIN_FILTER, tex->getMinFilter());
+#endif
     tex->generateMipmapLevelInfo();
     cleanupAfterGraphicsCall(false);

trunk/WebCore/html/canvas/WebGLTexture.h

@@ -44 +44 @@
     void setParameteri(unsigned long pname, int param);
     void setParameterf(unsigned long pname, float param);
+
+    int getMinFilter() const { return m_minFilter; }
 
     void setLevelInfo(unsigned long target, int level, unsigned long internalFormat, int width, int height, unsigned long type);