diff options
| author | Marek Olšák <[email protected]> | 2011-05-29 18:58:45 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-05-30 16:26:02 +0200 |
| commit | 29ceeeba2004f71ccb91ce67f518dc1bf0ca6b17 (patch) | |
| tree | 2245ea945f0898486a7809dc7aff83f817a5e5b3 | |
| parent | 1b37a41661f791b22f12b8477053a8dff6e33d6d (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/mesa/main/shaderapi.c | 2 |
1 files changed, 2 insertions, 0 deletions
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)"); |