Mesa (master): st/nine: Enable DF24 support

[GitLab Mirror]

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

Author: Axel Davy <davyaxel0 at gmail.com>
Date:   Sat Jan 26 21:24:05 2019 +0100

st/nine: Enable DF24 support

We can enable it, now that FETCH4 is
implemented.

Signed-off-by: Axel Davy <davyaxel0 at gmail.com>
Acked-by: Timur Kristóf <timur.kristof at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9177>

---

 src/gallium/frontends/nine/nine_pipe.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/frontends/nine/nine_pipe.h b/src/gallium/frontends/nine/nine_pipe.h
index f0d8b454237..75c9ea402e1 100644
--- a/src/gallium/frontends/nine/nine_pipe.h
+++ b/src/gallium/frontends/nine/nine_pipe.h
@@ -278,6 +278,7 @@ d3d9_to_pipe_format_internal(D3DFORMAT format)
     switch (format) {
     case D3DFMT_INTZ: return PIPE_FORMAT_S8_UINT_Z24_UNORM;
     case D3DFMT_DF16: return PIPE_FORMAT_Z16_UNORM;
+    case D3DFMT_DF24: return PIPE_FORMAT_X8Z24_UNORM;
     case D3DFMT_DXT1: return PIPE_FORMAT_DXT1_RGBA;
     case D3DFMT_DXT2: return PIPE_FORMAT_DXT3_RGBA; /* XXX */
     case D3DFMT_DXT3: return PIPE_FORMAT_DXT3_RGBA;
@@ -295,9 +296,6 @@ d3d9_to_pipe_format_internal(D3DFORMAT format)
     case D3DFMT_Y210: /* XXX */
     case D3DFMT_Y216:
     case D3DFMT_NV11:
-    case D3DFMT_DF24: /* Similar to D3DFMT_DF16 but for 24-bits.
-        We don't advertise it because when it is supported, Fetch-4 is
-        supposed to be supported, which we don't support yet. */
     case D3DFMT_NULL: /* special cased, only for surfaces */
         return PIPE_FORMAT_NONE;
     default:
@@ -353,6 +351,7 @@ d3d9_to_pipe_format_checked(struct pipe_screen *screen,
             if (format_check_internal(PIPE_FORMAT_Z24_UNORM_S8_UINT))
                 return PIPE_FORMAT_Z24_UNORM_S8_UINT;
             break;
+        case D3DFMT_DF24:
         case D3DFMT_D24X8:
             if (format_check_internal(PIPE_FORMAT_Z24X8_UNORM))
                 return PIPE_FORMAT_Z24X8_UNORM;