Changeset 156971 in webkit

Timestamp:

Oct 5, 2013, 12:27:35 PM (12 years ago)

Author:

dino@apple.com

Message:

[WebGL] program should not be able to link if a bad shader is attached
​https://bugs.webkit.org/show_bug.cgi?id=94036

Reviewed by Darin Adler.

If you attempt to link a program when bad shaders are attached, the
link should fail. WebGL also requires that the previously linked
program should remain intact. We were doing the former, but not
the latter.

Fix this by not calling glLinkProgram if we know we have bad
shaders, and synthesize a bad link status instead.

Test: WebGL conformance test conformance/programs/program-test.html
(found in LayoutTests/webgl)

• html/canvas/WebGLRenderingContext.cpp:

(WebCore::WebGLRenderingContext::compileShader): Mark a shader as valid
if it compiled ok.
(WebCore::WebGLRenderingContext::linkProgram): Don't call into GraphicsContext3D::linkProgram
if we know that we don't have valid shaders.

• html/canvas/WebGLShader.cpp:

(WebCore::WebGLShader::WebGLShader): Initialize m_isValid.

• html/canvas/WebGLShader.h:

(WebCore::WebGLShader::isValid): New member variable getter and setter.
(WebCore::WebGLShader::setValid):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLRenderingContext.cpp (modified) (3 diffs)
• html/canvas/WebGLShader.cpp (modified) (2 diffs)
• html/canvas/WebGLShader.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-04  Dean Jackson  <dino@apple.com>
+
+        [WebGL] program should not be able to link if a bad shader is attached
+        https://bugs.webkit.org/show_bug.cgi?id=94036
+
+        Reviewed by Darin Adler.
+
+        If you attempt to link a program when bad shaders are attached, the
+        link should fail. WebGL also requires that the previously linked
+        program should remain intact. We were doing the former, but not
+        the latter.
+
+        Fix this by not calling glLinkProgram if we know we have bad
+        shaders, and synthesize a bad link status instead.
+
+        Test: WebGL conformance test conformance/programs/program-test.html
+        (found in LayoutTests/webgl)
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::compileShader): Mark a shader as valid
+        if it compiled ok.
+        (WebCore::WebGLRenderingContext::linkProgram): Don't call into GraphicsContext3D::linkProgram
+        if we know that we don't have valid shaders.
+        * html/canvas/WebGLShader.cpp:
+        (WebCore::WebGLShader::WebGLShader): Initialize m_isValid.
+        * html/canvas/WebGLShader.h:
+        (WebCore::WebGLShader::isValid): New member variable getter and setter.
+        (WebCore::WebGLShader::setValid):
+
 2013-10-05  Dean Jackson  <dino@apple.com>
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2009, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1299 +1299 @@
         return;
     m_context->compileShader(objectOrZero(shader));
+    GC3Dint value;
+    m_context->getShaderiv(objectOrZero(shader), GraphicsContext3D::COMPILE_STATUS, &value);
+    shader->setValid(value);
     cleanupAfterGraphicsCall(false);
 }
@@ -3323 +3326 @@
         return;
     if (!isGLES2Compliant()) {
-        if (!program->getAttachedShader(GraphicsContext3D::VERTEX_SHADER) || !program->getAttachedShader(GraphicsContext3D::FRAGMENT_SHADER)) {
+        WebGLShader* vertexShader = program->getAttachedShader(GraphicsContext3D::VERTEX_SHADER);
+        WebGLShader* fragmentShader = program->getAttachedShader(GraphicsContext3D::FRAGMENT_SHADER);
+        if (!vertexShader || !vertexShader->isValid() || !fragmentShader || !fragmentShader->isValid()) {
             program->setLinkStatus(false);
             return;

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2009, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44 +44 @@
     , m_type(type)
     , m_source("")
+    , m_isValid(false)
 {
     setObject(ctx->graphicsContext3D()->createShader(type));

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2009, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44 +44 @@
     void setSource(const String& source) { m_source = source; }
 
+    bool isValid() const { return m_isValid; }
+    void setValid(bool valid) { m_isValid = valid; }
+
 private:
     WebGLShader(WebGLRenderingContext*, GC3Denum);
@@ -53 +56 @@
     GC3Denum m_type;
     String m_source;
+    bool m_isValid;
 };