From 9aa670e52ae5698359f2b1271c047d5ebd6f4c02 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 14 Jun 2018 11:32:37 -0700 Subject: [PATCH] v3d: Use the proper depth texture type for sampling. Fixes failing tests in dEQP-GLES3.functional.texture.shadow --- src/gallium/drivers/v3d/v3dx_format_table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/v3d/v3dx_format_table.c b/src/gallium/drivers/v3d/v3dx_format_table.c index 39286bd6547..c0caba740d2 100644 --- a/src/gallium/drivers/v3d/v3dx_format_table.c +++ b/src/gallium/drivers/v3d/v3dx_format_table.c @@ -145,12 +145,12 @@ 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, R32F, SWIZ_XXXX, 32, 1), - FORMAT(Z32_FLOAT, D32F, R32F, SWIZ_XXXX, 32, 1), + FORMAT(S8X24_UINT, S8, DEPTH_COMP32F, SWIZ_XXXX, 32, 1), + FORMAT(Z32_FLOAT, D32F, DEPTH_COMP32F, SWIZ_XXXX, 32, 1), FORMAT(Z16_UNORM, D16, DEPTH_COMP16,SWIZ_XXXX, 32, 1), /* Pretend we support this, but it'll be separate Z32F depth and S8. */ - FORMAT(Z32_FLOAT_S8X24_UINT, D32F, R32F, SWIZ_XXXX, 32, 1), + FORMAT(Z32_FLOAT_S8X24_UINT, D32F, DEPTH_COMP32F, SWIZ_XXXX, 32, 1), #else FORMAT(S8_UINT_Z24_UNORM, ZS_DEPTH24_STENCIL8, DEPTH24_X8, SWIZ_XXXX, 32, 1), FORMAT(X8Z24_UNORM, ZS_DEPTH24_STENCIL8, DEPTH24_X8, SWIZ_XXXX, 32, 1), -- 2.30.2