[Mesa-dev] [PATCH 2/6] i965: remove the second unused parameter of gen6_CONT

Yuanhan Liu yuanhan.liu at linux.intel.com
Thu Dec 1 02:26:52 PST 2011


Signed-off-by: Yuanhan Liu <yuanhan.liu at linux.intel.com>
---
 src/mesa/drivers/dri/i965/brw_eu.h          |    2 +-
 src/mesa/drivers/dri/i965/brw_eu_emit.c     |    2 +-
 src/mesa/drivers/dri/i965/brw_fs_emit.cpp   |    2 +-
 src/mesa/drivers/dri/i965/brw_vec4_emit.cpp |    2 +-
 src/mesa/drivers/dri/i965/brw_vs_emit.c     |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h
index 61d3178..53c0383 100644
--- a/src/mesa/drivers/dri/i965/brw_eu.h
+++ b/src/mesa/drivers/dri/i965/brw_eu.h
@@ -1006,7 +1006,7 @@ int brw_WHILE(struct brw_compile *p, struct brw_instruction *patch_insn);
 
 int brw_BREAK(struct brw_compile *p, int pop_count);
 int brw_CONT(struct brw_compile *p, int pop_count);
-int gen6_CONT(struct brw_compile *p, struct brw_instruction *do_insn);
+int gen6_CONT(struct brw_compile *p);
 /* Forward jumps:
  */
 void brw_land_fwd_jump(struct brw_compile *p, 
diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
index 4c0de2c..9b37e81 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
@@ -1218,7 +1218,7 @@ int brw_BREAK(struct brw_compile *p, int pop_count)
    return insn_idx;
 }
 
-int gen6_CONT(struct brw_compile *p, struct brw_instruction *do_insn)
+int gen6_CONT(struct brw_compile *p)
 {
    int insn_idx = next_insn(p, BRW_OPCODE_CONTINUE);
    struct brw_instruction *insn = brw_insn_of(p, insn_idx);
diff --git a/src/mesa/drivers/dri/i965/brw_fs_emit.cpp b/src/mesa/drivers/dri/i965/brw_fs_emit.cpp
index 3b1577d..f78723e 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_emit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_emit.cpp
@@ -796,7 +796,7 @@ fs_visitor::generate_code()
       case BRW_OPCODE_CONTINUE:
 	 /* FINISHME: We need to write the loop instruction support still. */
 	 if (intel->gen >= 6)
-	    gen6_CONT(p, loop_stack[loop_stack_depth - 1]);
+	    gen6_CONT(p);
 	 else
 	    brw_CONT(p, if_depth_in_loop[loop_stack_depth]);
 	 brw_set_predicate_control(p, BRW_PREDICATE_NONE);
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
index a279e87..e36adae 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
@@ -827,7 +827,7 @@ vec4_visitor::generate_code()
       case BRW_OPCODE_CONTINUE:
 	 /* FINISHME: We need to write the loop instruction support still. */
 	 if (intel->gen >= 6)
-	    gen6_CONT(p, loop_stack[loop_stack_depth - 1]);
+	    gen6_CONT(p);
 	 else
 	    brw_CONT(p, if_depth_in_loop[loop_stack_depth]);
 	 brw_set_predicate_control(p, BRW_PREDICATE_NONE);
diff --git a/src/mesa/drivers/dri/i965/brw_vs_emit.c b/src/mesa/drivers/dri/i965/brw_vs_emit.c
index 0a0cfbe..6d50fad 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_emit.c
@@ -2107,7 +2107,7 @@ void brw_old_vs_emit(struct brw_vs_compile *c )
       case OPCODE_CONT:
 	 brw_set_predicate_control(p, get_predicate(inst));
 	 if (intel->gen >= 6) {
-	    gen6_CONT(p, loop_inst[loop_depth - 1]);
+	    gen6_CONT(p);
 	 } else {
 	    brw_CONT(p, if_depth_in_loop[loop_depth]);
 	 }
-- 
1.7.4.4



More information about the mesa-dev mailing list