summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajackson@redhat.com>2007-11-22 20:26:23 +1000
committerDave Airlie <airlied@linux.ie>2007-11-22 20:26:23 +1000
commit197a62704742a4a19736c2637ac92d1dc5ab34ed (patch)
treeb1fdee86cf12c78a87159531d807313476bf44e9
parent64010fc4eae8359c01e430f64252931242c91435 (diff)
radeon: fix openoffice/render bug on r100 chips
-rw-r--r--src/radeon_render.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_render.c b/src/radeon_render.c
index 5074fe1f..490dec11 100644
--- a/src/radeon_render.c
+++ b/src/radeon_render.c
@@ -392,7 +392,7 @@ static Bool FUNC_NAME(R100SetupTexture)(
#endif
ACCEL_PREAMBLE();
- if ((width > 2048) || (height > 2048))
+ if ((width > 2047) || (height > 2047))
return FALSE;
txformat = RadeonGetTextureFormat(format);
@@ -424,7 +424,7 @@ static Bool FUNC_NAME(R100SetupTexture)(
txformat |= ATILog2(width) << RADEON_TXFORMAT_WIDTH_SHIFT;
txformat |= ATILog2(height) << RADEON_TXFORMAT_HEIGHT_SHIFT;
} else {
- tex_size = ((height - 1) << 16) | (width - 1);
+ tex_size = (height << 16) | width;
txformat |= RADEON_TXFORMAT_NON_POWER2;
}