anv: Add initial support for cube maps

This fixes 486 cubemap CTS tests.

diff --git a/src/vulkan/gen7_state.c b/src/vulkan/gen7_state.c
index 321dc3f0f5d93bdee0326efe8f73cc54602d32c5..108ebe7c225637b6aa3411a6399af7d17d79a4c6 100644 (file)
--- a/src/vulkan/gen7_state.c
+++ b/src/vulkan/gen7_state.c
@@ -44,8 +44,8 @@ anv_surftype(const struct anv_image *image, VkImageViewType view_type)
       return SURFTYPE_1D;
    case VK_IMAGE_VIEW_TYPE_CUBE:
    case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY:
-      anv_finishme("%s:%s: cube images", __FILE__, __func__);
-      /* fallthrough */
+      assert(image->type == VK_IMAGE_TYPE_2D);
+      return SURFTYPE_CUBE;
    case VK_IMAGE_VIEW_TYPE_2D:
    case VK_IMAGE_VIEW_TYPE_2D_ARRAY:
       assert(image->type == VK_IMAGE_TYPE_2D);

diff --git a/src/vulkan/gen8_state.c b/src/vulkan/gen8_state.c
index 0937677e8e4d1f5468e00b475ea5912399ad0115..aa57073c3e842f756bb55bea33c5b6df19da5621 100644 (file)
--- a/src/vulkan/gen8_state.c
+++ b/src/vulkan/gen8_state.c
@@ -44,8 +44,8 @@ anv_surftype(const struct anv_image *image, VkImageViewType view_type)
       return SURFTYPE_1D;
    case VK_IMAGE_VIEW_TYPE_CUBE:
    case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY:
-      anv_finishme("%s:%s: cube images", __FILE__, __func__);
-      /* fallthrough */
+      assert(image->type == VK_IMAGE_TYPE_2D);
+      return SURFTYPE_CUBE;
    case VK_IMAGE_VIEW_TYPE_2D:
    case VK_IMAGE_VIEW_TYPE_2D_ARRAY:
       assert(image->type == VK_IMAGE_TYPE_2D);