Mesa (master): mesa/glsl: move uses_gl_fragcoord to gl_shader

[Timothy Arceri]

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

Author: Timothy Arceri <timothy.arceri at collabora.com>
Date:   Tue Nov 22 18:37:06 2016 +1100

mesa/glsl: move uses_gl_fragcoord to gl_shader

This is only used by gl_linked_shader as a temp during linking
so use a temp there instead.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

---

 src/compiler/glsl/glsl_parser_extras.cpp |  2 +-
 src/compiler/glsl/linker.cpp             | 12 +++++-------
 src/mesa/main/mtypes.h                   |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
index 99bdfcc..afb7260 100644
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -1809,7 +1809,7 @@ set_shader_inout_layout(struct gl_shader *shader,
 
    case MESA_SHADER_FRAGMENT:
       shader->redeclares_gl_fragcoord = state->fs_redeclares_gl_fragcoord;
-      shader->info.uses_gl_fragcoord = state->fs_uses_gl_fragcoord;
+      shader->uses_gl_fragcoord = state->fs_uses_gl_fragcoord;
       shader->info.pixel_center_integer = state->fs_pixel_center_integer;
       shader->info.origin_upper_left = state->fs_origin_upper_left;
       shader->ARB_fragment_coord_conventions_enable =
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 6876151..3324554 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -1827,7 +1827,7 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog,
                                 unsigned num_shaders)
 {
    bool redeclares_gl_fragcoord = false;
-   linked_shader->info.uses_gl_fragcoord = false;
+   bool uses_gl_fragcoord = false;
    linked_shader->info.origin_upper_left = false;
    linked_shader->info.pixel_center_integer = false;
 
@@ -1845,9 +1845,9 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog,
        *    that have a static use gl_FragCoord."
        */
       if ((redeclares_gl_fragcoord && !shader->redeclares_gl_fragcoord &&
-           shader->info.uses_gl_fragcoord)
+           shader->uses_gl_fragcoord)
           || (shader->redeclares_gl_fragcoord && !redeclares_gl_fragcoord &&
-              linked_shader->info.uses_gl_fragcoord)) {
+              uses_gl_fragcoord)) {
              linker_error(prog, "fragment shader defined with conflicting "
                          "layout qualifiers for gl_FragCoord\n");
       }
@@ -1871,11 +1871,9 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog,
        * are multiple redeclarations, all the fields except uses_gl_fragcoord
        * are already known to be the same.
        */
-      if (shader->redeclares_gl_fragcoord || shader->info.uses_gl_fragcoord) {
+      if (shader->redeclares_gl_fragcoord || shader->uses_gl_fragcoord) {
          redeclares_gl_fragcoord = shader->redeclares_gl_fragcoord;
-         linked_shader->info.uses_gl_fragcoord =
-            linked_shader->info.uses_gl_fragcoord ||
-            shader->info.uses_gl_fragcoord;
+         uses_gl_fragcoord |= shader->uses_gl_fragcoord;
          linked_shader->info.origin_upper_left =
             shader->info.origin_upper_left;
          linked_shader->info.pixel_center_integer =
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index cbf2e95..5548827 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2242,7 +2242,6 @@ struct gl_subroutine_function
  */
 struct gl_shader_info
 {
-   bool uses_gl_fragcoord;
    bool PostDepthCoverage;
    bool InnerCoverage;
 
@@ -2435,6 +2434,7 @@ struct gl_shader
    bool ARB_fragment_coord_conventions_enable;
 
    bool redeclares_gl_fragcoord;
+   bool uses_gl_fragcoord;
 
    struct gl_shader_info info;
 };