anv: Add initial support for cube maps

[mesa.git] / src / vulkan / anv_image.c

diff --git a/src/vulkan/anv_image.c b/src/vulkan/anv_image.c
index ffc7ae8cae6ac3c3563b558265467a37cc9acb81..dcad2affb2c497cd10dfab9680c05c5eed2ea9bf 100644 (file)
--- a/src/vulkan/anv_image.c
+++ b/src/vulkan/anv_image.c
@@ -34,12 +34,6 @@
  */
 #include "gen8_pack.h"
 
-static const uint8_t anv_surf_type_from_image_type[] = {
-   [VK_IMAGE_TYPE_1D] = SURFTYPE_1D,
-   [VK_IMAGE_TYPE_2D] = SURFTYPE_2D,
-   [VK_IMAGE_TYPE_3D] = SURFTYPE_3D,
-};
-
 /**
  * The \a format argument is required and overrides any format found in struct
  * anv_image_create_info. Exactly one bit must be set in \a aspect.
@@ -203,10 +197,6 @@ anv_image_create(VkDevice _device,
    anv_assert(pCreateInfo->extent.height > 0);
    anv_assert(pCreateInfo->extent.depth > 0);
 
-   /* TODO(chadv): How should we validate inputs? */
-   const uint8_t surf_type =
-      anv_surf_type_from_image_type[pCreateInfo->imageType];
-
    image = anv_alloc2(&device->alloc, alloc, sizeof(*image), 8,
                       VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
    if (!image)
@@ -219,7 +209,6 @@ anv_image_create(VkDevice _device,
    image->levels = pCreateInfo->mipLevels;
    image->array_size = pCreateInfo->arrayLayers;
    image->usage = anv_image_get_full_usage(pCreateInfo);
-   image->surface_type = surf_type;
 
    if (image->usage & VK_IMAGE_USAGE_SAMPLED_BIT) {
       image->needs_nonrt_surface_state = true;
@@ -523,7 +512,9 @@ anv_CreateBufferView(VkDevice _device,
    if (!view)
       return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
 
-   view->buffer = buffer;
+   view->bo = buffer->bo;
+   view->offset = buffer->offset + pCreateInfo->offset;
+
    view->surface_state =
       anv_state_pool_alloc(&device->surface_state_pool, 64, 64);
 
@@ -531,7 +522,7 @@ anv_CreateBufferView(VkDevice _device,
       anv_format_for_vk_format(pCreateInfo->format);
 
    anv_fill_buffer_surface_state(device, view->surface_state.map, format,
-                                 pCreateInfo->offset, pCreateInfo->range,
+                                 view->offset, pCreateInfo->range,
                                  format->isl_layout->bpb / 8);
 
    *pView = anv_buffer_view_to_handle(view);