diff options
author | Timothy Arceri <[email protected]> | 2016-11-22 13:10:18 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-01-19 17:05:26 +1100 |
commit | ae28c5a60c4d0986be22c250f8d6727661406596 (patch) | |
tree | 8e7e6543d1bef4ed5ac03af21130a4eae6ac8bb3 /src/compiler/glsl | |
parent | 5c93d274231ad36934c5338747ce14b95231031d (diff) |
st/mesa/glsl: set early_fragment_tests directly in shader_info
We also move EarlyFragmentTests out of the gl_shader_info struct
as it is now only used by gl_shader.
Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
-rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 2 | ||||
-rw-r--r-- | src/compiler/glsl/linker.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 1b84876079d..2b4dce0d359 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -1815,7 +1815,7 @@ set_shader_inout_layout(struct gl_shader *shader, shader->info.origin_upper_left = state->fs_origin_upper_left; shader->info.ARB_fragment_coord_conventions_enable = state->ARB_fragment_coord_conventions_enable; - shader->info.EarlyFragmentTests = state->fs_early_fragment_tests; + shader->EarlyFragmentTests = state->fs_early_fragment_tests; shader->info.InnerCoverage = state->fs_inner_coverage; shader->info.PostDepthCoverage = state->fs_post_depth_coverage; shader->BlendSupport = state->fs_blend_support; diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 7073eac9d91..9e85155b6da 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -1887,8 +1887,8 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog, shader->info.pixel_center_integer; } - linked_shader->info.EarlyFragmentTests |= - shader->info.EarlyFragmentTests; + linked_shader->Program->info.fs.early_fragment_tests |= + shader->EarlyFragmentTests; linked_shader->info.InnerCoverage |= shader->info.InnerCoverage; linked_shader->Program->info.fs.post_depth_coverage |= |