From 867d892d909e34fb500cb185af64afd874fd33c7 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 24 Jul 2019 14:09:11 +0200 Subject: [PATCH] zink: do not set VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT for non-3D textures Acked-by: Jordan Justen --- src/gallium/drivers/zink/zink_resource.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 2fd63060aea..796ecae2d51 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -142,20 +142,14 @@ zink_resource_create(struct pipe_screen *pscreen, ici.imageType = VK_IMAGE_TYPE_1D; break; - case PIPE_TEXTURE_2D: - case PIPE_TEXTURE_2D_ARRAY: case PIPE_TEXTURE_CUBE: case PIPE_TEXTURE_CUBE_ARRAY: + ici.flags = VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; + /* fall-through */ + case PIPE_TEXTURE_2D: + case PIPE_TEXTURE_2D_ARRAY: case PIPE_TEXTURE_RECT: ici.imageType = VK_IMAGE_TYPE_2D; - /* cube and 2D array needs some quirks here */ - if (templ->target == PIPE_TEXTURE_CUBE) - ici.flags = VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; - else if (templ->target == PIPE_TEXTURE_2D_ARRAY) - ici.flags = VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; - else if (templ->target == PIPE_TEXTURE_CUBE_ARRAY) - ici.flags = VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT | - VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; break; case PIPE_TEXTURE_3D: -- 2.30.2