From: Brian Paul <brianp@vmware.com>
Date: Fri, 14 Aug 2009 18:57:39 +0000 (-0600)
Subject: mesa: also pass the GPU program to _mesa_append_uniforms_to_file()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=12199ed96ca0dd2307e9893c58300623cfa6c0ee;p=mesa.git

mesa: also pass the GPU program to _mesa_append_uniforms_to_file()

We want the post-link program at this points.
---

diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 1bc21099570..3c1c17e0996 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -964,7 +964,8 @@ _mesa_write_shader_to_file(const struct gl_shader *shader)
  * _mesa_write_shader_to_file function.
  */
 void
-_mesa_append_uniforms_to_file(const struct gl_shader *shader)
+_mesa_append_uniforms_to_file(const struct gl_shader *shader,
+                              const struct gl_program *prog)
 {
    const char *type;
    char filename[100];
@@ -984,7 +985,7 @@ _mesa_append_uniforms_to_file(const struct gl_shader *shader)
 
    fprintf(f, "/* First-draw parameters / constants */\n");
    fprintf(f, "/*\n");
-   _mesa_fprint_parameter_list(f, shader->Program->Parameters);
+   _mesa_fprint_parameter_list(f, prog->Parameters);
    fprintf(f, "*/\n");
 
    fclose(f);
diff --git a/src/mesa/shader/prog_print.h b/src/mesa/shader/prog_print.h
index 460426fd510..fc286ded540 100644
--- a/src/mesa/shader/prog_print.h
+++ b/src/mesa/shader/prog_print.h
@@ -87,7 +87,8 @@ extern void
 _mesa_write_shader_to_file(const struct gl_shader *shader);
 
 extern void
-_mesa_append_uniforms_to_file(const struct gl_shader *shader);
+_mesa_append_uniforms_to_file(const struct gl_shader *shader,
+                              const struct gl_program *prog);
 
 
 #endif /* PROG_PRINT_H */