fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-05 09:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600: lds load cleanups.

Browse source 
This is just some cleanups on top of the last patch from my compute branch.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2017-11-29 13:13:17 +10:00
parent 76837e29e3
commit f8a54c489d
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/drivers/r600/r600_shader.c
View file

@ -1747,12 +1747,13 @@ static int do_lds_fetch_values(struct r600_shader_ctx *ctx, unsigned temp_reg,
unsigned dst_reg, unsigned mask)
{
struct r600_bytecode_alu alu;
int r, i;
int r, i, lasti;
if ((ctx->bc->cf_last->ndw>>1) >= 0x60)
ctx->bc->force_add_cf = 1;
for (i = 1; i < 4; i++) {
lasti = tgsi_last_instruction(mask);
for (i = 1; i <= lasti; i++) {
if (!(mask & (1 << i)))
continue;
@ -1763,8 +1764,8 @@ static int do_lds_fetch_values(struct r600_shader_ctx *ctx, unsigned temp_reg,
if (r)
return r;
}
for (i = 0; i < 4; i++) {
if (! (mask & (1 << i)))
for (i = 0; i <= lasti; i++) {
if (!(mask & (1 << i)))
continue;
/* emit an LDS_READ_RET */
@ -1781,9 +1782,10 @@ static int do_lds_fetch_values(struct r600_shader_ctx *ctx, unsigned temp_reg,
if (r)
return r;
}
for (i = 0; i < 4; i++) {
if (! (mask & (1 << i)))
for (i = 0; i <= lasti; i++) {
if (!(mask & (1 << i)))
continue;
/* then read from LDS_OQ_A_POP */
memset(&alu, 0, sizeof(alu));