summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorbin Simpson <MostAwesomeDude@gmail.com>2009-11-20 14:10:45 -0800
committerCorbin Simpson <MostAwesomeDude@gmail.com>2009-11-20 14:10:45 -0800
commit6a3eb1f91b4ccd4ee7ac6b91505e0dfa476922d4 (patch)
treee408c3b4720a6005bfc82acc8050352e1a0248f3
parent37ba97421c5cf351e2e3c7c1e41ffd72fb73f7e9 (diff)
r300g: Use MAX3 and MIN3.
-rw-r--r--src/gallium/drivers/r300/r300_emit.c3
-rw-r--r--src/gallium/drivers/r300/r300_state_derived.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index 2a8d32242b..4cd5074379 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -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)
{
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index 7166694edf..b4d0eeaf8c 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -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. */