Mesa (gallium-0.1): mesa: pass ctx to link_uniform_vars() to fix build error

Brian Paul brianp at kemper.freedesktop.org
Tue Jan 6 21:04:56 UTC 2009


Module: Mesa
Branch: gallium-0.1
Commit: 22ff5a7a0bad0a9a75a8bcd57e97780c66666249
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=22ff5a7a0bad0a9a75a8bcd57e97780c66666249

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan  6 13:59:14 2009 -0700

mesa: pass ctx to link_uniform_vars() to fix build error

---

 src/mesa/shader/slang/slang_link.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 45c5f1d..b2fd955 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -222,7 +222,8 @@ link_varying_vars(struct gl_shader_program *shProg, struct gl_program *prog)
  * then the fragment/vertex parameter index, respectively, will be -1.
  */
 static GLboolean
-link_uniform_vars(struct gl_shader_program *shProg,
+link_uniform_vars(GLcontext *ctx,
+                  struct gl_shader_program *shProg,
                   struct gl_program *prog,
                   GLuint *numSamplers)
 {
@@ -593,13 +594,13 @@ _slang_link(GLcontext *ctx,
 
    /* link uniform vars */
    if (shProg->VertexProgram) {
-      if (!link_uniform_vars(shProg, &shProg->VertexProgram->Base,
+      if (!link_uniform_vars(ctx, shProg, &shProg->VertexProgram->Base,
                              &numSamplers)) {
          return;
       }
    }
    if (shProg->FragmentProgram) {
-      if (!link_uniform_vars(shProg, &shProg->FragmentProgram->Base,
+      if (!link_uniform_vars(ctx, shProg, &shProg->FragmentProgram->Base,
                              &numSamplers)) {
          return;
       }




More information about the mesa-commit mailing list