diff options
| author | Eric Anholt <[email protected]> | 2012-05-10 14:56:48 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-05-17 10:05:23 -0700 |
| commit | ef691885c92abcd085d89fc30feeda87961773ab (patch) | |
| tree | 31f87954f33c745d2c03b34af21fb3e9620f0d3f /src/mesa/main/uniform_query.cpp | |
| parent | 05c200bac049ed4760f0af6786e463e2520b9c9c (diff) | |
mesa: Throw error on glGetActiveUniform inside Begin/End.
Fixes piglit GL_ARB_shader_objeccts/getactiveuniform-beginend.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main/uniform_query.cpp')
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 08d330a52cb..f5d998ffb22 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -46,6 +46,8 @@ _mesa_GetActiveUniformARB(GLhandleARB program, GLuint index, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveUniform"); + ASSERT_OUTSIDE_BEGIN_END(ctx); + if (!shProg) return; |