From 7983ed5f657e71a52735dbee046adcbe1a0ab373 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Tue, 20 Dec 2016 09:44:20 +1100 Subject: glsl: set InnerCoverage directly in gl_program Also move out of the shared gl_shader_info. Reviewed-by: Lionel Landwerlin --- src/mesa/main/mtypes.h | 3 +-- src/mesa/main/shaderapi.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/mesa/main') 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: { -- cgit v1.2.3