glsl: set uses texture gather directly in shader_info

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/compiler/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp
index ec589c7..90b06b9 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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;