diff options
| author | Timothy Arceri <[email protected]> | 2016-12-20 09:44:20 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-01-19 17:05:26 +1100 |
| commit | 7983ed5f657e71a52735dbee046adcbe1a0ab373 (patch) | |
| tree | 5c79704e139abe745f8d92bce9b17cea015c50d8 | |
| parent | 1f141eaef650ba8aada1f289cdb79d7b3b380113 (diff) | |
glsl: set InnerCoverage directly in gl_program
Also move out of the shared gl_shader_info.
Reviewed-by: Lionel Landwerlin <[email protected]>
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 3 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 063ca45b307..a6b695c1a44 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->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; + shader->InnerCoverage = state->fs_inner_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 2bb080a34ac..35f1d8b6a8e 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -1878,8 +1878,7 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog, linked_shader->Program->info.fs.early_fragment_tests |= shader->EarlyFragmentTests; - linked_shader->info.InnerCoverage |= - shader->info.InnerCoverage; + linked_shader->Program->info.fs.inner_coverage |= shader->InnerCoverage; linked_shader->Program->info.fs.post_depth_coverage |= shader->PostDepthCoverage; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index d0e721e0e9d..d036958f9d0 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2242,8 +2242,6 @@ struct gl_subroutine_function */ struct gl_shader_info { - bool InnerCoverage; - struct { /** Global xfb_stride out qualifier if any */ GLuint BufferStride[MAX_FEEDBACK_BUFFERS]; @@ -2430,6 +2428,7 @@ struct gl_shader bool uses_gl_fragcoord; bool PostDepthCoverage; + bool InnerCoverage; /** * Fragment shader state from GLSL 1.50 layout qualifiers. diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 2a7f0a2c828..c87ba0946ca 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2232,7 +2232,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; break; } case MESA_SHADER_COMPUTE: { |