aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-01 16:36:19 +0200
committermarha <marha@users.sourceforge.net>2011-06-01 16:36:19 +0200
commit75becbf5e6dcd4667aa88665a1a681fb8620b2c4 (patch)
tree4e6ed6cb893d9ea4c17172b17b1567cfd76cddb8 /mesalib/src/mesa/main
parent32ccde45cc1f46a3bd72c44c4f3fcd03742dbb3c (diff)
downloadvcxsrv-75becbf5e6dcd4667aa88665a1a681fb8620b2c4.tar.gz
vcxsrv-75becbf5e6dcd4667aa88665a1a681fb8620b2c4.tar.bz2
vcxsrv-75becbf5e6dcd4667aa88665a1a681fb8620b2c4.zip
mesa pixman xkeyboard-config git update 1 Jun 2011
Diffstat (limited to 'mesalib/src/mesa/main')
-rw-r--r--mesalib/src/mesa/main/shaderapi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index 03155b7ac..1e237a95d 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/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)");