From 9972c591e7686658caaa1df46701137f98487811 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 20 Oct 2016 16:37:27 +1100 Subject: [PATCH] glsl: set uses texture gather directly in shader_info Reviewed-by: Jason Ekstrand --- src/compiler/glsl/ir_set_program_inouts.cpp | 2 +- src/compiler/shader_info.c | 2 -- src/mesa/main/mtypes.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/compiler/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp index ec589c7..90b06b9 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 83e40cb..1171bbf 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 fc216d0..79cf987 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; -- 2.7.4