Mesa (master): mesa: Throw error on glGetActiveUniform inside Begin/End.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: ef691885c92abcd085d89fc30feeda87961773ab
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef691885c92abcd085d89fc30feeda87961773ab

Author: Eric Anholt <eric at anholt.net>
Date:   Thu May 10 14:56:48 2012 -0700

mesa: Throw error on glGetActiveUniform inside Begin/End.

Fixes piglit GL_ARB_shader_objeccts/getactiveuniform-beginend.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 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 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;