xf86-video-ati: Branch 'master' - 2 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Thu Jan 20 14:12:14 PST 2011
src/evergreen_textured_videofuncs.c | 4 ++--
src/r600_textured_videofuncs.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 0a03f03a65aad925ba2d9c76b1d3356184607bf9
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Jan 20 17:07:32 2011 -0500
evergreen/ni: fix Xv artifacts
Port of the 6xx/7xx fix to evergreen. Bad texture size
for texture cache flush.
diff --git a/src/evergreen_textured_videofuncs.c b/src/evergreen_textured_videofuncs.c
index 428876f..aa3c527 100644
--- a/src/evergreen_textured_videofuncs.c
+++ b/src/evergreen_textured_videofuncs.c
@@ -295,7 +295,7 @@ EVERGREENDisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
tex_res.base = accel_state->src_obj[0].offset + pPriv->planev_offset;
tex_res.mip_base = accel_state->src_obj[0].offset + pPriv->planev_offset;
- tex_res.size = accel_state->src_size[0] / 4;
+ tex_res.size = tex_res.pitch * (pPriv->h >> 1);
evergreen_set_tex_resource(pScrn, &tex_res, accel_state->src_obj[0].domain);
/* U or V sampler */
@@ -316,7 +316,7 @@ EVERGREENDisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
tex_res.base = accel_state->src_obj[0].offset + pPriv->planeu_offset;
tex_res.mip_base = accel_state->src_obj[0].offset + pPriv->planeu_offset;
- tex_res.size = accel_state->src_size[0] / 4;
+ tex_res.size = tex_res.pitch * (pPriv->h >> 1);
evergreen_set_tex_resource(pScrn, &tex_res, accel_state->src_obj[0].domain);
/* UV sampler */
commit f41cf83750ba9a2e0797fdb21ea9104b85ce53aa
Author: Marton Balint <cus at fazekas.hu>
Date: Thu Jan 20 17:04:56 2011 -0500
r6xx/7xx: fix Xv artifacts
bad textures size for cache flushes.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=22007
diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
index 88073ac..f71a61b 100644
--- a/src/r600_textured_videofuncs.c
+++ b/src/r600_textured_videofuncs.c
@@ -310,7 +310,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
tex_res.base = accel_state->src_obj[0].offset + pPriv->planev_offset;
tex_res.mip_base = accel_state->src_obj[0].offset + pPriv->planev_offset;
- tex_res.size = accel_state->src_size[0] / 4;
+ tex_res.size = tex_res.pitch * (pPriv->h >> 1);
r600_set_tex_resource(pScrn, accel_state->ib, &tex_res, accel_state->src_obj[0].domain);
/* U or V sampler */
@@ -331,7 +331,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
tex_res.base = accel_state->src_obj[0].offset + pPriv->planeu_offset;
tex_res.mip_base = accel_state->src_obj[0].offset + pPriv->planeu_offset;
- tex_res.size = accel_state->src_size[0] / 4;
+ tex_res.size = tex_res.pitch * (pPriv->h >> 1);
r600_set_tex_resource(pScrn, accel_state->ib, &tex_res, accel_state->src_obj[0].domain);
/* UV sampler */
More information about the xorg-commit
mailing list