[WebGL] Vertex attribute binding validation method

https://bugs.webkit.org/show_bug.cgi?id=119515

This patch refactors WebGLRenderingContext code by moving the vertex
attribute binding validation to a separate method. It is now
possible to use that validation in other parts of the code. The
code is more clear now.

Patch by Przemyslaw Szymanski <p.szymanski3@samsung.com> on 2013-08-16
Reviewed by Christophe Dumez.

No new tests. Covered by existing tests. No behaviour changed.
LayoutTests/webgl/resources/webgl_test_files/conformance/rendering/gl-drawelements.html
LayoutTests/webgl/resources/webgl_test_files/conformance/rendering/draw-elements-out-of-bounds.html
LayoutTests/webgl/resources/webgl_test_files/conformance/rendering/draw-arrays-out-of-bounds.html

* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::validateVertexAttributes):
* html/canvas/WebGLVertexArrayObjectOES.h:
(WebCore::WebGLVertexArrayObjectOES::VertexAttribState::isBound):
(WebCore::WebGLVertexArrayObjectOES::VertexAttribState::validateBinding):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154166 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2c39952bda37a943be5b93e0a2094d22ea76db71..b345c621276fe95b74bdd4abc862dac29c9d3602 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2013-08-16  Przemyslaw Szymanski  <p.szymanski3@samsung.com>
+
+        [WebGL] Vertex attribute binding validation method
+        https://bugs.webkit.org/show_bug.cgi?id=119515
+
+        This patch refactors WebGLRenderingContext code by moving the vertex
+        attribute binding validation to a separate method. It is now
+        possible to use that validation in other parts of the code. The
+        code is more clear now. 
+
+        Reviewed by Christophe Dumez.
+
+        No new tests. Covered by existing tests. No behaviour changed.
+        LayoutTests/webgl/resources/webgl_test_files/conformance/rendering/gl-drawelements.html
+        LayoutTests/webgl/resources/webgl_test_files/conformance/rendering/draw-elements-out-of-bounds.html
+        LayoutTests/webgl/resources/webgl_test_files/conformance/rendering/draw-arrays-out-of-bounds.html
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::validateVertexAttributes):
+        * html/canvas/WebGLVertexArrayObjectOES.h:
+        (WebCore::WebGLVertexArrayObjectOES::VertexAttribState::isBound):
+        (WebCore::WebGLVertexArrayObjectOES::VertexAttribState::validateBinding):
+
 2013-08-15  Antti Koivisto  <antti@apple.com>
 
         <https://webkit.org/b/119865> Parent pointer and shadow root host pointer should not be shared

diff --git a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
index d9a01d3d818ca52f61790c30877d56ced079faf7..c5610d3875ebbf4a3b861e9106e68d170477b572 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -1881,9 +1881,7 @@ bool WebGLRenderingContext::validateVertexAttributes(unsigned numElementsRequire
 
     // Look in each enabled vertex attrib and check if they've been bound to a buffer.
     for (unsigned i = 0; i < m_maxVertexAttribs; ++i) {
-        const WebGLVertexArrayObjectOES::VertexAttribState& state = m_boundVertexArrayObject->getVertexAttribState(i);
-        if (state.enabled
-            && (!state.bufferBinding || !state.bufferBinding->object()))
+        if (!m_boundVertexArrayObject->getVertexAttribState(i).validateBinding())
             return false;
     }
 

diff --git a/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.h b/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.h
index 4b98955a1da6a65b2a32d77c30992c85602b2a32..4f97dcdf3f862230b9598f83db93ec20625ed749 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.h
+++ b/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.h
@@ -58,6 +58,9 @@ public:
         {
         }
         
+        bool isBound() const { return bufferBinding && bufferBinding->object(); }
+        bool validateBinding() const { return !enabled || isBound(); }
+
         bool enabled;
         RefPtr<WebGLBuffer> bufferBinding;
         GC3Dsizei bytesPerElement;