diff --git a/src/vulkan/gen7_state.c b/src/vulkan/gen7_state.c
index 321dc3f0f5d..108ebe7c225 100644
--- 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 0937677e8e4..aa57073c3e8 100644
--- 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);