xf86-video-ati: Branch 'master'
Michel Daenzer
daenzer at kemper.freedesktop.org
Mon Oct 23 11:14:12 EEST 2006
src/radeon_exa_render.c | 6 ++++--
src/radeon_render.c | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
diff-tree 914a5f0117ccb76292bdd81ea4a2a79d33319550 (from 2bcb51d66edaa944379cf8c8ca1ba91fffdc20a8)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Mon Oct 23 10:13:24 2006 +0200
radeon: Pitch doesn't matter when height == 1.
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index d0a7216..9251569 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -246,7 +246,8 @@ static Bool FUNC_NAME(R100TextureSetup)(
txoffset |= RADEON_TXO_MACRO_TILE;
if (pPict->repeat) {
- if (((w * pPix->drawable.bitsPerPixel / 8 + 31) & ~31) != txpitch)
+ if ((h != 1) &&
+ (((w * pPix->drawable.bitsPerPixel / 8 + 31) & ~31) != txpitch))
RADEON_FALLBACK(("Width %d and pitch %u not compatible for repeat\n",
w, (unsigned)txpitch));
@@ -506,7 +507,8 @@ static Bool FUNC_NAME(R200TextureSetup)(
txoffset |= R200_TXO_MACRO_TILE;
if (pPict->repeat) {
- if (((w * pPix->drawable.bitsPerPixel / 8 + 31) & ~31) != txpitch)
+ if ((h != 1) &&
+ (((w * pPix->drawable.bitsPerPixel / 8 + 31) & ~31) != txpitch))
RADEON_FALLBACK(("Width %d and pitch %u not compatible for repeat\n",
w, (unsigned)txpitch));
diff --git a/src/radeon_render.c b/src/radeon_render.c
index 054e60f..5074fe1 100644
--- a/src/radeon_render.c
+++ b/src/radeon_render.c
@@ -401,7 +401,7 @@ static Bool FUNC_NAME(R100SetupTexture)(
dst_pitch = (width * tex_bytepp + 63) & ~63;
size = dst_pitch * height;
- if ((flags & XAA_RENDER_REPEAT) &&
+ if ((flags & XAA_RENDER_REPEAT) && (height != 1) &&
(((width * tex_bytepp + 31) & ~31) != dst_pitch))
return FALSE;
@@ -738,7 +738,7 @@ static Bool FUNC_NAME(R200SetupTexture)(
dst_pitch = (width * tex_bytepp + 63) & ~63;
size = dst_pitch * height;
- if ((flags & XAA_RENDER_REPEAT) &&
+ if ((flags & XAA_RENDER_REPEAT) && (height != 1) &&
(((width * tex_bytepp + 31) & ~31) != dst_pitch))
return FALSE;
More information about the xorg-commit
mailing list