From: Brian <brian@yutani.localnet.net>
Date: Tue, 30 Jan 2007 23:55:03 +0000 (-0700)
Subject: fix _mesa_get_uniform_location() so it uses the given program handle
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=716239877823e13a6111b5cff1bf2b446a37a537;p=mesa.git

fix _mesa_get_uniform_location() so it uses the given program handle
---

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 6bae17a9051..e2fedf7fa64 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -741,8 +741,9 @@ _mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
 GLint
 _mesa_get_uniform_location(GLcontext *ctx, GLuint program, const GLchar *name)
 {
-   if (ctx->Shader.CurrentProgram) {
-      const struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
+   struct gl_shader_program *shProg
+      = _mesa_lookup_shader_program(ctx, program);
+   if (shProg) {
       GLuint loc;
       for (loc = 0; loc < shProg->Uniforms->NumParameters; loc++) {
          const struct gl_program_parameter *u