From: Kenneth Graunke Date: Tue, 9 Oct 2018 23:47:54 +0000 (-0700) Subject: iris: X32_S8X24 :/ X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=28b41992c8f5cb287b3ecd8a2f383163e158c96a;p=mesa.git iris: X32_S8X24 :/ This can happen when faking Z32_S8X24 and setting StencilSampling = true I guess we'll just turn it into S8_UINT... Fixes KHR-GL45.texture_swizzle.functional --- diff --git a/src/gallium/drivers/iris/iris_formats.c b/src/gallium/drivers/iris/iris_formats.c index b3dd17ba4bd..220bd371ccb 100644 --- a/src/gallium/drivers/iris/iris_formats.c +++ b/src/gallium/drivers/iris/iris_formats.c @@ -62,6 +62,7 @@ iris_isl_format_for_pipe_format(enum pipe_format pf) [PIPE_FORMAT_S8_UINT] = ISL_FORMAT_R8_UINT, [PIPE_FORMAT_X24S8_UINT] = ISL_FORMAT_R8_UINT, + [PIPE_FORMAT_X32_S8X24_UINT] = ISL_FORMAT_R8_UINT, [PIPE_FORMAT_R64_FLOAT] = ISL_FORMAT_R64_FLOAT, [PIPE_FORMAT_R64G64_FLOAT] = ISL_FORMAT_R64G64_FLOAT, @@ -173,11 +174,6 @@ iris_isl_format_for_pipe_format(enum pipe_format pf) [PIPE_FORMAT_R8G8B8X8_UNORM] = ISL_FORMAT_R8G8B8X8_UNORM, //[PIPE_FORMAT_B4G4R4X4_UNORM] = ISL_FORMAT_B4G4R4X4_UNORM, - /* some stencil samplers formats */ - //[PIPE_FORMAT_X24S8_UINT] = ISL_FORMAT_X24S8_UINT, - //[PIPE_FORMAT_S8X24_UINT] = ISL_FORMAT_S8X24_UINT, - //[PIPE_FORMAT_X32_S8X24_UINT] = ISL_FORMAT_X32_S8X24_UINT, - //[PIPE_FORMAT_B2G3R3_UNORM] = ISL_FORMAT_B2G3R3_UNORM, //[PIPE_FORMAT_LATC1_UNORM] = ISL_FORMAT_LATC1_UNORM,