Add validation for DrawRangeElements end < start

src/libANGLE/validationES3.cpp

@@ -1388,6 +1388,42 @@ bool ValidateClearBuffer(ValidationContext *context)
     return true;
 }
 
+bool ValidateDrawRangeElements(Context *context,
+                               GLenum mode,
+                               GLuint start,
+                               GLuint end,
+                               GLsizei count,
+                               GLenum type,
+                               const GLvoid *indices,
+                               IndexRange *indexRange)
+{
+    if (context->getClientVersion() < 3)
+    {
+        context->recordError(Error(GL_INVALID_OPERATION, "Context does not support GLES3."));
+        return false;
+    }
+
+    if (end < start)
+    {
+        context->recordError(Error(GL_INVALID_VALUE, "end < start"));
+        return false;
+    }
+
+    if (!ValidateDrawElements(context, mode, count, type, indices, 0, indexRange))
+    {
+        return false;
+    }
+
+    if (indexRange->end > end || indexRange->start < start)
+    {
+        // GL spec says that behavior in this case is undefined - generating an error is fine.
+        context->recordError(
+            Error(GL_INVALID_OPERATION, "Indices are out of the start, end range."));
+        return false;
+    }
+    return true;
+}
+
 bool ValidateGetUniformuiv(Context *context, GLuint program, GLint location, GLuint* params)
 {
     if (context->getClientVersion() < 3)

src/libANGLE/validationES3.h

@@ -14,6 +14,7 @@
 namespace gl
 {
 class Context;
+struct IndexRange;
 class ValidationContext;
 
 bool ValidateES3TexImageParametersBase(ValidationContext *context,
@@ -162,6 +163,15 @@ bool ValidateInvalidateFramebuffer(Context *context, GLenum target, GLsizei numA
 
 bool ValidateClearBuffer(ValidationContext *context);
 
+bool ValidateDrawRangeElements(Context *context,
+                               GLenum mode,
+                               GLuint start,
+                               GLuint end,
+                               GLsizei count,
+                               GLenum type,
+                               const GLvoid *indices,
+                               IndexRange *indexRange);
+
 bool ValidateGetUniformuiv(Context *context, GLuint program, GLint location, GLuint* params);
 
 bool ValidateReadBuffer(Context *context, GLenum mode);

src/libGLESv2/entry_points_gles_3_0.cpp

@@ -52,21 +52,11 @@ void GL_APIENTRY DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsize
     Context *context = GetValidGlobalContext();
     if (context)
     {
-        if (context->getClientVersion() < 3)
-        {
-            context->recordError(Error(GL_INVALID_OPERATION));
-            return;
-        }
-
         IndexRange indexRange;
-        if (!ValidateDrawElements(context, mode, count, type, indices, 0, &indexRange))
-        {
-            return;
-        }
-        if (indexRange.end > end || indexRange.start < start)
+        if (!context->skipValidation() &&
+            !ValidateDrawRangeElements(context, mode, start, end, count, type, indices,
+                                       &indexRange))
         {
-            // GL spec says that behavior in this case is undefined - generating an error is fine.
-            context->recordError(Error(GL_INVALID_OPERATION));
             return;
         }