From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Apr 2010 17:10:19 +0000 (-0600)
Subject: Merge branch '7.8'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b4a191e351ff1ac1cd27cd7e02d169958a78ca86;p=mesa.git

Merge branch '7.8'

Conflicts:

	src/mesa/state_tracker/st_format.c
---

b4a191e351ff1ac1cd27cd7e02d169958a78ca86
diff --cc src/mesa/state_tracker/st_format.c
index 8a366d834e7,91e386c848a..d7f5b1ea247
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@@ -157,9 -151,13 +157,13 @@@ st_mesa_format_to_pipe_format(gl_forma
     case MESA_FORMAT_Z32:
        return PIPE_FORMAT_Z32_UNORM;
     case MESA_FORMAT_Z24_S8:
 -      return PIPE_FORMAT_S8Z24_UNORM;
 +      return PIPE_FORMAT_S8_USCALED_Z24_UNORM;
     case MESA_FORMAT_S8_Z24:
 -      return PIPE_FORMAT_Z24S8_UNORM;
 +      return PIPE_FORMAT_Z24_UNORM_S8_USCALED;
+    case MESA_FORMAT_Z24_X8:
+       return PIPE_FORMAT_X8Z24_UNORM;
+    case MESA_FORMAT_X8_Z24:
+       return PIPE_FORMAT_Z24X8_UNORM;
     case MESA_FORMAT_YCBCR:
        return PIPE_FORMAT_UYVY;
  #if FEATURE_texture_s3tc