diff options
| author | daenzer <daenzer> | 2004-06-22 00:48:38 +0000 |
|---|---|---|
| committer | daenzer <daenzer> | 2004-06-22 00:48:38 +0000 |
| commit | db4d586bfd98797b24e99b9837eb2a27bf2fe2d1 (patch) | |
| tree | 3779af73c27317610a86fc9e0a8f5197cc3c0ce7 | |
| parent | 60628c118f335c0ca7ff2dc57881a395c57f4108 (diff) | |
The depth buffer pitch must be a multiple of 32 pixels. Thanks to Steffen
Hein for pointing out the problem.
Bug report: http://freedesktop.org/bugzilla/show_bug.cgi?id=788
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c index bfc50c43b..8a8aae7f2 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c @@ -4474,15 +4474,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) int bufferSize = ((pScrn->virtualY * width_bytes + RADEON_BUFFER_ALIGN) & ~RADEON_BUFFER_ALIGN); - int depthSize = ((((pScrn->virtualY+15) & ~15) * width_bytes - + RADEON_BUFFER_ALIGN) - & ~RADEON_BUFFER_ALIGN); + int depthSize; int l; int scanlines; info->frontOffset = 0; info->frontPitch = pScrn->displayWidth; + /* Due to tiling, the Z buffer pitch must be a multiple of 32 pixels, + * and its height a multiple of 16 lines. + */ + info->depthPitch = (pScrn->displayWidth + 31) & ~31; + depthSize = ((((pScrn->virtualY+15) & ~15) * info->depthPitch + * info->CurrentLayout.pixel_bytes + RADEON_BUFFER_ALIGN) + & ~RADEON_BUFFER_ALIGN); + switch (info->CPMode) { case RADEON_DEFAULT_CP_PIO_MODE: xf86DrvMsg(pScrn->scrnIndex, X_INFO, "CP in PIO mode\n"); @@ -4573,7 +4579,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) info->depthOffset = ((info->textureOffset - depthSize + RADEON_BUFFER_ALIGN) & ~(CARD32)RADEON_BUFFER_ALIGN); - info->depthPitch = pScrn->displayWidth; /* Reserve space for the shared back buffer */ if (info->noBackBuffer) { |