Mesa (master): st/nine: Do not advertise support for D15S1 and D24X4S4

[GitLab Mirror]

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

Author: Axel Davy <davyaxel0 at gmail.com>
Date:   Mon Feb  4 22:32:45 2019 +0100

st/nine: Do not advertise support for D15S1 and D24X4S4

The former is supported on Matrox cards but no other hw.
The latter isn't supported anywhere.

It is fine to not advertise them as supported,
and it could prevent apps to trigger weird rendering paths.

Signed-off-by: Axel Davy <davyaxel0 at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/gallium/state_trackers/nine/nine_pipe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/nine/nine_pipe.c b/src/gallium/state_trackers/nine/nine_pipe.c
index b69ddb67113..dd858aef743 100644
--- a/src/gallium/state_trackers/nine/nine_pipe.c
+++ b/src/gallium/state_trackers/nine/nine_pipe.c
@@ -286,10 +286,10 @@ const enum pipe_format nine_d3d9_to_pipe_format_map[120] =
    [D3DFMT_A2W10V10U10]   = PIPE_FORMAT_R10SG10SB10SA2U_NORM,
    [D3DFMT_D16_LOCKABLE]  = PIPE_FORMAT_Z16_UNORM,
    [D3DFMT_D32]           = PIPE_FORMAT_Z32_UNORM,
-   [D3DFMT_D15S1]         = PIPE_FORMAT_Z24_UNORM_S8_UINT,
+   [D3DFMT_D15S1]         = PIPE_FORMAT_NONE,
    [D3DFMT_D24S8]         = PIPE_FORMAT_S8_UINT_Z24_UNORM,
    [D3DFMT_D24X8]         = PIPE_FORMAT_X8Z24_UNORM,
-   [D3DFMT_D24X4S4]       = PIPE_FORMAT_Z24_UNORM_S8_UINT,
+   [D3DFMT_D24X4S4]       = PIPE_FORMAT_NONE,
    [D3DFMT_D16]           = PIPE_FORMAT_Z16_UNORM,
    [D3DFMT_D32F_LOCKABLE] = PIPE_FORMAT_Z32_FLOAT,
    [D3DFMT_D24FS8]        = PIPE_FORMAT_Z32_FLOAT_S8X24_UINT,