diff options
| author | Christian König <[email protected]> | 2011-01-21 21:51:24 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-21 21:51:24 +0100 |
| commit | 86e5b79a274ad4ed5c169aa5626106331273311c (patch) | |
| tree | 31bc98df0e79c453c5ff143ac8e6ddaa846799c1 /src/gallium/drivers/r600/r600_asm.c | |
| parent | 78faf8d0e9c276a0ff1465e501d58fb3d66de2f7 (diff) | |
| parent | 8af583f6e844ef2d173eb3c5c2e378cd1da018a8 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_texture.c
Diffstat (limited to 'src/gallium/drivers/r600/r600_asm.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_asm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index 54e339fbefe..935b8454560 100644 --- a/src/gallium/drivers/r600/r600_asm.c +++ b/src/gallium/drivers/r600/r600_asm.c @@ -482,6 +482,7 @@ static int is_alu_trans_unit_inst(struct r600_bc *bc, struct r600_bc_alu *alu) if (!alu->is_op3) return alu->inst == EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ASHR_INT || alu->inst == EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLT_TO_INT || + alu->inst == EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLT_TO_INT_FLOOR || alu->inst == EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_INT_TO_FLT || alu->inst == EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LSHL_INT || alu->inst == EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LSHR_INT || |