On 05/14/2012 06:36 PM, Eric Anholt wrote:
Fixes piglit GL_ARB_shader_objeccts/getactiveuniform-beginend. --- src/mesa/main/uniform_query.cpp | 2 ++ 1 file changed, 2 insertions(+)diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 08d330a..f5d998f 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;
For the Mesa patches (1, 8, 9): Reviewed-by: Brian Paul <[email protected]> _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
