diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2011-02-10 13:47:53 -0500 |
---|---|---|
committer | Alex Deucher <alexdeucher@gmail.com> | 2011-02-10 13:47:53 -0500 |
commit | 2c5ae1724307e0dba5d0306fe27c1e15a7390a2f (patch) | |
tree | d6b7641a08c909ecc03ff342cf06208317332f64 /src/evergreen_textured_videofuncs.c | |
parent | c52d817b51e13447802fe338be2d247ffba2a669 (diff) |
evergreen/ni: consolidate CB state handling
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Diffstat (limited to 'src/evergreen_textured_videofuncs.c')
-rw-r--r-- | src/evergreen_textured_videofuncs.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/evergreen_textured_videofuncs.c b/src/evergreen_textured_videofuncs.c index d60d1949..434bd2e1 100644 --- a/src/evergreen_textured_videofuncs.c +++ b/src/evergreen_textured_videofuncs.c @@ -423,15 +423,12 @@ EVERGREENDisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv) cb_conf.source_format = EXPORT_4C_16BPC; cb_conf.blend_clamp = 1; + cb_conf.pmask = 0xf; + cb_conf.rop = 3; evergreen_set_render_target(pScrn, &cb_conf, accel_state->dst_obj.domain); /* Render setup */ - BEGIN_BATCH(23); - EREG(CB_TARGET_MASK, (0x0f << TARGET0_ENABLE_shift)); - EREG(CB_COLOR_CONTROL, ((0xcc << ROP3_shift) | - (CB_NORMAL << CB_COLOR_CONTROL__MODE_shift))); - EREG(CB_BLEND0_CONTROL, 0); - + BEGIN_BATCH(14); /* Interpolator setup */ /* export tex coords from VS */ EREG(SPI_VS_OUT_CONFIG, ((1 - 1) << VS_EXPORT_COUNT_shift)); |