Mesa (master): mesa/glsl: move ARB_fragment_coord_conventions_enable field

[Timothy Arceri]

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

Author: Timothy Arceri <timothy.arc...@collabora.com>
Date:   Tue Nov 22 18:17:37 2016 +1100

mesa/glsl: move ARB_fragment_coord_conventions_enable field

This is only used by gl_shader not gl_linked_shader so move it
there.

Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>

---

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

diff --git a/src/compiler/glsl/glsl_parser_extras.cpp 
b/src/compiler/glsl/glsl_parser_extras.cpp
index 2b4dce0..d84a3f8 100644
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -1813,7 +1813,7 @@ set_shader_inout_layout(struct gl_shader *shader,
       shader->info.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->info.ARB_fragment_coord_conventions_enable =
+      shader->ARB_fragment_coord_conventions_enable =
          state->ARB_fragment_coord_conventions_enable;
       shader->EarlyFragmentTests = state->fs_early_fragment_tests;
       shader->info.InnerCoverage = state->fs_inner_coverage;
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 9e85155..3846679 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -4674,7 +4674,7 @@ link_shaders(struct gl_context *ctx, struct 
gl_shader_program *prog)
          goto done;
       }
 
-      if (prog->Shaders[i]->info.ARB_fragment_coord_conventions_enable) {
+      if (prog->Shaders[i]->ARB_fragment_coord_conventions_enable) {
          prog->ARB_fragment_coord_conventions_enable = true;
       }
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 94fc6e9..cb35aa1 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2246,7 +2246,6 @@ struct gl_shader_info
    bool redeclares_gl_fragcoord;
    bool PostDepthCoverage;
    bool InnerCoverage;
-   bool ARB_fragment_coord_conventions_enable;
 
    /**
     * Fragment shader state from GLSL 1.50 layout qualifiers.
@@ -2434,6 +2433,8 @@ struct gl_shader
     */
    bool EarlyFragmentTests;
 
+   bool ARB_fragment_coord_conventions_enable;
+
    struct gl_shader_info info;
 };
 

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit