summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300/r300_emit.c
diff options
context:
space:
mode:
authorCorbin Simpson <MostAwesomeDude@gmail.com>2009-02-12 20:47:15 -0800
committerCorbin Simpson <MostAwesomeDude@gmail.com>2009-02-12 20:47:15 -0800
commitfe7863f3f82cda290334cecfde816e21a0e9f5d3 (patch)
tree7bda946b35abe76f3b1045169f1d042c918cc821 /src/gallium/drivers/r300/r300_emit.c
parent1d2c31df41d2a52b306fd65bbb6c800e993a2798 (diff)
r300-gallium: Fix linker error a few linker warnings.
A few prototypes, a missing header, a misspelled macro.
Diffstat (limited to 'src/gallium/drivers/r300/r300_emit.c')
-rw-r--r--src/gallium/drivers/r300/r300_emit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index a3b2772e15..c0990cabd9 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -86,7 +86,7 @@ void r300_emit_fragment_shader(struct r300_context* r300,
int i;
BEGIN_CS(0);
- OUT_CS_REG(R300_US_CONFIG, MAX(fs->indirections - 1, 0));
+ OUT_CS_REG(R300_US_CONFIG, MAX2(fs->indirections - 1, 0));
OUT_CS_REG(R300_US_PIXSIZE, fs->shader.stack_size);
/* XXX figure out exactly how big the sizes are on this reg */
OUT_CS_REG(R300_US_CODE_OFFSET, 0x0);