From 75c6f472880706dcbb9d1e20727fa8f71db8b11c Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 11 Oct 2010 16:07:08 -0700
Subject: mesa: Track an ActiveProgram distinct from CurrentProgram

ActiveProgram is the GL_EXT_separate_shader_objects state variable
used for glUniform calls.  glUseProgram also sets this.
---
 src/mesa/main/get.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 39ce177fcd..da9df27bdb 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1579,7 +1579,7 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu
       break;
    case GL_CURRENT_PROGRAM:
       v->value_int =
-	 ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0;
+	 ctx->Shader.ActiveProgram ? ctx->Shader.ActiveProgram->Name : 0;
       break;
    case GL_READ_FRAMEBUFFER_BINDING_EXT:
       v->value_int = ctx->ReadBuffer->Name;
-- 
cgit v1.2.3