Module: Mesa Branch: master Commit: 5201e948010a63a8df1c67f7d212ab7ff59dbdf1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5201e948010a63a8df1c67f7d212ab7ff59dbdf1
Author: Marek Olšák <[email protected]> Date: Sat Feb 6 00:43:23 2010 +0100 r300g: cleanup XXXs in the DSA state --- src/gallium/drivers/r300/r300_emit.c | 7 ------- src/gallium/drivers/r300/r300_state.c | 4 +--- 2 files changed, 1 insertions(+), 10 deletions(-) diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c index 575cc9f..ae83511 100644 --- a/src/gallium/drivers/r300/r300_emit.c +++ b/src/gallium/drivers/r300/r300_emit.c @@ -118,12 +118,6 @@ void r300_emit_dsa_state(struct r300_context* r300, void* state) BEGIN_CS(r300screen->caps->is_r500 ? 8 : 6); OUT_CS_REG(R300_FG_ALPHA_FUNC, dsa->alpha_function); - - /* not needed since we use the 8bit alpha ref */ - /*if (r300screen->caps->is_r500) { - OUT_CS_REG(R500_FG_ALPHA_VALUE, dsa->alpha_reference); - }*/ - OUT_CS_REG_SEQ(R300_ZB_CNTL, 3); if (fb->zsbuf) { @@ -136,7 +130,6 @@ void r300_emit_dsa_state(struct r300_context* r300, void* state) OUT_CS(dsa->stencil_ref_mask); - /* XXX it seems r3xx doesn't support STENCILREFMASK_BF */ if (r300screen->caps->is_r500) { OUT_CS_REG(R500_ZB_STENCILREFMASK_BF, dsa->stencil_ref_bf); } diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 76e1385..129eae1 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -441,7 +441,6 @@ static void* (r300_translate_stencil_op(state->stencil[1].zfail_op) << R300_S_BACK_ZFAIL_OP_SHIFT); - /* XXX it seems r3xx doesn't support STENCILREFMASK_BF */ if (caps->is_r500) { dsa->z_buffer_control |= R500_STENCIL_REFMASK_FRONT_BACK; @@ -460,8 +459,7 @@ static void* r300_translate_alpha_function(state->alpha.func) | R300_FG_ALPHA_FUNC_ENABLE; - /* XXX figure out why emitting 10bit alpha ref causes CS to dump */ - /* always use 8bit alpha ref */ + /* We could use 10bit alpha ref but who needs that? */ dsa->alpha_function |= float_to_ubyte(state->alpha.ref_value); if (caps->is_r500) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
