diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-02-10 13:35:02 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2011-02-10 13:35:02 -0500 |
| commit | c52d817b51e13447802fe338be2d247ffba2a669 (patch) | |
| tree | 4cf5f7917b4132c3f6a015b58e4c874b503bf8df /src/r600_textured_videofuncs.c | |
| parent | 5f9bc127d302404432b631e3e774192950f57b42 (diff) | |
6xx/7xx: consolidate remaining CB state
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Diffstat (limited to 'src/r600_textured_videofuncs.c')
| -rw-r--r-- | src/r600_textured_videofuncs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c index f71a61b0..f21d6f26 100644 --- a/src/r600_textured_videofuncs.c +++ b/src/r600_textured_videofuncs.c @@ -440,13 +440,12 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv) cb_conf.source_format = 1; cb_conf.blend_clamp = 1; + cb_conf.pmask = 0xf; + cb_conf.rop = 3; r600_set_render_target(pScrn, accel_state->ib, &cb_conf, accel_state->dst_obj.domain); /* Render setup */ - BEGIN_BATCH(20); - EREG(accel_state->ib, CB_TARGET_MASK, (0x0f << TARGET0_ENABLE_shift)); - EREG(accel_state->ib, CB_COLOR_CONTROL, (0xcc << ROP3_shift)); /* copy */ - + BEGIN_BATCH(14); /* Interpolator setup */ /* export tex coords from VS */ EREG(accel_state->ib, SPI_VS_OUT_CONFIG, ((1 - 1) << VS_EXPORT_COUNT_shift)); |