Mesa (master): mesa: pass gl_program to _mesa_append_uniforms_to_file()

[Timothy Arceri]

Module: Mesa
Branch: master
Commit: 9ea513e22698fba429b8f3f2a9a0ccdbcc73d4a2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ea513e22698fba429b8f3f2a9a0ccdbcc73d4a2

Author: Timothy Arceri <timothy.arceri at collabora.com>
Date:   Mon Oct 31 21:51:40 2016 +1100

mesa: pass gl_program to _mesa_append_uniforms_to_file()

This now contains everything we need.

Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/main/api_validate.c  | 2 +-
 src/mesa/program/prog_print.c | 5 ++---
 src/mesa/program/prog_print.h | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index f68011e..33e8086 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -210,7 +210,7 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
 	  * program isn't also bound to the fragment shader target we don't
 	  * want to log its fragment data.
 	  */
-	 _mesa_append_uniforms_to_file(shProg[i]->_LinkedShaders[i]);
+	 _mesa_append_uniforms_to_file(shProg[i]->_LinkedShaders[i]->Program);
       }
 
       for (i = 0; i < MESA_SHADER_STAGES; i++) {
diff --git a/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c
index 0a4bc51..6d04a38 100644
--- a/src/mesa/program/prog_print.c
+++ b/src/mesa/program/prog_print.c
@@ -1001,14 +1001,13 @@ _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_linked_shader *shader)
+_mesa_append_uniforms_to_file(const struct gl_program *prog)
 {
-   const struct gl_program *const prog = shader->Program;
    const char *type;
    char filename[100];
    FILE *f;
 
-   if (shader->Stage == MESA_SHADER_FRAGMENT)
+   if (prog->info.stage == MESA_SHADER_FRAGMENT)
       type = "frag";
    else
       type = "vert";
diff --git a/src/mesa/program/prog_print.h b/src/mesa/program/prog_print.h
index 7b1e1fe..98a43e6 100644
--- a/src/mesa/program/prog_print.h
+++ b/src/mesa/program/prog_print.h
@@ -118,7 +118,7 @@ extern void
 _mesa_write_shader_to_file(const struct gl_shader *shader);
 
 extern void
-_mesa_append_uniforms_to_file(const struct gl_linked_shader *shader);
+_mesa_append_uniforms_to_file(const struct gl_program *prog);
 
 
 #ifdef __cplusplus