Changeset 62396 in webkit

Timestamp:

Jul 2, 2010 12:06:12 PM (14 years ago)

Author:

zmo@google.com

Message:

2010-07-02 Zhenyao Mo <​zmo@google.com>

Reviewed by Dimitri Glazkov.

linkProgram should fail when vertex/fragment shaders are not both present
​https://bugs.webkit.org/show_bug.cgi?id=41380

• fast/canvas/webgl/program-test-expected.txt: Added.
• fast/canvas/webgl/program-test.html: Added.

2010-07-02 Zhenyao Mo <​zmo@google.com>

Reviewed by Dimitri Glazkov.

linkProgram should fail when vertex/fragment shaders are not both present
​https://bugs.webkit.org/show_bug.cgi?id=41380

Test: fast/canvas/webgl/program-test.html

• html/canvas/WebGLProgram.cpp: Add flag for link failure due to missing shaders. (WebCore::WebGLProgram::WebGLProgram):
• html/canvas/WebGLProgram.h: Add interface for linkFailure flag. (WebCore::WebGLProgram::isLinkFailureFlagSet): (WebCore::WebGLProgram::setLinkFailureFlag):
• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::getProgramParameter): Intercept when linkFailureFlag is set. (WebCore::WebGLRenderingContext::linkProgram): Check if there are missing shaders and don't link if yes.
• html/canvas/WebGLShader.cpp: Cache shader type. (WebCore::WebGLShader::WebGLShader):
• html/canvas/WebGLShader.h: Ditto. (WebCore::WebGLShader::getType):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/program-test-expected.txt (added)
• LayoutTests/fast/canvas/webgl/program-test.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/WebGLProgram.cpp (modified) (1 diff)
• WebCore/html/canvas/WebGLProgram.h (modified) (2 diffs)
• WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (2 diffs)
• WebCore/html/canvas/WebGLShader.cpp (modified) (1 diff)
• WebCore/html/canvas/WebGLShader.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-02  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        linkProgram should fail when vertex/fragment shaders are not both present
+        https://bugs.webkit.org/show_bug.cgi?id=41380
+
+        * fast/canvas/webgl/program-test-expected.txt: Added.
+        * fast/canvas/webgl/program-test.html: Added.
+
 2010-07-02  Qi Zhang  <qi.2.zhang@nokia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-02  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        linkProgram should fail when vertex/fragment shaders are not both present
+        https://bugs.webkit.org/show_bug.cgi?id=41380
+
+        Test: fast/canvas/webgl/program-test.html
+
+        * html/canvas/WebGLProgram.cpp: Add flag for link failure due to missing shaders.
+        (WebCore::WebGLProgram::WebGLProgram):
+        * html/canvas/WebGLProgram.h: Add interface for linkFailure flag.
+        (WebCore::WebGLProgram::isLinkFailureFlagSet):
+        (WebCore::WebGLProgram::setLinkFailureFlag):
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::getProgramParameter): Intercept when linkFailureFlag is set.
+        (WebCore::WebGLRenderingContext::linkProgram): Check if there are missing shaders and don't link if yes.
+        * html/canvas/WebGLShader.cpp: Cache shader type.
+        (WebCore::WebGLShader::WebGLShader):
+        * html/canvas/WebGLShader.h: Ditto.
+        (WebCore::WebGLShader::getType):
+
 2010-07-02  Qi Zhang  <qi.2.zhang@nokia.com>
 

trunk/WebCore/html/canvas/WebGLProgram.cpp

@@ -40 +40 @@
 WebGLProgram::WebGLProgram(WebGLRenderingContext* ctx)
     : CanvasObject(ctx)
+    , m_linkFailure(false)
 {
     setObject(context()->graphicsContext3D()->createProgram());

trunk/WebCore/html/canvas/WebGLProgram.h

@@ -49 +49 @@
         bool isUsingVertexAttrib0() const;
 
+        // Return true means getProgramParameter(LINK_STATUS) should return
+        // false; return false means we should actually call
+        // getProgramParameter(LINK_STATUS) to find out.
+        bool isLinkFailureFlagSet() const { return m_linkFailure; }
+        void setLinkFailureFlag(bool failed) { m_linkFailure = failed; }
+
     protected:
         WebGLProgram(WebGLRenderingContext*);
@@ -58 +64 @@
 
         Vector<int> m_activeAttribLocations;
+
+        bool m_linkFailure;
     };
     

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -1411 +1411 @@
     switch (pname) {
     case GraphicsContext3D::DELETE_STATUS:
+    case GraphicsContext3D::VALIDATE_STATUS:
+        m_context->getProgramiv(program, pname, &value);
+        return WebGLGetInfo(static_cast<bool>(value));
     case GraphicsContext3D::LINK_STATUS:
-    case GraphicsContext3D::VALIDATE_STATUS:
+        if (program->isLinkFailureFlagSet())
+            return WebGLGetInfo(false);
         m_context->getProgramiv(program, pname, &value);
         return WebGLGetInfo(static_cast<bool>(value));
@@ -1830 +1834 @@
     if (!validateWebGLObject(program))
         return;
+    if (!isGLES2Compliant()) {
+        Vector<WebGLShader*> shaders;
+        bool succeed = getAttachedShaders(program, shaders, ec);
+        if (succeed) {
+            bool vShader = false;
+            bool fShader = false;
+            for (size_t ii = 0; ii < shaders.size() && (!vShader || !fShader); ++ii) {
+                if (shaders[ii]->getType() == GraphicsContext3D::VERTEX_SHADER)
+                    vShader = true;
+                else if (shaders[ii]->getType() == GraphicsContext3D::FRAGMENT_SHADER)
+                    fShader = true;
+            }
+            if (!vShader || !fShader)
+                succeed = false;
+        }
+        if (!succeed) {
+            program->setLinkFailureFlag(true);
+            return;
+        }
+        program->setLinkFailureFlag(false);
+    }
+
     m_context->linkProgram(program);
     program->cacheActiveAttribLocations();

trunk/WebCore/html/canvas/WebGLShader.cpp

@@ -40 +40 @@
 WebGLShader::WebGLShader(WebGLRenderingContext* ctx, GraphicsContext3D::WebGLEnumType type)
     : CanvasObject(ctx)
+    , m_type(type)
 {
     setObject(context()->graphicsContext3D()->createShader(type));

trunk/WebCore/html/canvas/WebGLShader.h

@@ -40 +40 @@
         static PassRefPtr<WebGLShader> create(WebGLRenderingContext*, GraphicsContext3D::WebGLEnumType);
 
+        GraphicsContext3D::WebGLEnumType getType() const { return m_type; }
+
     private:
         WebGLShader(WebGLRenderingContext*, GraphicsContext3D::WebGLEnumType);
@@ -46 +48 @@
 
         virtual bool isShader() const { return true; }
+
+        GraphicsContext3D::WebGLEnumType m_type;
     };