i965/fs: Remove unused 'sampler' parameter in emit_texture_genX().

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index 6fd9908f71342718c58538b8ef7d898edfe75a72..199237a63a2a2b7ae422a7359271f052cfa2b60f 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -308,14 +308,11 @@ public:
    void emit_interpolation_setup_gen6();
    fs_reg emit_texcoord(ir_texture *ir, int sampler);
    fs_inst *emit_texture_gen4(ir_texture *ir, fs_reg dst, fs_reg coordinate,
-                             fs_reg shadow_comp, fs_reg lod, fs_reg lod2,
-                             int sampler);
+                             fs_reg shadow_comp, fs_reg lod, fs_reg lod2);
    fs_inst *emit_texture_gen5(ir_texture *ir, fs_reg dst, fs_reg coordinate,
-                             fs_reg shadow_comp, fs_reg lod, fs_reg lod2,
-                             int sampler);
+                             fs_reg shadow_comp, fs_reg lod, fs_reg lod2);
    fs_inst *emit_texture_gen7(ir_texture *ir, fs_reg dst, fs_reg coordinate,
-                             fs_reg shadow_comp, fs_reg lod, fs_reg lod2,
-                             int sampler);
+                             fs_reg shadow_comp, fs_reg lod, fs_reg lod2);
    fs_inst *emit_math(enum opcode op, fs_reg dst, fs_reg src0);
    fs_inst *emit_math(enum opcode op, fs_reg dst, fs_reg src0, fs_reg src1);
    bool try_emit_saturate(ir_expression *ir);

diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index 8eee49d11a36fafc7f8367fd5b1c294cbad2f834..b8440097f0badb1da7b6424d0b836faaf5c7c6d5 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -747,8 +747,7 @@ fs_visitor::visit(ir_assignment *ir)
 
 fs_inst *
 fs_visitor::emit_texture_gen4(ir_texture *ir, fs_reg dst, fs_reg coordinate,
-                             fs_reg shadow_c, fs_reg lod, fs_reg dPdy,
-                             int sampler)
+                             fs_reg shadow_c, fs_reg lod, fs_reg dPdy)
 {
    int mlen;
    int base_mrf = 1;
@@ -917,8 +916,7 @@ fs_visitor::emit_texture_gen4(ir_texture *ir, fs_reg dst, fs_reg coordinate,
  */
 fs_inst *
 fs_visitor::emit_texture_gen5(ir_texture *ir, fs_reg dst, fs_reg coordinate,
-                             fs_reg shadow_c, fs_reg lod, fs_reg lod2,
-                             int sampler)
+                             fs_reg shadow_c, fs_reg lod, fs_reg lod2)
 {
    int mlen = 0;
    int base_mrf = 2;
@@ -1038,8 +1036,7 @@ fs_visitor::emit_texture_gen5(ir_texture *ir, fs_reg dst, fs_reg coordinate,
 
 fs_inst *
 fs_visitor::emit_texture_gen7(ir_texture *ir, fs_reg dst, fs_reg coordinate,
-                             fs_reg shadow_c, fs_reg lod, fs_reg lod2,
-                             int sampler)
+                             fs_reg shadow_c, fs_reg lod, fs_reg lod2)
 {
    int mlen = 0;
    int base_mrf = 2;
@@ -1333,13 +1330,13 @@ fs_visitor::visit(ir_texture *ir)
 
    if (intel->gen >= 7) {
       inst = emit_texture_gen7(ir, dst, coordinate, shadow_comparitor,
-                               lod, lod2, sampler);
+                               lod, lod2);
    } else if (intel->gen >= 5) {
       inst = emit_texture_gen5(ir, dst, coordinate, shadow_comparitor,
-                               lod, lod2, sampler);
+                               lod, lod2);
    } else {
       inst = emit_texture_gen4(ir, dst, coordinate, shadow_comparitor,
-                               lod, lod2, sampler);
+                               lod, lod2);
    }
 
    /* The header is set up by generate_tex() when necessary. */