Mesa (master): r200: handle Z24 depth buffers correctly

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 61a40581d26d17fd9351914b267f364dbb12f8d0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=61a40581d26d17fd9351914b267f364dbb12f8d0

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Dec  6 14:03:55 2011 +0000

r200: handle Z24 depth buffers correctly

The same detiling pattern applies to X8_Z24 as well.

Signed-off-by: Dave Airlie <Airlied at redhat.com>

---

 src/mesa/drivers/dri/radeon/radeon_fbo.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c
index 4dd523f..31203cc 100644
--- a/src/mesa/drivers/dri/radeon/radeon_fbo.c
+++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c
@@ -214,7 +214,7 @@ radeon_map_renderbuffer(struct gl_context *ctx,
    }
 
 #if defined(RADEON_R200)
-   if (rb->Format == MESA_FORMAT_S8_Z24 && !rrb->has_surface) {
+   if ((rb->Format == MESA_FORMAT_S8_Z24 || rb->Format == MESA_FORMAT_X8_Z24) && !rrb->has_surface) {
      radeon_map_renderbuffer_s8z24(ctx, rb, x, y, w, h,
 				   mode, out_map, out_stride);
      return;
@@ -286,7 +286,7 @@ radeon_unmap_renderbuffer(struct gl_context *ctx,
    GLboolean ok;
 
 #ifdef RADEON_R200
-   if (rb->Format == MESA_FORMAT_S8_Z24 && !rrb->has_surface) {
+   if ((rb->Format == MESA_FORMAT_S8_Z24 || rb->Format == MESA_FORMAT_X8_Z24) && !rrb->has_surface) {
        radeon_unmap_renderbuffer_s8z24(ctx, rb);
        return;
    }