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>
This commit is contained in:
Timothy Arceri
2016-12-20 09:39:00 +11:00
parent 3d41f4b990
commit 1f141eaef6
4 changed files with 4 additions and 4 deletions

View File

@@ -1816,7 +1816,7 @@ set_shader_inout_layout(struct gl_shader *shader,
state->ARB_fragment_coord_conventions_enable; state->ARB_fragment_coord_conventions_enable;
shader->EarlyFragmentTests = state->fs_early_fragment_tests; shader->EarlyFragmentTests = state->fs_early_fragment_tests;
shader->info.InnerCoverage = state->fs_inner_coverage; 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; shader->BlendSupport = state->fs_blend_support;
break; break;

View File

@@ -1881,7 +1881,7 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog,
linked_shader->info.InnerCoverage |= linked_shader->info.InnerCoverage |=
shader->info.InnerCoverage; shader->info.InnerCoverage;
linked_shader->Program->info.fs.post_depth_coverage |= linked_shader->Program->info.fs.post_depth_coverage |=
shader->info.PostDepthCoverage; shader->PostDepthCoverage;
linked_shader->Program->sh.fs.BlendSupport |= shader->BlendSupport; linked_shader->Program->sh.fs.BlendSupport |= shader->BlendSupport;
} }

View File

@@ -2242,7 +2242,6 @@ struct gl_subroutine_function
*/ */
struct gl_shader_info struct gl_shader_info
{ {
bool PostDepthCoverage;
bool InnerCoverage; bool InnerCoverage;
struct { struct {
@@ -2430,6 +2429,8 @@ struct gl_shader
bool redeclares_gl_fragcoord; bool redeclares_gl_fragcoord;
bool uses_gl_fragcoord; bool uses_gl_fragcoord;
bool PostDepthCoverage;
/** /**
* Fragment shader state from GLSL 1.50 layout qualifiers. * Fragment shader state from GLSL 1.50 layout qualifiers.
*/ */

View File

@@ -2233,7 +2233,6 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src,
case MESA_SHADER_FRAGMENT: { case MESA_SHADER_FRAGMENT: {
dst->info.fs.depth_layout = src->FragDepthLayout; dst->info.fs.depth_layout = src->FragDepthLayout;
dst->info.fs.inner_coverage = dst_sh->info.InnerCoverage; dst->info.fs.inner_coverage = dst_sh->info.InnerCoverage;
dst->info.fs.post_depth_coverage = dst_sh->info.PostDepthCoverage;
break; break;
} }
case MESA_SHADER_COMPUTE: { case MESA_SHADER_COMPUTE: {