OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: set InnerCoverage directly in gl_program

Browse Source 
Also move out of the shared gl_shader_info.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Timothy Arceri
2016-12-20 09:44:20 +11:00
parent 1f141eaef6
commit 7983ed5f65
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/glsl_parser_extras.cpp
View File

@@ -1815,7 +1815,7 @@ set_shader_inout_layout(struct gl_shader *shader,
shader->ARB_fragment_coord_conventions_enable = shader->ARB_fragment_coord_conventions_enable =
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->InnerCoverage = state->fs_inner_coverage;
shader->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;

3
src/compiler/glsl/linker.cpp
View File

@@ -1878,8 +1878,7 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog,
linked_shader->Program->info.fs.early_fragment_tests |= linked_shader->Program->info.fs.early_fragment_tests |=
shader->EarlyFragmentTests; shader->EarlyFragmentTests;
linked_shader->info.InnerCoverage |= linked_shader->Program->info.fs.inner_coverage |= shader->InnerCoverage;
shader->info.InnerCoverage;
linked_shader->Program->info.fs.post_depth_coverage |= linked_shader->Program->info.fs.post_depth_coverage |=
shader->PostDepthCoverage; shader->PostDepthCoverage;

3
src/mesa/main/mtypes.h
View File

@@ -2242,8 +2242,6 @@ struct gl_subroutine_function
*/ */
struct gl_shader_info struct gl_shader_info
{ {
bool InnerCoverage;
struct { struct {
/** Global xfb_stride out qualifier if any */ /** Global xfb_stride out qualifier if any */
GLuint BufferStride[MAX_FEEDBACK_BUFFERS]; GLuint BufferStride[MAX_FEEDBACK_BUFFERS];
@@ -2430,6 +2428,7 @@ struct gl_shader
bool uses_gl_fragcoord; bool uses_gl_fragcoord;
bool PostDepthCoverage; bool PostDepthCoverage;
bool InnerCoverage;
/** /**
* Fragment shader state from GLSL 1.50 layout qualifiers. * Fragment shader state from GLSL 1.50 layout qualifiers.

1
src/mesa/main/shaderapi.c
View File

@@ -2232,7 +2232,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;
break; break;
} }
case MESA_SHADER_COMPUTE: { case MESA_SHADER_COMPUTE: {