glsl: Delete lower_texture_projection

This is only used by i965 and we've been getting it through
nir_lower_tex since forever.  Get rid of the GLSL IR pass.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11827>

src/compiler/glsl/ir_optimization.h

@@ -118,7 +118,6 @@ bool do_dead_functions(exec_list *instructions);
 bool opt_flip_matrices(exec_list *instructions);
 bool do_function_inlining(exec_list *instructions);
 bool do_lower_jumps(exec_list *instructions, bool pull_out_jumps = true, bool lower_sub_return = true, bool lower_main_return = false, bool lower_continue = false, bool lower_break = false);
-bool do_lower_texture_projection(exec_list *instructions);
 bool do_if_simplification(exec_list *instructions);
 bool opt_flatten_nested_if_blocks(exec_list *instructions);
 bool do_discard_simplification(exec_list *instructions);

src/compiler/glsl/lower_texture_projection.cpp

@@ -1,103 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file lower_texture_projection.cpp
- *
- * IR lower pass to perform the division of texture coordinates by the texture
- * projector if present.
- *
- * Many GPUs have a texture sampling opcode that takes the projector
- * and does the divide internally, thus the presence of the projector
- * in the IR.  For GPUs that don't, this saves the driver needing the
- * logic for handling the divide.
- *
- * \author Eric Anholt <eric@anholt.net>
- */
-
-#include "ir.h"
-
-namespace {
-
-class lower_texture_projection_visitor : public ir_hierarchical_visitor {
-public:
-   lower_texture_projection_visitor()
-   {
-      progress = false;
-   }
-
-   ir_visitor_status visit_leave(ir_texture *ir);
-
-   bool progress;
-};
-
-} /* anonymous namespace */
-
-ir_visitor_status
-lower_texture_projection_visitor::visit_leave(ir_texture *ir)
-{
-   if (!ir->projector)
-      return visit_continue;
-
-   void *mem_ctx = ralloc_parent(ir);
-
-   ir_variable *var = new(mem_ctx) ir_variable(ir->projector->type,
-					       "projector", ir_var_temporary);
-   base_ir->insert_before(var);
-   ir_dereference *deref = new(mem_ctx) ir_dereference_variable(var);
-   ir_expression *expr = new(mem_ctx) ir_expression(ir_unop_rcp,
-						    ir->projector->type,
-						    ir->projector,
-						    NULL);
-   ir_assignment *assign = new(mem_ctx) ir_assignment(deref, expr);
-   base_ir->insert_before(assign);
-
-   deref = new(mem_ctx) ir_dereference_variable(var);
-   ir->coordinate = new(mem_ctx) ir_expression(ir_binop_mul,
-					       ir->coordinate->type,
-					       ir->coordinate,
-					       deref);
-
-   if (ir->shadow_comparator) {
-      deref = new(mem_ctx) ir_dereference_variable(var);
-      ir->shadow_comparator = new(mem_ctx) ir_expression(ir_binop_mul,
-						  ir->shadow_comparator->type,
-						  ir->shadow_comparator,
-						  deref);
-   }
-
-   ir->projector = NULL;
-
-   progress = true;
-   return visit_continue;
-}
-
-bool
-do_lower_texture_projection(exec_list *instructions)
-{
-   lower_texture_projection_visitor v;
-
-   visit_list_elements(&v, instructions);
-
-   return v.progress;
-}

src/compiler/glsl/meson.build

@@ -175,7 +175,6 @@ files_libglsl = files(
   'lower_precision.cpp',
   'lower_subroutine.cpp',
   'lower_tess_level.cpp',
-  'lower_texture_projection.cpp',
   'lower_variable_index_to_cond_assign.cpp',
   'lower_vec_index_to_cond_assign.cpp',
   'lower_vec_index_to_swizzle.cpp',

src/compiler/glsl/test_optpass.cpp

@@ -92,8 +92,6 @@ do_optimization(struct exec_list *ir, const char *optimization,
                      &int_0, &int_1, &int_2, &int_3, &int_4) == 5) {
       return do_lower_jumps(ir, int_0 != 0, int_1 != 0, int_2 != 0,
                             int_3 != 0, int_4 != 0);
-   } else if (strcmp(optimization, "do_lower_texture_projection") == 0) {
-      return do_lower_texture_projection(ir);
    } else if (strcmp(optimization, "do_if_simplification") == 0) {
       return do_if_simplification(ir);
    } else if (sscanf(optimization, "lower_if_to_cond_assign ( %d ) ",

src/intel/compiler/brw_vec4_nir.cpp

@@ -2078,7 +2078,7 @@ vec4_visitor::nir_emit_texture(nir_tex_instr *instr)
       }
 
       case nir_tex_src_projector:
-         unreachable("Should be lowered by do_lower_texture_projection");
+         unreachable("Should be lowered by nir_lower_tex");
 
       case nir_tex_src_bias:
          unreachable("LOD bias is not valid for vertex shaders.\n");

src/mesa/drivers/dri/i965/brw_link.cpp

@@ -131,7 +131,6 @@ process_glsl_ir(struct brw_context *brw,
    if (devinfo->ver < 6)
       lower_if_to_cond_assign(shader->Stage, shader->ir, 16);
 
-   do_lower_texture_projection(shader->ir);
    do_vec_index_to_cond_assign(shader->ir);
    lower_vector_insert(shader->ir, true);
    lower_offset_arrays(shader->ir);