diff options
| author | Corbin Simpson <[email protected]> | 2009-01-28 21:33:35 -0800 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2009-02-01 23:30:31 -0800 |
| commit | c199f330322921e01c8c30e3ea69a2a5291ae8ee (patch) | |
| tree | 739f22befb3777fbb232690292f623ca39f5604d /src/gallium/drivers/r300/r300_emit.c | |
| parent | f0fce46a48a1f0547a1e50ad54696c4b660c8dce (diff) | |
r300: Unbreak emit, fix up a bunch of little things.
Diffstat (limited to 'src/gallium/drivers/r300/r300_emit.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_emit.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c index 4ae8a46637a..c5f08a2404e 100644 --- a/src/gallium/drivers/r300/r300_emit.c +++ b/src/gallium/drivers/r300/r300_emit.c @@ -62,9 +62,12 @@ void r300_emit_dsa_state(struct r300_context* r300, struct r300_screen* r300screen = (struct r300_screen*)r300->context.screen; CS_LOCALS(r300); - BEGIN_CS(r300screen->caps->is_r500 ? 12 : 10); + BEGIN_CS(r300screen->caps->is_r500 ? 12 : 8); OUT_CS_REG(R300_FG_ALPHA_FUNC, dsa->alpha_function); - OUT_CS_REG(R500_FG_ALPHA_VALUE, dsa->alpha_reference); + /* XXX figure out the r300 counterpart for this */ + if (r300screen->caps->is_r500) { + OUT_CS_REG(R500_FG_ALPHA_VALUE, dsa->alpha_reference); + } OUT_CS_REG_SEQ(R300_ZB_CNTL, 3); OUT_CS(dsa->z_buffer_control); OUT_CS(dsa->z_stencil_control); |