fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 23:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

r600g: make condition clearer

Browse source 
The second check in the old code looked pretty much unreachable, esp.
because it's not obvious that "max_entries" could be zero. To find out
that it was intentional I had to run some checks, and to dig into
the old versions of the file.

So, rewrite the check to make the intention clear.

v2: s/r600/r600g in the title, and per Dieter Nützel's comment wrap
lines of condition.

Signed-off-by: Constantine Kharlamov <Hi-Angel@yandex.ru>
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
This commit is contained in:
Constantine Kharlamov 2017-03-20 15:19:42 +03:00 • committed by Marek Olšák
parent 36e029d356
commit 64cbbd2888
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_asm.c
View file

@ -315,7 +315,7 @@ static int is_alu_any_unit_inst(struct r600_bytecode *bc, struct r600_bytecode_a
static int is_nop_inst(struct r600_bytecode *bc, struct r600_bytecode_alu *alu)
{
return alu->op == ALU_OP0_NOP;
}
}
static int assign_alu_units(struct r600_bytecode *bc, struct r600_bytecode_alu *alu_first,
struct r600_bytecode_alu *assignment[5])
@ -1688,11 +1688,13 @@ int r600_bytecode_build(struct r600_bytecode *bc)
unsigned addr;
int i, r;
if (!bc->nstack) // If not 0, Stack_size already provided by llvm
bc->nstack = bc->stack.max_entries;
if ((bc->type == PIPE_SHADER_VERTEX || bc->type == PIPE_SHADER_TESS_EVAL || bc->type == PIPE_SHADER_TESS_CTRL) && !bc->nstack) {
bc->nstack = 1;
if (!bc->nstack) { // If not 0, Stack_size already provided by llvm
if (bc->stack.max_entries)
bc->nstack = bc->stack.max_entries;
else if (bc->type == PIPE_SHADER_VERTEX ||
bc->type == PIPE_SHADER_TESS_EVAL ||
bc->type == PIPE_SHADER_TESS_CTRL)
bc->nstack = 1;
}
/* first path compute addr of each CF block */