From 84b660b9229e95201f0a1eb7070e6706b9ffdab8 Mon Sep 17 00:00:00 2001 From: "Thomas H.P. Andersen" Date: Mon, 23 Dec 2024 03:19:39 +0100 Subject: [PATCH] nvk: follow naming convention for devices Reviewed-by: Faith Ekstrand Part-of: --- src/nouveau/vulkan/nvk_host_copy.c | 6 +++--- src/nouveau/vulkan/nvk_image.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nouveau/vulkan/nvk_host_copy.c b/src/nouveau/vulkan/nvk_host_copy.c index f522333bed9..f6d02d6b0c5 100644 --- a/src/nouveau/vulkan/nvk_host_copy.c +++ b/src/nouveau/vulkan/nvk_host_copy.c @@ -322,7 +322,7 @@ nvk_CopyImageToMemoryEXT(VkDevice _device, } static VkResult -nvk_copy_image_to_image(struct nvk_device *device, +nvk_copy_image_to_image(struct nvk_device *dev, struct nvk_image *src, struct nvk_image *dst, const VkImageCopy2 *info) @@ -470,7 +470,7 @@ nvk_copy_image_to_image(struct nvk_device *device, dst_extent_B.depth * dst_extent_B.array_len); const size_t tmp_size_B = src_extent_B.depth * src_extent_B.array_len * tmp_layer_stride_B; - void *tmp_mem = vk_alloc(&device->vk.alloc, tmp_size_B, 8, + void *tmp_mem = vk_alloc(&dev->vk.alloc, tmp_size_B, 8, VK_SYSTEM_ALLOCATION_SCOPE_DEVICE); const struct nil_Extent4D_Pixels src_level_extent_px = @@ -527,7 +527,7 @@ nvk_copy_image_to_image(struct nvk_device *device, dst_ptr += dst_img_plane->nil.array_stride_B; } - vk_free(&device->vk.alloc, tmp_mem); + vk_free(&dev->vk.alloc, tmp_mem); } nvk_image_plane_unmap(src_img_plane); diff --git a/src/nouveau/vulkan/nvk_image.h b/src/nouveau/vulkan/nvk_image.h index 1222485c935..491d250e01a 100644 --- a/src/nouveau/vulkan/nvk_image.h +++ b/src/nouveau/vulkan/nvk_image.h @@ -42,7 +42,7 @@ struct nvkmd_mem; struct nvkmd_va; VkFormatFeatureFlags2 -nvk_get_image_format_features(struct nvk_physical_device *pdevice, +nvk_get_image_format_features(struct nvk_physical_device *pdev, VkFormat format, VkImageTiling tiling, uint64_t drm_format_mod);