diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-04-20 18:04:18 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-04-20 18:04:18 -0400 |
| commit | b6febf7368d3df3f1d3fee6a87aa71c54e77cdcc (patch) | |
| tree | f8648ad03df1ff87b98dfe0f7654be6c19ac8b6b /src/r600_textured_videofuncs.c | |
| parent | d096d1189c8dc5e19f68cc605ccffe1a8fef048b (diff) | |
Tex vid: cleanup and unify common code
Diffstat (limited to 'src/r600_textured_videofuncs.c')
| -rw-r--r-- | src/r600_textured_videofuncs.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c index 600262b3..27bdf4d5 100644 --- a/src/r600_textured_videofuncs.c +++ b/src/r600_textured_videofuncs.c @@ -123,7 +123,6 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv) tex_resource_t tex_res; tex_sampler_t tex_samp; shader_config_t vs_conf, ps_conf; - int uv_offset; /* * y' = y - .0625 * u' = u - .5 @@ -342,12 +341,9 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv) set_tex_sampler (pScrn, accel_state->ib, &tex_samp); /* U or V texture */ - uv_offset = accel_state->src_pitch[0] * pPriv->h; - uv_offset = (uv_offset + 255) & ~255; - cp_set_surface_sync(pScrn, accel_state->ib, TC_ACTION_ENA_bit, accel_state->src_size[0] / 4, - accel_state->src_mc_addr[0] + uv_offset); + accel_state->src_mc_addr[0] + pPriv->planev_offset); tex_res.id = 1; tex_res.format = FMT_8; @@ -360,8 +356,8 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv) tex_res.dst_sel_w = SQ_SEL_1; tex_res.interlaced = 0; - tex_res.base = accel_state->src_mc_addr[0] + uv_offset; - tex_res.mip_base = accel_state->src_mc_addr[0] + uv_offset; + tex_res.base = accel_state->src_mc_addr[0] + pPriv->planev_offset; + tex_res.mip_base = accel_state->src_mc_addr[0] + pPriv->planev_offset; set_tex_resource (pScrn, accel_state->ib, &tex_res); /* U or V sampler */ @@ -369,12 +365,9 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv) set_tex_sampler (pScrn, accel_state->ib, &tex_samp); /* U or V texture */ - uv_offset += ((accel_state->src_pitch[0] >> 1) * (pPriv->h >> 1)); - uv_offset = (uv_offset + 255) & ~255; - cp_set_surface_sync(pScrn, accel_state->ib, TC_ACTION_ENA_bit, accel_state->src_size[0] / 4, - accel_state->src_mc_addr[0] + uv_offset); + accel_state->src_mc_addr[0] + pPriv->planeu_offset); tex_res.id = 2; tex_res.format = FMT_8; @@ -387,8 +380,8 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv) tex_res.dst_sel_w = SQ_SEL_1; tex_res.interlaced = 0; - tex_res.base = accel_state->src_mc_addr[0] + uv_offset; - tex_res.mip_base = accel_state->src_mc_addr[0] + uv_offset; + tex_res.base = accel_state->src_mc_addr[0] + pPriv->planeu_offset; + tex_res.mip_base = accel_state->src_mc_addr[0] + pPriv->planeu_offset; set_tex_resource (pScrn, accel_state->ib, &tex_res); /* UV sampler */ |