From b92c1a043a6cfa3dbdadbb92ec58599fd89748e5 Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Thu, 27 May 2021 16:40:11 +0200
Subject: [PATCH] lavapipe: do not interpret cube-compatible as cubemap

Now that we handle the cubemap-array views properly, we no longer need
to do this. It's allowed in Gallium to create cubemap views of 2d
arrays, so this should work fine.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10913>
---
 src/gallium/frontends/lavapipe/lvp_image.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gallium/frontends/lavapipe/lvp_image.c b/src/gallium/frontends/lavapipe/lvp_image.c
index 7a111f131d4..3b47782f020 100644
--- a/src/gallium/frontends/lavapipe/lvp_image.c
+++ b/src/gallium/frontends/lavapipe/lvp_image.c
@@ -59,8 +59,6 @@ lvp_image_create(VkDevice _device,
       default:
       case VK_IMAGE_TYPE_2D:
          template.target = pCreateInfo->arrayLayers > 1 ? PIPE_TEXTURE_2D_ARRAY : PIPE_TEXTURE_2D;
-         if (pCreateInfo->flags & VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT)
-            template.target = pCreateInfo->arrayLayers == 6 ? PIPE_TEXTURE_CUBE : PIPE_TEXTURE_CUBE_ARRAY;
          break;
       case VK_IMAGE_TYPE_3D:
          template.target = PIPE_TEXTURE_3D;