From: Kenneth Graunke <kenneth@whitecape.org>
Date: Sun, 22 Jul 2018 03:12:15 +0000 (-0700)
Subject: iris: fix Z24
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a4036635b188baa53d57d965e70217bdc7adc784;p=mesa.git

iris: fix Z24

This was backwards.

thanks to Jason Ekstrand for realizing that I was seeing the wrong bits.
---

diff --git a/src/gallium/drivers/iris/iris_formats.c b/src/gallium/drivers/iris/iris_formats.c
index d42befb4fe2..1bfc367232f 100644
--- a/src/gallium/drivers/iris/iris_formats.c
+++ b/src/gallium/drivers/iris/iris_formats.c
@@ -55,8 +55,8 @@ iris_isl_format_for_pipe_format(enum pipe_format pf)
       /* XXX: separate stencil */
       [PIPE_FORMAT_Z24_UNORM_S8_UINT]       = ISL_FORMAT_R24_UNORM_X8_TYPELESS,
       //[PIPE_FORMAT_S8_UINT_Z24_UNORM]       = ISL_FORMAT_S8_UINT_Z24_UNORM,
-      //[PIPE_FORMAT_Z24X8_UNORM]             = ISL_FORMAT_R24_UNORM_X8_TYPELESS,
-      [PIPE_FORMAT_X8Z24_UNORM]             = ISL_FORMAT_R24_UNORM_X8_TYPELESS,
+      [PIPE_FORMAT_Z24X8_UNORM]             = ISL_FORMAT_R24_UNORM_X8_TYPELESS,
+      //[PIPE_FORMAT_X8Z24_UNORM]             = ISL_FORMAT_R24_UNORM_X8_TYPELESS,
       [PIPE_FORMAT_S8_UINT]                 = ISL_FORMAT_R8_UINT,
       [PIPE_FORMAT_R64_FLOAT]               = ISL_FORMAT_R64_FLOAT,
       [PIPE_FORMAT_R64G64_FLOAT]            = ISL_FORMAT_R64G64_FLOAT,
diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index a4e37b526a6..e45e5026671 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -235,7 +235,7 @@ iris_resource_create_with_modifiers(struct pipe_screen *pscreen,
 
    if (util_format_is_depth_and_stencil(pfmt)) {
       // XXX: Z32S8
-      pfmt = PIPE_FORMAT_X8Z24_UNORM;
+      pfmt = PIPE_FORMAT_Z24X8_UNORM;
    }
 
    enum isl_format isl_format = iris_isl_format_for_pipe_format(pfmt);