From 2965bdde04eaa0012b29695aa015c354deb30bed Mon Sep 17 00:00:00 2001 From: Danny Holman Date: Mon, 28 Oct 2024 15:52:52 -0500 Subject: render: move get_vkerr_str into vkassert.h Move get_vkerr_str into vkassert.h and use its output in the vkassert function. This reduces the need for an error message argument when calling vkassert and makes error messages in logs consistent across the entire Vulkan renderer. Signed-off-by: Danny Holman --- render/vulkan/image.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'render/vulkan/image.c') diff --git a/render/vulkan/image.c b/render/vulkan/image.c index 9142f9e..d82b809 100644 --- a/render/vulkan/image.c +++ b/render/vulkan/image.c @@ -14,7 +14,7 @@ int _create_image_view(struct vkimage *image, struct vkdev *dev, VkFormat format vcinfo.subresourceRange.levelCount = 1; vcinfo.subresourceRange.baseArrayLayer = 0; vcinfo.subresourceRange.layerCount = 1; - vkassert(vkCreateImageView(dev->ldev, &vcinfo, NULL, &image->view), "Failed to create image view"); + vkassert(vkCreateImageView(dev->ldev, &vcinfo, NULL, &image->view)); } struct vkimage* create_vkimage(struct vkdev *dev, VkFormat format, uint32_t width, uint32_t height, uint32_t usage, uint32_t mem_flags, uint32_t aflags, int create_view) { @@ -38,7 +38,7 @@ struct vkimage* create_vkimage(struct vkdev *dev, VkFormat format, uint32_t widt icinfo.usage = usage; icinfo.samples = VK_SAMPLE_COUNT_1_BIT; icinfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; - vkassert(vkCreateImage(dev->ldev, &icinfo, NULL, &ret->handle), "Failed to create image"); + vkassert(vkCreateImage(dev->ldev, &icinfo, NULL, &ret->handle)); VkMemoryRequirements mem_req; vkGetImageMemoryRequirements(dev->ldev, ret->handle, &mem_req); @@ -51,8 +51,8 @@ struct vkimage* create_vkimage(struct vkdev *dev, VkFormat format, uint32_t widt mainfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; mainfo.allocationSize = mem_req.size; mainfo.memoryTypeIndex = mem_type; - vkassert(vkAllocateMemory(dev->ldev, &mainfo, NULL, &ret->memory), "Failed to allocate image memory"); - vkassert(vkBindImageMemory(dev->ldev, ret->handle, ret->memory, 0), "Failed to bind image memory"); + vkassert(vkAllocateMemory(dev->ldev, &mainfo, NULL, &ret->memory)); + vkassert(vkBindImageMemory(dev->ldev, ret->handle, ret->memory, 0)); if (create_view == 1) _create_image_view(ret, dev, format, aflags); -- cgit v1.2.3