Module: Mesa Branch: main Commit: a5a97f0b77396188c2d81fff9f80023ac3e952eb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5a97f0b77396188c2d81fff9f80023ac3e952eb
Author: Danylo Piliaiev <[email protected]> Date: Fri Apr 1 20:00:30 2022 +0300 turnip: Fix subpassLoad from CUBE input attachments Cube descriptors require a different sampling instruction in shader, however we don't know whether image is a cube or not until the start of a renderpass. We have to patch the descriptor to make it compatible with how it is sampled in shader. For the reference subpassLoad is currently translated into isaml.a Blob v615 also doesn't handle this case correctly. Signed-off-by: Danylo Piliaiev <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15734> --- src/freedreno/vulkan/tu_cmd_buffer.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index 15107caca80..40bef6bdf69 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -1112,6 +1112,23 @@ tu_emit_input_attachments(struct tu_cmd_buffer *cmd, memcpy(dst, iview->view.descriptor, A6XX_TEX_CONST_DWORDS * 4); + /* Cube descriptors require a different sampling instruction in shader, + * however we don't know whether image is a cube or not until the start + * of a renderpass. We have to patch the descriptor to make it compatible + * with how it is sampled in shader. + */ + enum a6xx_tex_type tex_type = (dst[2] & A6XX_TEX_CONST_2_TYPE__MASK) >> + A6XX_TEX_CONST_2_TYPE__SHIFT; + if (tex_type == A6XX_TEX_CUBE) { + dst[2] &= ~A6XX_TEX_CONST_2_TYPE__MASK; + dst[2] |= A6XX_TEX_CONST_2_TYPE(A6XX_TEX_2D); + + uint32_t depth = (dst[5] & A6XX_TEX_CONST_5_DEPTH__MASK) >> + A6XX_TEX_CONST_5_DEPTH__SHIFT; + dst[5] &= ~A6XX_TEX_CONST_5_DEPTH__MASK; + dst[5] |= A6XX_TEX_CONST_5_DEPTH(depth * 6); + } + if (i % 2 == 1 && att->format == VK_FORMAT_D24_UNORM_S8_UINT) { /* note this works because spec says fb and input attachments * must use identity swizzle
