From 914a5f0117ccb76292bdd81ea4a2a79d33319550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Mon, 23 Oct 2006 10:13:24 +0200 Subject: radeon: Pitch doesn't matter when height == 1. --- src/radeon_exa_render.c | 6 ++++-- src/radeon_render.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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)(PicturePtr pPict, PixmapPtr pPix, 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)(PicturePtr pPict, PixmapPtr pPix, 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; -- cgit v1.2.3