diff options
| author | Matt Turner <[email protected]> | 2013-09-19 19:48:22 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-10-14 11:13:09 -0700 |
| commit | a5ec01fb1bd4ad5418eb16cb05e6f6929d1444e8 (patch) | |
| tree | af3874c651b231db3cd01506fbc124fee9cf40d2 | |
| parent | 53904c64da308bc5b5fd98c105fb86ec38cc33a3 (diff) | |
i965: Don't copy prop source mods into instructions that can't take them.
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.cpp | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.cpp | 19 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.cpp | 3 |
4 files changed, 26 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index e5d6e4b281e..85995df7869 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -368,6 +368,9 @@ fs_visitor::can_do_source_mods(fs_inst *inst) if (inst->is_send_from_grf()) return false; + if (!inst->can_do_source_mods()) + return false; + return true; } diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 61c4bf5a5ff..256f9b21e4c 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -568,6 +568,25 @@ backend_instruction::is_control_flow() } } +bool +backend_instruction::can_do_source_mods() +{ + switch (opcode) { + case BRW_OPCODE_ADDC: + case BRW_OPCODE_BFE: + case BRW_OPCODE_BFI1: + case BRW_OPCODE_BFI2: + case BRW_OPCODE_BFREV: + case BRW_OPCODE_CBIT: + case BRW_OPCODE_FBH: + case BRW_OPCODE_FBL: + case BRW_OPCODE_SUBB: + return false; + default: + return true; + } +} + void backend_visitor::dump_instructions() { diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h index 4dbd38d4a52..21a0ad66c42 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.h +++ b/src/mesa/drivers/dri/i965/brw_shader.h @@ -44,6 +44,7 @@ public: bool is_tex(); bool is_math(); bool is_control_flow(); + bool can_do_source_mods(); enum opcode opcode; /* BRW_OPCODE_* or FS_OPCODE_* */ diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 149a1a0e165..bfd01068aba 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -222,6 +222,9 @@ vec4_visitor::can_do_source_mods(vec4_instruction *inst) if (inst->is_send_from_grf()) return false; + if (!inst->can_do_source_mods()) + return false; + return true; } |