diff options
| author | Eric Anholt <eric@anholt.net> | 2012-05-10 14:56:48 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-05-18 16:08:34 -0700 |
| commit | 19745022237e3ff48896348468a3ff241b2d30af (patch) | |
| tree | 1c64533c495f3d6d9ee51b2943caa40b563c6a23 | |
| parent | 0bf439e5da5222d4f7737950c1436e9916af356b (diff) | |
mesa: Throw error on glGetActiveUniform inside Begin/End.
Fixes piglit GL_ARB_shader_objeccts/getactiveuniform-beginend.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit ef691885c92abcd085d89fc30feeda87961773ab)
| -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 da41ee84c9..9fa2211789 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; |