Mesa (master): v3d: Fix stencil sampling from packed depth/stencil.

[GitLab Mirror]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 23 13:17:32 2019 -0800

v3d: Fix stencil sampling from packed depth/stencil.

We need to pick the 8-bit unorm value out, not the depth component.

---

 src/gallium/drivers/v3d/v3dx_format_table.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/v3d/v3dx_format_table.c b/src/gallium/drivers/v3d/v3dx_format_table.c
index 6f9af3cea4..80f0dc6513 100644
--- a/src/gallium/drivers/v3d/v3dx_format_table.c
+++ b/src/gallium/drivers/v3d/v3dx_format_table.c
@@ -147,7 +147,7 @@ static const struct v3d_format format_table[] = {
 #if V3D_VERSION >= 40
         FORMAT(S8_UINT_Z24_UNORM, D24S8,        DEPTH24_X8,  SWIZ_XXXX, 32, 1),
         FORMAT(X8Z24_UNORM,       D24S8,        DEPTH24_X8,  SWIZ_XXXX, 32, 1),
-        FORMAT(S8X24_UINT,        S8,           DEPTH_COMP32F, SWIZ_XXXX, 32, 1),
+        FORMAT(S8X24_UINT,        S8,           RGBA8UI, SWIZ_XXXX, 16, 1),
         FORMAT(Z32_FLOAT,         D32F,         DEPTH_COMP32F, SWIZ_XXXX, 32, 1),
         FORMAT(Z16_UNORM,         D16,          DEPTH_COMP16,SWIZ_XXXX, 32, 1),