Pushed, thanks. Marek
On Thu, Jun 16, 2016 at 1:41 AM, Jan Vesely <jan.ves...@rutgers.edu> wrote: > v2: Merge with PIPE_SHADER_CAP_DOUBLES > Add CHIP_HEMLOCK > > v3: only set the instruction on EG and CM > > Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu> > --- > src/gallium/drivers/r600/r600_pipe.c | 8 +++++--- > src/gallium/drivers/r600/r600_shader.c | 4 ++-- > 2 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/src/gallium/drivers/r600/r600_pipe.c > b/src/gallium/drivers/r600/r600_pipe.c > index a49b00f..87b41f4 100644 > --- a/src/gallium/drivers/r600/r600_pipe.c > +++ b/src/gallium/drivers/r600/r600_pipe.c > @@ -541,14 +541,16 @@ static int r600_get_shader_param(struct pipe_screen* > pscreen, unsigned shader, e > } > case PIPE_SHADER_CAP_SUPPORTED_IRS: > return 0; > + case PIPE_SHADER_CAP_TGSI_FMA_SUPPORTED: > case PIPE_SHADER_CAP_DOUBLES: > - if (rscreen->b.family == CHIP_CYPRESS || > - rscreen->b.family == CHIP_CAYMAN || rscreen->b.family > == CHIP_ARUBA) > + if (rscreen->b.family == CHIP_ARUBA || > + rscreen->b.family == CHIP_CAYMAN || > + rscreen->b.family == CHIP_CYPRESS || > + rscreen->b.family == CHIP_HEMLOCK) > return 1; > return 0; > case PIPE_SHADER_CAP_TGSI_DROUND_SUPPORTED: > case PIPE_SHADER_CAP_TGSI_DFRACEXP_DLDEXP_SUPPORTED: > - case PIPE_SHADER_CAP_TGSI_FMA_SUPPORTED: > case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS: > case PIPE_SHADER_CAP_MAX_SHADER_IMAGES: > return 0; > diff --git a/src/gallium/drivers/r600/r600_shader.c > b/src/gallium/drivers/r600/r600_shader.c > index 101f666..9a1008e 100644 > --- a/src/gallium/drivers/r600/r600_shader.c > +++ b/src/gallium/drivers/r600/r600_shader.c > @@ -9116,7 +9116,7 @@ static const struct r600_shader_tgsi_instruction > eg_shader_tgsi_instruction[] = > [TGSI_OPCODE_MAD] = { ALU_OP3_MULADD, tgsi_op3}, > [TGSI_OPCODE_SUB] = { ALU_OP2_ADD, tgsi_op2}, > [TGSI_OPCODE_LRP] = { ALU_OP0_NOP, tgsi_lrp}, > - [TGSI_OPCODE_FMA] = { ALU_OP0_NOP, tgsi_unsupported}, > + [TGSI_OPCODE_FMA] = { ALU_OP3_FMA, tgsi_op3}, > [TGSI_OPCODE_SQRT] = { ALU_OP1_SQRT_IEEE, > tgsi_trans_srcx_replicate}, > [TGSI_OPCODE_DP2A] = { ALU_OP0_NOP, tgsi_unsupported}, > [22] = { ALU_OP0_NOP, tgsi_unsupported}, > @@ -9338,7 +9338,7 @@ static const struct r600_shader_tgsi_instruction > cm_shader_tgsi_instruction[] = > [TGSI_OPCODE_MAD] = { ALU_OP3_MULADD, tgsi_op3}, > [TGSI_OPCODE_SUB] = { ALU_OP2_ADD, tgsi_op2}, > [TGSI_OPCODE_LRP] = { ALU_OP0_NOP, tgsi_lrp}, > - [TGSI_OPCODE_FMA] = { ALU_OP0_NOP, tgsi_unsupported}, > + [TGSI_OPCODE_FMA] = { ALU_OP3_FMA, tgsi_op3}, > [TGSI_OPCODE_SQRT] = { ALU_OP1_SQRT_IEEE, > cayman_emit_float_instr}, > [TGSI_OPCODE_DP2A] = { ALU_OP0_NOP, tgsi_unsupported}, > [22] = { ALU_OP0_NOP, tgsi_unsupported}, > -- > 2.7.4 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev