From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 23 Jun 2010 19:09:14 +0000 (-0700)
Subject: linker: Refactor parameters to cross_validate_uniforms
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ed1fe3db3b871a6aa48d49b46fa22938b2784bdc;p=mesa.git

linker: Refactor parameters to cross_validate_uniforms
---

diff --git a/linker.cpp b/linker.cpp
index 4d1ff0167e8..bdc4c5765a6 100644
--- a/linker.cpp
+++ b/linker.cpp
@@ -250,15 +250,14 @@ validate_fragment_shader_executable(struct glsl_program *prog,
  * Perform validation of uniforms used across multiple shader stages
  */
 bool
-cross_validate_uniforms(struct glsl_program *prog,
-			struct glsl_shader **shaders, unsigned num_shaders)
+cross_validate_uniforms(struct glsl_program *prog)
 {
    /* Examine all of the uniforms in all of the shaders and cross validate
     * them.
     */
    glsl_symbol_table uniforms;
-   for (unsigned i = 0; i < num_shaders; i++) {
-      foreach_list(node, &shaders[i]->ir) {
+   for (unsigned i = 0; i < prog->_NumLinkedShaders; i++) {
+      foreach_list(node, &prog->_LinkedShaders[i]->ir) {
 	 ir_variable *const var = ((ir_instruction *) node)->as_variable();
 
 	 if ((var == NULL) || (var->mode != ir_var_uniform))
@@ -829,8 +828,7 @@ link_shaders(struct glsl_program *prog)
       prog->_NumLinkedShaders++;
    }
 
-   if (cross_validate_uniforms(prog, prog->_LinkedShaders,
-			       prog->_NumLinkedShaders)) {
+   if (cross_validate_uniforms(prog)) {
       /* Validate the inputs of each stage with the output of the preceeding
        * stage.
        */