Changeset 158798 in webkit

Timestamp:

Nov 6, 2013, 3:08:56 PM (12 years ago)

Author:

Brent Fulgham

Message:

[WebGL] We should not allow generateMipMap on compressed textures
​https://bugs.webkit.org/show_bug.cgi?id=123915
<rdar://problem/15201274>

Reviewed by Dean Jackson.

Found by existing conformance/extensions/webgl-compressed-texture-s3tc.html

• html/canvas/WebGLRenderingContext.cpp:

(WebCore::WebGLRenderingContext::compressedTexImage2D): Set compressed flag.
(WebCore::WebGLRenderingContext::compressedTexSubImage2D): Ditto.
(WebCore::WebGLRenderingContext::generateMipmap): For Apple builds, check state
of compressed flag and generate appropriate WebGL error if necessary.

• html/canvas/WebGLTexture.cpp:

(WebCore::WebGLTexture::WebGLTexture): Set compressed flag to false by default
(WebCore::WebGLTexture::isCompressed): Added
(WebCore::WebGLTexture::setCompressed): Added

• html/canvas/WebGLTexture.h:
• platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:

(WebCore::GraphicsContext3D::generateMipmap): Switch implementation to use proper
glGenerateMipmaps, rather than the glGenerateMipmapsEXT method.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLRenderingContext.cpp (modified) (3 diffs)
• html/canvas/WebGLTexture.cpp (modified) (2 diffs)
• html/canvas/WebGLTexture.h (modified) (2 diffs)
• platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-06  Brent Fulgham  <bfulgham@apple.com>
+
+        [WebGL] We should not allow generateMipMap on compressed textures
+        https://bugs.webkit.org/show_bug.cgi?id=123915
+        <rdar://problem/15201274>
+
+        Reviewed by Dean Jackson.
+
+        Found by existing conformance/extensions/webgl-compressed-texture-s3tc.html
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::compressedTexImage2D): Set compressed flag.
+        (WebCore::WebGLRenderingContext::compressedTexSubImage2D): Ditto.
+        (WebCore::WebGLRenderingContext::generateMipmap): For Apple builds, check state
+        of compressed flag and generate appropriate WebGL error if necessary.
+        * html/canvas/WebGLTexture.cpp:
+        (WebCore::WebGLTexture::WebGLTexture): Set compressed flag to false by default
+        (WebCore::WebGLTexture::isCompressed): Added
+        (WebCore::WebGLTexture::setCompressed): Added
+        * html/canvas/WebGLTexture.h:
+        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+        (WebCore::GraphicsContext3D::generateMipmap): Switch implementation to use proper
+        glGenerateMipmaps, rather than the glGenerateMipmapsEXT method.
+
 2013-11-06  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -1341 +1341 @@
                                               border, data->byteLength(), data->baseAddress());
     tex->setLevelInfo(target, level, internalformat, width, height, GraphicsContext3D::UNSIGNED_BYTE);
+    tex->setCompressed();
     cleanupAfterGraphicsCall(false);
 }
@@ -1372 +1373 @@
     graphicsContext3D()->compressedTexSubImage2D(target, level, xoffset, yoffset,
                                                  width, height, format, data->byteLength(), data->baseAddress());
+    tex->setCompressed();
     cleanupAfterGraphicsCall(false);
 }
@@ -2221 +2223 @@
     if (!tex->canGenerateMipmaps()) {
         synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "generateMipmap", "level 0 not power of 2 or not all the same size");
+        return;
+    }
+    // FIXME: https://bugs.webkit.org/show_bug.cgi?id=123916. Compressed textures should be allowed in WebGL 2:
+    if (tex->isCompressed()) {
+        synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "generateMipmap", "trying to generate mipmaps from compressed texture");
         return;
     }

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

@@ -51 +51 @@
     , m_isComplete(false)
     , m_needToUseBlackTexture(false)
+    , m_isCompressed(false)
 {
     setObject(ctx->graphicsContext3D()->createTexture());
@@ -240 +241 @@
 }
 
+bool WebGLTexture::isCompressed() const
+{
+    if (!object())
+        return false;
+    return m_isCompressed;
+}
+
+void WebGLTexture::setCompressed()
+{
+    ASSERT(object());
+    m_isCompressed = true;
+}
+    
 void WebGLTexture::deleteObjectImpl(GraphicsContext3D* context3d, Platform3DObject object)
 {

trunk/Source/WebCore/html/canvas/WebGLTexture.h

@@ -67 +67 @@
     bool needToUseBlackTexture() const;
 
+    bool isCompressed() const;
+    void setCompressed();
+
     bool hasEverBeenBound() const { return object() && m_target; }
 
@@ -124 +127 @@
     bool m_isComplete;
     bool m_needToUseBlackTexture;
+    bool m_isCompressed;
 };
 

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp

@@ -666 +666 @@
 {
     makeContextCurrent();
-    ::glGenerateMipmapEXT(target);
+    ::glGenerateMipmap(target);
 }