aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/shaderapi.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-30 22:26:52 +0200
committermarha <marha@users.sourceforge.net>2011-05-30 22:26:52 +0200
commitd60233950866066e23e8a46ac230aae9f296031e (patch)
tree30fdaf70fdb33eecd6479cffe02d26d7af812c3f /mesalib/src/mesa/main/shaderapi.c
parent91def498916935bc9ebd433a28981d19bf426961 (diff)
parent072157e2ba87f3303958e48815fa2548009d3410 (diff)
downloadvcxsrv-d60233950866066e23e8a46ac230aae9f296031e.tar.gz
vcxsrv-d60233950866066e23e8a46ac230aae9f296031e.tar.bz2
vcxsrv-d60233950866066e23e8a46ac230aae9f296031e.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/state_tracker/st_cb_blit.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.c
Diffstat (limited to 'mesalib/src/mesa/main/shaderapi.c')
-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 e6d1d5b7d..7102de3f7 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)");