diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-12-20 09:39:00 +1100 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2017-01-19 17:05:26 +1100 |
| commit | 1f141eaef650ba8aada1f289cdb79d7b3b380113 (patch) | |
| tree | 504cd05868120b652ad5f5443046e09b44602857 | |
| parent | 3d41f4b9903b68b5a68eb3afc0c17143dbbb30f0 (diff) | |
glsl: tidy up PostDepthCoverage shader field
There is no reason for this to be in the shared gl_shader_info or
to copy it to gl_program at the end of linking (its already there).
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 70bde069e7..063ca45b30 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -1816,7 +1816,7 @@ set_shader_inout_layout(struct gl_shader *shader, state->ARB_fragment_coord_conventions_enable; shader->EarlyFragmentTests = state->fs_early_fragment_tests; shader->info.InnerCoverage = state->fs_inner_coverage; - shader->info.PostDepthCoverage = state->fs_post_depth_coverage; + shader->PostDepthCoverage = state->fs_post_depth_coverage; shader->BlendSupport = state->fs_blend_support; break; diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 5f96a7e744..2bb080a34a 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -1881,7 +1881,7 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog, linked_shader->info.InnerCoverage |= shader->info.InnerCoverage; linked_shader->Program->info.fs.post_depth_coverage |= - shader->info.PostDepthCoverage; + shader->PostDepthCoverage; linked_shader->Program->sh.fs.BlendSupport |= shader->BlendSupport; } diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 7b8be09d77..d0e721e0e9 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 PostDepthCoverage; bool InnerCoverage; struct { @@ -2430,6 +2429,8 @@ struct gl_shader bool redeclares_gl_fragcoord; bool uses_gl_fragcoord; + bool PostDepthCoverage; + /** * Fragment shader state from GLSL 1.50 layout qualifiers. */ diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 80cac37e8e..2a7f0a2c82 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2233,7 +2233,6 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src, case MESA_SHADER_FRAGMENT: { dst->info.fs.depth_layout = src->FragDepthLayout; dst->info.fs.inner_coverage = dst_sh->info.InnerCoverage; - dst->info.fs.post_depth_coverage = dst_sh->info.PostDepthCoverage; break; } case MESA_SHADER_COMPUTE: { |