On Mon, May 07, 2012 at 05:59:35PM +0200, Kai Wasserbäch wrote: > v2: Enabled CEIL on Cayman too. > > Signed-off-by: Kai Wasserbäch <k...@dev.carbon-project.org> > Reviewed-by: Tom Stellard <thomas.stell...@amd.com> > --- > Thanks for the review, Tom! > > If this patch is accepted, please apply it to master for me, I don't have > commit access on FDO.
Committed as 8c98635d4fc7437b05debe337aef2377df685c0c Thanks! -Tom > > src/gallium/drivers/r600/r600_shader.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/src/gallium/drivers/r600/r600_shader.c > b/src/gallium/drivers/r600/r600_shader.c > index fa29b36..aa17f20 100644 > --- a/src/gallium/drivers/r600/r600_shader.c > +++ b/src/gallium/drivers/r600/r600_shader.c > @@ -5154,7 +5154,7 @@ static struct r600_shader_tgsi_instruction > r600_shader_tgsi_instruction[] = { > {80, 0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > {TGSI_OPCODE_PUSHA, 0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > {TGSI_OPCODE_POPA, 0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > - {TGSI_OPCODE_CEIL, 0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > + {TGSI_OPCODE_CEIL, 0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_CEIL, > tgsi_op2}, > {TGSI_OPCODE_I2F, 0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_INT_TO_FLT, > tgsi_op2_trans}, > {TGSI_OPCODE_NOT, 0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOT_INT, > tgsi_op2}, > {TGSI_OPCODE_TRUNC, 0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_TRUNC, > tgsi_op2}, > @@ -5328,7 +5328,7 @@ static struct r600_shader_tgsi_instruction > eg_shader_tgsi_instruction[] = { > {80, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > {TGSI_OPCODE_PUSHA, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > {TGSI_OPCODE_POPA, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > - {TGSI_OPCODE_CEIL, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > + {TGSI_OPCODE_CEIL, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_CEIL, > tgsi_op2}, > {TGSI_OPCODE_I2F, 0, > EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_INT_TO_FLT, tgsi_op2_trans}, > {TGSI_OPCODE_NOT, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOT_INT, > tgsi_op2}, > {TGSI_OPCODE_TRUNC, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_TRUNC, > tgsi_op2}, > @@ -5502,7 +5502,7 @@ static struct r600_shader_tgsi_instruction > cm_shader_tgsi_instruction[] = { > {80, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > {TGSI_OPCODE_PUSHA, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > {TGSI_OPCODE_POPA, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > - {TGSI_OPCODE_CEIL, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, > tgsi_unsupported}, > + {TGSI_OPCODE_CEIL, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_CEIL, > tgsi_op2}, > {TGSI_OPCODE_I2F, 0, > EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_INT_TO_FLT, tgsi_op2}, > {TGSI_OPCODE_NOT, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOT_INT, > tgsi_op2}, > {TGSI_OPCODE_TRUNC, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_TRUNC, > tgsi_op2}, > -- > 1.7.10 > > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev