summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2013-10-20 15:48:14 -0700
committerMatt Turner <mattst88@gmail.com>2013-12-04 20:05:43 -0800
commit8814806c97ed60c5bb4d6cb1927cd05445864388 (patch)
tree3db2db374ee0acdc4efa5d9553a4ebee3b4cf3d7 /src/mesa/drivers
parentb9af66528e5b7bd5608086557c44e6b9eb2f2d9d (diff)
downloadexternal_mesa3d-8814806c97ed60c5bb4d6cb1927cd05445864388.zip
external_mesa3d-8814806c97ed60c5bb4d6cb1927cd05445864388.tar.gz
external_mesa3d-8814806c97ed60c5bb4d6cb1927cd05445864388.tar.bz2
i965: Print conditional mod in dump_instruction().
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp2
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4.cpp6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index f10f5c0..f3b121a 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -2831,7 +2831,7 @@ fs_visitor::dump_instruction(backend_instruction *be_inst)
if (inst->saturate)
printf(".sat");
if (inst->conditional_mod) {
- printf(".cmod");
+ printf("%s", conditional_modifier[inst->conditional_mod]);
if (!inst->predicate &&
(brw->gen < 5 || (inst->opcode != BRW_OPCODE_SEL &&
inst->opcode != BRW_OPCODE_IF &&
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp
index 06ae052..962b4cf 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
@@ -1109,7 +1109,11 @@ vec4_visitor::dump_instruction(backend_instruction *be_inst)
{
vec4_instruction *inst = (vec4_instruction *)be_inst;
- printf("%s ", brw_instruction_name(inst->opcode));
+ printf("%s", brw_instruction_name(inst->opcode));
+ if (inst->conditional_mod) {
+ printf("%s", conditional_modifier[inst->conditional_mod]);
+ }
+ printf(" ");
switch (inst->dst.file) {
case GRF: