AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r300g: cleanup XXXs in the DSA state

Browse Source
This commit is contained in:
Marek Olšák
2010-02-06 00:43:23 +01:00
committed by Corbin Simpson
parent 2f5fcce933
commit 5201e94801
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r300/r300_emit.c
-7
View File
@@ -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);
}
src/gallium/drivers/r300/r300_state.c
+1 -3
View File
@@ -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)