summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2014-03-12 00:16:24 -0700
committerMatt Turner <[email protected]>2014-03-24 11:06:25 -0700
commita6367dfc157ecc71a686955323526ac4de3652f6 (patch)
tree7628dfd9e8789cf8bf12ee36cfd2f3540f4297cd
parentde4692f56cc566e0f6bd979dd2e7c88a0efde7e6 (diff)
i965/vec4: Rename depends_on_flags() to reads_flag().
To be consistent with the fs backend. Reviewed-by: Eric Anholt <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp4
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
index e86c258cc5e..a9514594e86 100644
--- a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
+++ b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
@@ -1034,7 +1034,7 @@ vec4_instruction_scheduler::calculate_deps()
add_dep(last_mrf_write[inst->base_mrf + i], n);
}
- if (inst->depends_on_flags()) {
+ if (inst->reads_flag()) {
assert(last_conditional_mod);
add_dep(last_conditional_mod, n);
}
@@ -1105,7 +1105,7 @@ vec4_instruction_scheduler::calculate_deps()
add_dep(n, last_mrf_write[inst->base_mrf + i], 2);
}
- if (inst->depends_on_flags()) {
+ if (inst->reads_flag()) {
add_dep(n, last_conditional_mod);
}
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h
index 6ea3ca4de94..5e5ef036a66 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4.h
@@ -267,7 +267,7 @@ public:
bool can_reswizzle_dst(int dst_writemask, int swizzle, int swizzle_mask);
void reswizzle_dst(int dst_writemask, int swizzle);
- bool depends_on_flags()
+ bool reads_flag()
{
return predicate || opcode == VS_OPCODE_UNPACK_FLAGS_SIMD4X2;
}