KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/glsl: move ARB_fragment_coord_conventions_enable field 

This is only used by gl_shader not gl_linked_shader so move it
there.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Timothy Arceri 2016-11-22 18:17:37 +11:00
parent ae28c5a60c
commit cc7ecce253
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1813,7 +1813,7 @@ set_shader_inout_layout(struct gl_shader *shader,
shader->info.uses_gl_fragcoord = state->fs_uses_gl_fragcoord;
shader->info.pixel_center_integer = state->fs_pixel_center_integer;
shader->info.origin_upper_left = state->fs_origin_upper_left;
shader->info.ARB_fragment_coord_conventions_enable =
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;

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

@ -4674,7 +4674,7 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
goto done;
}
if (prog->Shaders[i]->info.ARB_fragment_coord_conventions_enable) {
if (prog->Shaders[i]->ARB_fragment_coord_conventions_enable) {
prog->ARB_fragment_coord_conventions_enable = true;
}

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

@ -2246,7 +2246,6 @@ struct gl_shader_info
bool redeclares_gl_fragcoord;
bool PostDepthCoverage;
bool InnerCoverage;
bool ARB_fragment_coord_conventions_enable;
/**
* Fragment shader state from GLSL 1.50 layout qualifiers.
@ -2434,6 +2433,8 @@ struct gl_shader
*/
bool EarlyFragmentTests;
bool ARB_fragment_coord_conventions_enable;
struct gl_shader_info info;
};