commit 03cb526681cd2dcb9af912bffce10c842fa694a7
author Jamie Madill <jmadill@chromium.org> Wed Aug 08 15:49:24 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Aug 08 20:52:03 2018 +0000
tree 230320462ed09f0803afd5fa55be1451b308648d
parent e7d80f333c5572f73cc3c0e05ef94bde14127e58

Validate transform feedback conflicts on zero draw.

This conflict should be validated even if the draw call would result in
no work being done on the GPU.

Bug: angleproject:2747
Change-Id: I6b32a07ff8a8598dd865270a3a935060f050a68f
Reviewed-on: https://chromium-review.googlesource.com/1162507
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Frank Henigman <fjhenigman@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index d05cb75..70f2031 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -2726,6 +2726,12 @@
             {
                 return {GL_INVALID_OPERATION, kErrorDrawBufferTypeMismatch};
             }
+
+            const VertexArray *vao = context->getGLState().getVertexArray();
+            if (vao->hasTransformFeedbackBindingConflict(context))
+            {
+                return {GL_INVALID_OPERATION, kErrorVertexBufferBoundForTransformFeedback};
+            }
         }
     }
 
@@ -2801,17 +2807,6 @@
                 return false;
             }
         }
-
-        if (extensions.webglCompatibility && count > 0)
-        {
-            const VertexArray *vao = context->getGLState().getVertexArray();
-            if (vao->hasTransformFeedbackBindingConflict(context))
-            {
-                ANGLE_VALIDATION_ERR(context, InvalidOperation(),
-                                     VertexBufferBoundForTransformFeedback);
-                return false;
-            }
-        }
     }
 
     return true;