From: Marek Olšák <maraeo@gmail.com>
Date: Sun, 29 May 2011 16:58:45 +0000 (+0200)
Subject: mesa: forbid UseProgram to be called inside Begin/End
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=29ceeeba2004f71ccb91ce67f518dc1bf0ca6b17;p=mesa.git

mesa: forbid UseProgram to be called inside Begin/End

The spec doesn't state it should be an error, but. We have this piglit test
useprogram-inside-begin that passes with this commit. No idea what's correct.

NOTE: This is a candidate for the 7.10 branch.

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 03155b7ac04..1e237a95da1 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1593,6 +1593,8 @@ _mesa_UseProgramObjectARB(GLhandleARB program)
    struct gl_transform_feedback_object *obj =
       ctx->TransformFeedback.CurrentObject;
 
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
    if (obj->Active) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glUseProgram(transform feedback active)");