fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vulkan: Drop the driver_internal from vk_image_view_init/create()

Browse source 
It alwways comes in through the create flags now.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36957>
This commit is contained in:
Faith Ekstrand 2025-08-23 10:58:13 -04:00 • committed by Marge Bot
parent d1ef8647ac
commit 446d5ef103
13 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/amd/vulkan/radv_image_view.c
View file

@ -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);

2
src/asahi/vulkan/hk_image_view.c
View file

@ -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.

2
src/broadcom/vulkan/v3dv_image.c
View file

@ -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);

2
src/freedreno/vulkan/tu_image.cc
View file

@ -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;

2
src/gallium/frontends/lavapipe/lvp_image.c
View file

@ -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);

1
src/imagination/vulkan/pvr_image.c
View file

@ -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));

2
src/intel/vulkan/anv_image_view.c
View file

@ -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;

2
src/intel/vulkan_hasvk/anv_image.c
View file

@ -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);

2
src/microsoft/vulkan/dzn_image.c
View file

@ -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);

2
src/nouveau/vulkan/nvk_image_view.c
View file

@ -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

2
src/panfrost/vulkan/panvk_vX_image_view.c
View file

@ -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);

8
src/vulkan/runtime/vk_image.c
View file

@ -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;
}

2
src/vulkan/runtime/vk_image.h
View file

@ -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);