1 files changed, 51 insertions, 0 deletions

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 355a93c4c3d..16062820ef9 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -516,6 +516,8 @@ GLboolean
 _mesa_validate_DrawArrays(struct gl_context *ctx,
 			  GLenum mode, GLint start, GLsizei count)
 {
+   struct gl_transform_feedback_object *xfb_obj
+      = ctx->TransformFeedback.CurrentObject;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
    FLUSH_CURRENT(ctx, 0);
 
@@ -537,6 +539,29 @@ _mesa_validate_DrawArrays(struct gl_context *ctx,
          return GL_FALSE;
    }
 
+   /* From the GLES3 specification, section 2.14.2 (Transform Feedback
+    * Primitive Capture):
+    *
+    *   The error INVALID_OPERATION is generated by DrawArrays and
+    *   DrawArraysInstanced if recording the vertices of a primitive to the
+    *   buffer objects being used for transform feedback purposes would result
+    *   in either exceeding the limits of any buffer object’s size, or in
+    *   exceeding the end position offset + size − 1, as set by
+    *   BindBufferRange.
+    *
+    * This is in contrast to the behaviour of desktop GL, where the extra
+    * primitives are silently dropped from the transform feedback buffer.
+    */
+   if (_mesa_is_gles3(ctx) && xfb_obj->Active && !xfb_obj->Paused) {
+      size_t prim_count = vbo_count_tessellated_primitives(mode, count, 1);
+      if (xfb_obj->GlesRemainingPrims < prim_count) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glDrawArrays(exceeds transform feedback size)");
+         return GL_FALSE;
+      }
+      xfb_obj->GlesRemainingPrims -= prim_count;
+   }
+
    return GL_TRUE;
 }
 
@@ -545,6 +570,8 @@ GLboolean
 _mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint first,
                                    GLsizei count, GLsizei numInstances)
 {
+   struct gl_transform_feedback_object *xfb_obj
+      = ctx->TransformFeedback.CurrentObject;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
    FLUSH_CURRENT(ctx, 0);
 
@@ -580,6 +607,30 @@ _mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint fi
          return GL_FALSE;
    }
 
+   /* From the GLES3 specification, section 2.14.2 (Transform Feedback
+    * Primitive Capture):
+    *
+    *   The error INVALID_OPERATION is generated by DrawArrays and
+    *   DrawArraysInstanced if recording the vertices of a primitive to the
+    *   buffer objects being used for transform feedback purposes would result
+    *   in either exceeding the limits of any buffer object’s size, or in
+    *   exceeding the end position offset + size − 1, as set by
+    *   BindBufferRange.
+    *
+    * This is in contrast to the behaviour of desktop GL, where the extra
+    * primitives are silently dropped from the transform feedback buffer.
+    */
+   if (_mesa_is_gles3(ctx) && xfb_obj->Active && !xfb_obj->Paused) {
+      size_t prim_count
+         = vbo_count_tessellated_primitives(mode, count, numInstances);
+      if (xfb_obj->GlesRemainingPrims < prim_count) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glDrawArraysInstanced(exceeds transform feedback size)");
+         return GL_FALSE;
+      }
+      xfb_obj->GlesRemainingPrims -= prim_count;
+   }
+
    return GL_TRUE;
 }