OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvk: Support 2D views of 3D images

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand
2023-01-30 20:12:01 -06:00
committed by Marge Bot
parent 7559d2e93c
commit 2c57a941cd
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nouveau/vulkan/nvk_image.c
View File

@@ -227,6 +227,8 @@ nvk_image_init(struct nvk_device *device,
enum nil_image_usage_flags usage = 0; /* TODO */ enum nil_image_usage_flags usage = 0; /* TODO */
if (pCreateInfo->tiling == VK_IMAGE_TILING_LINEAR) if (pCreateInfo->tiling == VK_IMAGE_TILING_LINEAR)
usage |= NIL_IMAGE_USAGE_LINEAR_BIT; usage |= NIL_IMAGE_USAGE_LINEAR_BIT;
if (pCreateInfo->flags & VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT)
usage |= NIL_IMAGE_USAGE_2D_VIEW_BIT;
struct nil_image_init_info nil_info = { struct nil_image_init_info nil_info = {
.dim = vk_image_type_to_nil_dim(pCreateInfo->imageType), .dim = vk_image_type_to_nil_dim(pCreateInfo->imageType),

28
src/nouveau/vulkan/nvk_image_view.c
View File

@@ -37,6 +37,21 @@ vk_swizzle_to_pipe(VkComponentSwizzle swizzle)
} }
} }
static void
image_3d_view_as_2d_array(struct nil_image *image,
struct nil_view *view,
uint64_t *base_addr)
{
assert(view->type == NIL_VIEW_TYPE_2D ||
view->type == NIL_VIEW_TYPE_2D_ARRAY);
assert(view->num_levels == 1);
uint64_t offset_B;
nil_image_3d_level_as_2d_array(image, view->base_level, image, &offset_B);
*base_addr += offset_B;
view->base_level = 0;
}
VkResult VkResult
nvk_image_view_init(struct nvk_device *device, nvk_image_view_init(struct nvk_device *device,
struct nvk_image_view *view, struct nvk_image_view *view,
@@ -50,6 +65,9 @@ nvk_image_view_init(struct nvk_device *device,
vk_image_view_init(&device->vk, &view->vk, driver_internal, pCreateInfo); vk_image_view_init(&device->vk, &view->vk, driver_internal, pCreateInfo);
struct nil_image nil_image = image->nil;
uint64_t base_addr = nvk_image_base_address(image);
struct nil_view nil_view = { struct nil_view nil_view = {
.type = vk_image_view_type_to_nil_view_type(view->vk.view_type), .type = vk_image_view_type_to_nil_view_type(view->vk.view_type),
.format = vk_format_to_pipe_format(view->vk.format), .format = vk_format_to_pipe_format(view->vk.format),
@@ -65,12 +83,15 @@ nvk_image_view_init(struct nvk_device *device,
}, },
}; };
if (nil_image.dim == NIL_IMAGE_DIM_3D &&
nil_view.type != NIL_VIEW_TYPE_3D)
image_3d_view_as_2d_array(&nil_image, &nil_view, &base_addr);
if (view->vk.usage & (VK_IMAGE_USAGE_SAMPLED_BIT | if (view->vk.usage & (VK_IMAGE_USAGE_SAMPLED_BIT |
VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT)) { VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT)) {
uint32_t tic[8]; uint32_t tic[8];
nil_image_fill_tic(nvk_device_physical(device)->dev, nil_image_fill_tic(nvk_device_physical(device)->dev,
&image->nil, &nil_view, &nil_image, &nil_view, base_addr, tic);
nvk_image_base_address(image), tic);
result = nvk_descriptor_table_add(device, &device->images, result = nvk_descriptor_table_add(device, &device->images,
tic, sizeof(tic), tic, sizeof(tic),
@@ -89,8 +110,7 @@ nvk_image_view_init(struct nvk_device *device,
uint32_t tic[8]; uint32_t tic[8];
nil_image_fill_tic(nvk_device_physical(device)->dev, nil_image_fill_tic(nvk_device_physical(device)->dev,
&image->nil, &nil_view, &nil_image, &nil_view, base_addr, tic);
nvk_image_base_address(image), tic);
result = nvk_descriptor_table_add(device, &device->images, result = nvk_descriptor_table_add(device, &device->images,
tic, sizeof(tic), tic, sizeof(tic),