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

r300g: Use MAX3 and MIN3.

Browse source
This commit is contained in:
Corbin Simpson 2009-11-20 14:10:45 -08:00
parent 37ba97421c
commit 6a3eb1f91b
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/r300/r300_emit.c
View file

@ -701,9 +701,6 @@ static unsigned bitcount(unsigned n)
return bits;
}
/* XXX ... and this one too. */
#define MIN3(x, y, z) MIN2(MIN2(x, y), z)
void r300_emit_vertex_program_code(struct r300_context* r300,
struct r300_vertex_program_code* code)
{

2
src/gallium/drivers/r300/r300_state_derived.c
View file

@ -458,7 +458,7 @@ static void r300_update_rs_block(struct r300_context* r300,
rs->count = (rs_tex_comp) | (col_count << R300_IC_COUNT_SHIFT) |
R300_HIRES_EN;
rs->inst_count = MAX2(MAX2(col_count - 1, tex_count - 1), 0);
rs->inst_count = MAX3(col_count - 1, tex_count - 1, 0);
}
/* Update the vertex format. */