From d69dc2e20346397f4734a0760554a51fb4fbb3c0 Mon Sep 17 00:00:00 2001
From: Marek Olšák <maraeo@gmail.com>
Date: Tue, 31 May 2011 14:59:44 +0200
Subject: mesa: UseShaderProgramEXT and Uniform* shouldn't be allowed inside
 Begin/End

I couldn't find this being required by the spec.

Reviewed-by: Brian Paul <brianp@vmware.com>
---
 src/mesa/main/shaderapi.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main/shaderapi.c')

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 1e237a95da1..cbfbac80296 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1790,6 +1790,8 @@ _mesa_UseShaderProgramEXT(GLenum type, GLuint program)
    GET_CURRENT_CONTEXT(ctx);
    struct gl_shader_program *shProg = NULL;
 
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
    if (!validate_shader_target(ctx, type)) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glUseShaderProgramEXT(type)");
       return;
-- 
cgit v1.2.3