Mesa (master): mesa: Reject ResumeTransformFeedback if the wrong program is bound.

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: 9cc74c93f8983f978e7315e021eb59dfaca6404b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9cc74c93f8983f978e7315e021eb59dfaca6404b

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Sep  6 14:51:26 2013 -0700

mesa: Reject ResumeTransformFeedback if the wrong program is bound.

This is actually a pretty important error condition: otherwise, you
could set up transform feedback with one program, and resume it with
a program that generates a completely different set of outputs.

Fixes a subcase of Piglit's new ARB_transform_feedback2 api-errors test.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/main/transformfeedback.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index c2c14a1..191e88c 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -943,6 +943,17 @@ _mesa_ResumeTransformFeedback(void)
       return;
    }
 
+   /* From the ARB_transform_feedback2 specification:
+    * "The error INVALID_OPERATION is generated by ResumeTransformFeedback if
+    *  the program object being used by the current transform feedback object
+    *  is not active."
+    */
+   if (obj->shader_program != ctx->Shader.CurrentVertexProgram) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glResumeTransformFeedback(wrong vertex program bound)");
+      return;
+   }
+
    FLUSH_VERTICES(ctx, 0);
    ctx->NewDriverState |= ctx->DriverFlags.NewTransformFeedback;