From 446d5ef103766a865c4b81c4accc51a180b87d79 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Sat, 23 Aug 2025 10:58:13 -0400 Subject: [PATCH] vulkan: Drop the driver_internal from vk_image_view_init/create() It alwways comes in through the create flags now. Reviewed-by: Boris Brezillon Reviewed-by: Lionel Landwerlin Reviewed-by: Samuel Pitoiset Reviewed-by: Alyssa Rosenzweig Part-of: --- src/amd/vulkan/radv_image_view.c | 4 ++-- src/asahi/vulkan/hk_image_view.c | 2 +- src/broadcom/vulkan/v3dv_image.c | 2 +- src/freedreno/vulkan/tu_image.cc | 2 +- src/gallium/frontends/lavapipe/lvp_image.c | 2 +- src/imagination/vulkan/pvr_image.c | 1 - src/intel/vulkan/anv_image_view.c | 2 +- src/intel/vulkan_hasvk/anv_image.c | 2 +- src/microsoft/vulkan/dzn_image.c | 2 +- src/nouveau/vulkan/nvk_image_view.c | 2 +- src/panfrost/vulkan/panvk_vX_image_view.c | 2 +- src/vulkan/runtime/vk_image.c | 8 +++----- src/vulkan/runtime/vk_image.h | 2 -- 13 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/amd/vulkan/radv_image_view.c b/src/amd/vulkan/radv_image_view.c index 21c4cbf722f..36d1ffcbc01 100644 --- a/src/amd/vulkan/radv_image_view.c +++ b/src/amd/vulkan/radv_image_view.c @@ -499,7 +499,7 @@ radv_image_view_init(struct radv_image_view *iview, struct radv_device *device, if (!extra_create_info || !extra_create_info->from_client) assert(pCreateInfo->flags & VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA); - vk_image_view_init(&device->vk, &iview->vk, false, pCreateInfo); + vk_image_view_init(&device->vk, &iview->vk, pCreateInfo); memset(&iview->descriptor, 0, sizeof(iview->descriptor)); @@ -650,7 +650,7 @@ radv_hiz_image_view_init(struct radv_image_view *iview, struct radv_device *devi VK_FROM_HANDLE(radv_image, image, pCreateInfo->image); assert(pCreateInfo->flags & VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA); - vk_image_view_init(&device->vk, &iview->vk, false, pCreateInfo); + vk_image_view_init(&device->vk, &iview->vk, pCreateInfo); assert(vk_format_has_depth(image->vk.format) && vk_format_has_stencil(image->vk.format)); assert(iview->vk.aspects == VK_IMAGE_ASPECT_DEPTH_BIT); diff --git a/src/asahi/vulkan/hk_image_view.c b/src/asahi/vulkan/hk_image_view.c index 17e7d93a4d1..27e13e73832 100644 --- a/src/asahi/vulkan/hk_image_view.c +++ b/src/asahi/vulkan/hk_image_view.c @@ -525,7 +525,7 @@ hk_image_view_init(struct hk_device *dev, struct hk_image_view *view, VK_FROM_HANDLE(hk_image, image, pCreateInfo->image); memset(view, 0, sizeof(*view)); - vk_image_view_init(&dev->vk, &view->vk, false, pCreateInfo); + vk_image_view_init(&dev->vk, &view->vk, pCreateInfo); /* First, figure out which image planes we need. For depth/stencil, we only * have one aspect viewed at a time. diff --git a/src/broadcom/vulkan/v3dv_image.c b/src/broadcom/vulkan/v3dv_image.c index ee7573e2daa..d091c6424e3 100644 --- a/src/broadcom/vulkan/v3dv_image.c +++ b/src/broadcom/vulkan/v3dv_image.c @@ -702,7 +702,7 @@ create_image_view(struct v3dv_device *device, V3DV_FROM_HANDLE(v3dv_image, image, pCreateInfo->image); struct v3dv_image_view *iview; - iview = vk_image_view_create(&device->vk, false, pCreateInfo, + iview = vk_image_view_create(&device->vk, pCreateInfo, pAllocator, sizeof(*iview)); if (iview == NULL) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); diff --git a/src/freedreno/vulkan/tu_image.cc b/src/freedreno/vulkan/tu_image.cc index 27181a0644d..59ef3b06844 100644 --- a/src/freedreno/vulkan/tu_image.cc +++ b/src/freedreno/vulkan/tu_image.cc @@ -200,7 +200,7 @@ tu_image_view_init(struct tu_device *device, const struct vk_ycbcr_conversion *conversion = ycbcr_conversion ? vk_ycbcr_conversion_from_handle(ycbcr_conversion->conversion) : NULL; - vk_image_view_init(&device->vk, &iview->vk, false, pCreateInfo); + vk_image_view_init(&device->vk, &iview->vk, pCreateInfo); assert(iview->vk.format != VK_FORMAT_UNDEFINED); iview->image = image; diff --git a/src/gallium/frontends/lavapipe/lvp_image.c b/src/gallium/frontends/lavapipe/lvp_image.c index 375d94f7b14..c37e5dbe7db 100644 --- a/src/gallium/frontends/lavapipe/lvp_image.c +++ b/src/gallium/frontends/lavapipe/lvp_image.c @@ -377,7 +377,7 @@ lvp_CreateImageView(VkDevice _device, LVP_FROM_HANDLE(lvp_image, image, pCreateInfo->image); struct lvp_image_view *view; - view = vk_image_view_create(&device->vk, false, pCreateInfo, + view = vk_image_view_create(&device->vk, pCreateInfo, pAllocator, sizeof(*view)); if (view == NULL) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); diff --git a/src/imagination/vulkan/pvr_image.c b/src/imagination/vulkan/pvr_image.c index 422555ee777..cd66d63d423 100644 --- a/src/imagination/vulkan/pvr_image.c +++ b/src/imagination/vulkan/pvr_image.c @@ -310,7 +310,6 @@ VkResult pvr_CreateImageView(VkDevice _device, VkResult result; iview = vk_image_view_create(&device->vk, - false /* driver_internal */, pCreateInfo, pAllocator, sizeof(*iview)); diff --git a/src/intel/vulkan/anv_image_view.c b/src/intel/vulkan/anv_image_view.c index a3eda58f349..b1f9f4f811d 100644 --- a/src/intel/vulkan/anv_image_view.c +++ b/src/intel/vulkan/anv_image_view.c @@ -173,7 +173,7 @@ anv_image_view_init(struct anv_device *device, { ANV_FROM_HANDLE(anv_image, image, pCreateInfo->image); - vk_image_view_init(&device->vk, &iview->vk, false, pCreateInfo); + vk_image_view_init(&device->vk, &iview->vk, pCreateInfo); iview->image = image; iview->n_planes = anv_image_aspect_get_planes(iview->vk.aspects); iview->use_surface_state_stream = surface_state_stream != NULL; diff --git a/src/intel/vulkan_hasvk/anv_image.c b/src/intel/vulkan_hasvk/anv_image.c index 35535bf3841..e4b64068763 100644 --- a/src/intel/vulkan_hasvk/anv_image.c +++ b/src/intel/vulkan_hasvk/anv_image.c @@ -2385,7 +2385,7 @@ anv_CreateImageView(VkDevice _device, ANV_FROM_HANDLE(anv_image, image, pCreateInfo->image); struct anv_image_view *iview; - iview = vk_image_view_create(&device->vk, false, pCreateInfo, + iview = vk_image_view_create(&device->vk, pCreateInfo, pAllocator, sizeof(*iview)); if (iview == NULL) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); diff --git a/src/microsoft/vulkan/dzn_image.c b/src/microsoft/vulkan/dzn_image.c index d05fc54f886..b67d1316659 100644 --- a/src/microsoft/vulkan/dzn_image.c +++ b/src/microsoft/vulkan/dzn_image.c @@ -1338,7 +1338,7 @@ dzn_image_view_init(struct dzn_device *device, const VkImageSubresourceRange *range = &pCreateInfo->subresourceRange; ASSERTED uint32_t layer_count = dzn_get_layer_count(image, range); - vk_image_view_init(&device->vk, &iview->vk, false, pCreateInfo); + vk_image_view_init(&device->vk, &iview->vk, pCreateInfo); assert(layer_count > 0); assert(range->baseMipLevel < image->vk.mip_levels); diff --git a/src/nouveau/vulkan/nvk_image_view.c b/src/nouveau/vulkan/nvk_image_view.c index 43007dc91a5..9e7e81f9b1a 100644 --- a/src/nouveau/vulkan/nvk_image_view.c +++ b/src/nouveau/vulkan/nvk_image_view.c @@ -104,7 +104,7 @@ nvk_image_view_init(struct nvk_device *dev, memset(view, 0, sizeof(*view)); - vk_image_view_init(&dev->vk, &view->vk, false, pCreateInfo); + vk_image_view_init(&dev->vk, &view->vk, pCreateInfo); /* First, figure out which image planes we need. * For depth/stencil, we may only have plane so simply assert diff --git a/src/panfrost/vulkan/panvk_vX_image_view.c b/src/panfrost/vulkan/panvk_vX_image_view.c index e07b4e93c8f..d2f396481a3 100644 --- a/src/panfrost/vulkan/panvk_vX_image_view.c +++ b/src/panfrost/vulkan/panvk_vX_image_view.c @@ -307,7 +307,7 @@ panvk_per_arch(CreateImageView)(VkDevice _device, struct panvk_image_view *view; VkResult result; - view = vk_image_view_create(&device->vk, false, pCreateInfo, + view = vk_image_view_create(&device->vk, pCreateInfo, pAllocator, sizeof(*view)); if (view == NULL) return panvk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); diff --git a/src/vulkan/runtime/vk_image.c b/src/vulkan/runtime/vk_image.c index 96983d50782..7efabe8485a 100644 --- a/src/vulkan/runtime/vk_image.c +++ b/src/vulkan/runtime/vk_image.c @@ -435,7 +435,6 @@ remap_swizzle(VkComponentSwizzle swizzle, VkComponentSwizzle component) void vk_image_view_init(struct vk_device *device, struct vk_image_view *image_view, - bool driver_internal, const VkImageViewCreateInfo *pCreateInfo) { vk_object_base_init(device, &image_view->base, VK_OBJECT_TYPE_IMAGE_VIEW); @@ -443,8 +442,8 @@ vk_image_view_init(struct vk_device *device, assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO); VK_FROM_HANDLE(vk_image, image, pCreateInfo->image); - if (pCreateInfo->flags & VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA) - driver_internal = true; + const bool driver_internal = + (pCreateInfo->flags & VK_IMAGE_VIEW_CREATE_DRIVER_INTERNAL_BIT_MESA) != 0; image_view->create_flags = pCreateInfo->flags; image_view->image = image; @@ -687,7 +686,6 @@ vk_image_view_finish(struct vk_image_view *image_view) void * vk_image_view_create(struct vk_device *device, - bool driver_internal, const VkImageViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *alloc, size_t size) @@ -698,7 +696,7 @@ vk_image_view_create(struct vk_device *device, if (image_view == NULL) return NULL; - vk_image_view_init(device, image_view, driver_internal, pCreateInfo); + vk_image_view_init(device, image_view, pCreateInfo); return image_view; } diff --git a/src/vulkan/runtime/vk_image.h b/src/vulkan/runtime/vk_image.h index 10afebc9022..92689e619e2 100644 --- a/src/vulkan/runtime/vk_image.h +++ b/src/vulkan/runtime/vk_image.h @@ -373,12 +373,10 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(vk_image_view, base, VkImageView, void vk_image_view_init(struct vk_device *device, struct vk_image_view *image_view, - bool driver_internal, const VkImageViewCreateInfo *pCreateInfo); void vk_image_view_finish(struct vk_image_view *image_view); void *vk_image_view_create(struct vk_device *device, - bool driver_internal, const VkImageViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *alloc, size_t size);