Mesa (master): i965/vec4: Rename depends_on_flags() to reads_flag().
Matt Turner
mattst88 at kemper.freedesktop.org
Mon Mar 24 18:09:08 UTC 2014
Module: Mesa
Branch: master
Commit: a6367dfc157ecc71a686955323526ac4de3652f6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a6367dfc157ecc71a686955323526ac4de3652f6
Author: Matt Turner <mattst88 at gmail.com>
Date: Wed Mar 12 00:16:24 2014 -0700
i965/vec4: Rename depends_on_flags() to reads_flag().
To be consistent with the fs backend.
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp | 4 ++--
src/mesa/drivers/dri/i965/brw_vec4.h | 2 +-
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 e86c258..a951459 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 6ea3ca4..5e5ef03 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;
}
More information about the mesa-commit
mailing list