diff options
| author | Kenneth Graunke <[email protected]> | 2014-06-07 02:39:37 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-06-10 16:38:26 -0700 |
| commit | 5260a26e927df2bda7059b170c007a03da65b03b (patch) | |
| tree | bba7a88fef4f89d6d0b46286047c0bb7ab833bf9 | |
| parent | b003fc265fc672b35d15ce7c2d05e8b9c81c4ee9 (diff) | |
i965/vec4: Drop the generate_math2_gen7() method.
It's now a single line of code, so we may as well fold it into the
caller.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 11 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index a3ba9c77647..d8fa20bdd5b 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -665,10 +665,6 @@ private: struct brw_reg dst, struct brw_reg src0, struct brw_reg src1); - void generate_math2_gen7(vec4_instruction *inst, - struct brw_reg dst, - struct brw_reg src0, - struct brw_reg src1); void generate_tex(vec4_instruction *inst, struct brw_reg dst, diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp index 97fd2224b68..86dfbd56e70 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp @@ -191,15 +191,6 @@ vec4_generator::generate_math1_gen6(vec4_instruction *inst, } void -vec4_generator::generate_math2_gen7(vec4_instruction *inst, - struct brw_reg dst, - struct brw_reg src0, - struct brw_reg src1) -{ - gen6_math(p, dst, brw_math_function(inst->opcode), src0, src1); -} - -void vec4_generator::generate_math2_gen6(vec4_instruction *inst, struct brw_reg dst, struct brw_reg src0, @@ -1148,7 +1139,7 @@ vec4_generator::generate_vec4_instruction(vec4_instruction *instruction, case SHADER_OPCODE_INT_QUOTIENT: case SHADER_OPCODE_INT_REMAINDER: if (brw->gen >= 7) { - generate_math2_gen7(inst, dst, src[0], src[1]); + gen6_math(p, dst, brw_math_function(inst->opcode), src[0], src[1]); } else if (brw->gen == 6) { generate_math2_gen6(inst, dst, src[0], src[1]); } else { |