WebGL2 Compat: having no 0 divisor is now valid

src/libANGLE/validationES.cpp

@@ -890,7 +890,7 @@ bool ValidateDrawArraysInstancedBase(Context *context,
     return (primcount > 0);
 }
 
-bool ValidateDrawInstancedANGLEAndWebGL(ValidationContext *context)
+bool ValidateDrawInstancedANGLE(ValidationContext *context)
 {
     // Verify there is at least one active attribute with a divisor of zero
     const State &state = context->getGLState();
@@ -2849,13 +2849,7 @@ bool ValidateDrawArraysInstanced(Context *context,
                                  GLsizei count,
                                  GLsizei primcount)
 {
-    if (!ValidateDrawArraysInstancedBase(context, mode, first, count, primcount))
-    {
-        return false;
-    }
-
-    return !context->getExtensions().webglCompatibility ||
-           ValidateDrawInstancedANGLEAndWebGL(context);
+    return ValidateDrawArraysInstancedBase(context, mode, first, count, primcount);
 }
 
 bool ValidateDrawArraysInstancedANGLE(Context *context,
@@ -2869,7 +2863,7 @@ bool ValidateDrawArraysInstancedANGLE(Context *context,
         return false;
     }
 
-    return ValidateDrawInstancedANGLEAndWebGL(context);
+    return ValidateDrawInstancedANGLE(context);
 }
 
 bool ValidateDrawElementsBase(ValidationContext *context, GLenum type)
@@ -3054,13 +3048,7 @@ bool ValidateDrawElementsInstancedCommon(ValidationContext *context,
                                          const void *indices,
                                          GLsizei primcount)
 {
-    if (!ValidateDrawElementsInstancedBase(context, mode, count, type, indices, primcount))
-    {
-        return false;
-    }
-
-    return !context->getExtensions().webglCompatibility ||
-           ValidateDrawInstancedANGLEAndWebGL(context);
+    return ValidateDrawElementsInstancedBase(context, mode, count, type, indices, primcount);
 }
 
 bool ValidateDrawElementsInstancedANGLE(Context *context,
@@ -3075,7 +3063,7 @@ bool ValidateDrawElementsInstancedANGLE(Context *context,
         return false;
     }
 
-    return ValidateDrawInstancedANGLEAndWebGL(context);
+    return ValidateDrawInstancedANGLE(context);
 }
 
 bool ValidateFramebufferTextureBase(Context *context,

src/tests/gl_tests/WebGLCompatibilityTest.cpp

@@ -1009,7 +1009,7 @@ TEST_P(WebGL2CompatibilityTest, DrawArraysBufferOutOfBoundsInstanced)
     ASSERT_GL_NO_ERROR();
 }
 
-// Test that at least one attribute has a zero divisor for WebGL
+// Test that having no attributes with a zero divisor is valid in WebGL2
 TEST_P(WebGL2CompatibilityTest, InstancedDrawZeroDivisor)
 {
     const std::string &vert =
@@ -1040,12 +1040,8 @@ TEST_P(WebGL2CompatibilityTest, InstancedDrawZeroDivisor)
     glEnableVertexAttribArray(posLocation);
     glVertexAttribDivisor(posLocation, 1);
 
-    // Test touching the last element is valid.
     glVertexAttribPointer(0, 1, GL_UNSIGNED_BYTE, GL_FALSE, 0, nullptr);
     glDrawArraysInstanced(GL_POINTS, 0, 1, 4);
-    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
-
-    glVertexAttribDivisor(posLocation, 0);
     ASSERT_GL_NO_ERROR();
 }