diff options
author | Timothy Arceri <[email protected]> | 2016-10-20 16:37:27 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
commit | 9972c591e7686658caaa1df46701137f98487811 (patch) | |
tree | b9cda27f599356c93500bca5b9164098d3db1279 /src | |
parent | 4016f08854a41b50d7636fc5e3cf0dfab5029cab (diff) |
glsl: set uses texture gather directly in shader_info
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/glsl/ir_set_program_inouts.cpp | 2 | ||||
-rw-r--r-- | src/compiler/shader_info.c | 2 | ||||
-rw-r--r-- | src/mesa/main/mtypes.h | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/compiler/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp index ec589c776d0..90b06b9f417 100644 --- a/src/compiler/glsl/ir_set_program_inouts.cpp +++ b/src/compiler/glsl/ir_set_program_inouts.cpp @@ -416,7 +416,7 @@ ir_visitor_status ir_set_program_inouts_visitor::visit_enter(ir_texture *ir) { if (ir->op == ir_tg4) - prog->UsesGather = true; + prog->info.uses_texture_gather = true; return visit_continue; } diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c index 83e40cbedc8..1171bbf6773 100644 --- a/src/compiler/shader_info.c +++ b/src/compiler/shader_info.c @@ -29,6 +29,4 @@ copy_shader_info(const struct gl_shader_program *shader_prog, struct gl_linked_shader *sh) { shader_info *info = &sh->Program->info; - - info->uses_texture_gather = sh->Program->UsesGather; } diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index fc216d011b9..79cf9878dbd 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1928,8 +1928,6 @@ struct gl_program GLbitfield ShadowSamplers; /**< Texture units used for shadow sampling. */ GLbitfield ExternalSamplersUsed; /**< Texture units used for samplerExternalOES */ - GLboolean UsesGather; /**< Does this program use gather4 at all? */ - /* Vertex and geometry shaders fields */ unsigned ClipDistanceArraySize; unsigned CullDistanceArraySize; |