Now that we've made all the texture emit code mostly independent of GLSL
IR, this isn't necessary any more.
Signed-off-by: Connor Abbott <connor.abb...@intel.com>
---
src/mesa/drivers/dri/i965/brw_fs_fp.cpp | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_fs_fp.cpp
b/src/mesa/drivers/dri/i965/brw_fs_fp.cpp
index d08342c..8c1531d 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_fp.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_fp.cpp
@@ -393,14 +393,7 @@ fs_visitor::emit_fragment_program_code()
case OPCODE_TEX:
case OPCODE_TXB:
case OPCODE_TXP: {
- /* We piggy-back on the GLSL IR support for texture setup. To do so,
- * we have to cook up an ir_texture that has the coordinate field
- * with appropriate type, and shadow_comparitor set or not. All the
- * other properties of ir_texture are passed in as arguments to the
- * emit_texture_gen* function.
- */
- ir_texture *ir = NULL;
-
+ ir_texture_opcode op;
fs_reg lod;
fs_reg dpdy;
fs_reg coordinate = src[0];
@@ -410,10 +403,10 @@ fs_visitor::emit_fragment_program_code()
switch (fpi->Opcode) {
case OPCODE_TEX:
- ir = new(mem_ctx) ir_texture(ir_tex);
+ op = ir_tex;
break;
case OPCODE_TXP: {
- ir = new(mem_ctx) ir_texture(ir_tex);
+ op = ir_tex;
coordinate = fs_reg(this, glsl_type::vec3_type);
fs_reg invproj = fs_reg(this, glsl_type::float_type);
@@ -425,15 +418,13 @@ fs_visitor::emit_fragment_program_code()
break;
}
case OPCODE_TXB:
- ir = new(mem_ctx) ir_texture(ir_txb);
+ op = ir_txb;
lod = offset(src[0], 3);
break;
default:
unreachable("not reached");
}
- ir->type = glsl_type::vec4_type;
-
const glsl_type *coordinate_type;
switch (fpi->TexSrcTarget) {
case TEXTURE_1D_INDEX:
@@ -481,7 +472,7 @@ fs_visitor::emit_fragment_program_code()
if (fpi->TexShadow)
shadow_c = offset(coordinate, 2);
- emit_texture(ir->op, glsl_type::vec4_type, coordinate,
+ emit_texture(op, glsl_type::vec4_type, coordinate,
coordinate_type, shadow_c, lod, dpdy, 0, sample_index,
false, offset_reg, NULL, 0, reg_undef, 0, false,
fpi->TexSrcTarget == TEXTURE_RECT_INDEX,
--
1.9.3
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
