From: Marek Olšák <maraeo@gmail.com>
Date: Sun, 13 Dec 2009 01:19:18 +0000 (+0100)
Subject: r300g: add Z24X8 to the list of unsupported sampler formats on R3xx-R4xx
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c5e0b0bc37315cd29a84e71854dca951149b8bc8;p=mesa.git

r300g: add Z24X8 to the list of unsupported sampler formats on R3xx-R4xx
---

diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index c0d9797020d..feb571a23dd 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -220,12 +220,18 @@ static boolean check_tex_format(enum pipe_format format, uint32_t usage,
 
         /* Z buffer or texture */
         case PIPE_FORMAT_Z16_UNORM:
+            retval = usage &
+                (PIPE_TEXTURE_USAGE_DEPTH_STENCIL |
+                 PIPE_TEXTURE_USAGE_SAMPLER);
+            break;
+
+        /* 24bit Z buffer can only be used as a texture on R500. */
         case PIPE_FORMAT_Z24X8_UNORM:
         /* Z buffer with stencil or texture */
         case PIPE_FORMAT_Z24S8_UNORM:
             retval = usage &
                 (PIPE_TEXTURE_USAGE_DEPTH_STENCIL |
-                 PIPE_TEXTURE_USAGE_SAMPLER);
+                 (is_r500 ? PIPE_TEXTURE_USAGE_SAMPLER : 0));
             break;
 
         /* Definitely unsupported formats. */