nv50,nvc0: use alternate samplers for stencil

The blob uses these, and it fixes a bunch of dEQP stencil sampling tests
involving border colors. Probably the Z-based samplers work somehow
differently wrt border colors when using the stencil swizzle.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_formats.c b/src/gallium/drivers/nouveau/nv50/nv50_formats.c
index a95641f2ad30fe35d643929ff117dfe48591f506..706c34f0dbb8998e0bdfc049ad3cf3f9acd39d8f 100644 (file)
--- a/src/gallium/drivers/nouveau/nv50/nv50_formats.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_formats.c
@@ -141,9 +141,9 @@ const struct nv50_format nv50_format_table[PIPE_FORMAT_COUNT] =
    ZS(A, Z32_FLOAT_S8X24_UINT, Z32_S8_X24_FLOAT, R, R, R, xx, FLOAT, ZF32_X24S8, TZ),
 
    SX(A, S8_UINT, R, R8, T),
-   SX(A, X24S8_UINT, G, S8Z24, T),
-   SX(A, S8X24_UINT, R, Z24S8, T),
-   SX(A, X32_S8X24_UINT, G, ZF32_X24S8, T),
+   SX(A, X24S8_UINT, G, G8R24, T),
+   SX(A, S8X24_UINT, R, G24R8, T),
+   SX(A, X32_S8X24_UINT, G, R32_B24G8, T),
 
    F3(A, B5G6R5_UNORM, B5G6R5_UNORM, B, G, R, xx, UNORM, B5G6R5, TD),
    C4(A, B5G5R5A1_UNORM, BGR5_A1_UNORM, B, G, R, A, UNORM, A1B5G5R5, TD),