Merge branch 'origin'

This commit is contained in:
Keith Packard 2007-04-19 20:38:18 -07:00
commit b23eae55c8
1 changed files with 9 additions and 2 deletions

View File

@ -515,9 +515,16 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
OUT_RING(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(8) | 0);
OUT_RING(S8_ENABLE_COLOR_BLEND | S8_BLENDFUNC_ADD | blendctl |
S8_ENABLE_COLOR_BUFFER_WRITE);
OUT_RING(_3DSTATE_ENABLES_1_CMD | DISABLE_LOGIC_OP |
DISABLE_STENCIL_TEST | DISABLE_DEPTH_BIAS |
DISABLE_SPEC_ADD | DISABLE_FOG | DISABLE_ALPHA_TEST |
ENABLE_COLOR_BLEND | DISABLE_DEPTH_TEST);
/* We have to explicitly say we don't want write disabled */
OUT_RING(_3DSTATE_ENABLES_2_CMD | ENABLE_COLOR_MASK);
OUT_RING(MI_NOOP);
OUT_RING(_3DSTATE_ENABLES_2_CMD | ENABLE_COLOR_MASK |
DISABLE_STENCIL_WRITE | ENABLE_TEX_CACHE |
DISABLE_DITHER | ENABLE_COLOR_WRITE |
DISABLE_DEPTH_WRITE);
ADVANCE_LP_RING();
}