remove functions from asserts

This commit is contained in:
Matthew 2025-09-29 07:54:05 +10:00
parent c000b2d630
commit d16fab8dba

View File

@ -686,7 +686,7 @@ CreateBuffer(Vulkan* vk, Buffer* buf, BufferType type, u64 size, bool host_visib
VmaAllocationInfo vma_info; VmaAllocationInfo vma_info;
VkResult result = vmaCreateBuffer(vk.vma, &buffer_info, &alloc_info, &buf.buffer, &buf.alloc, &vma_info); VkResult result = vmaCreateBuffer(vk.vma, &buffer_info, &alloc_info, &buf.buffer, &buf.alloc, &vma_info);
// TODO: handle errors here then reallocate buffer // TODO: handle errors here then reallocate buffer
assert(VkCheck("CreateBuffer failure: vmaCreateBuffer error", result), "CreateBuffer failure"); VkCheck("CreateBuffer failure: vmaCreateBuffer error", result);
buf.size = buffer_size; buf.size = buffer_size;
buf.dynamic = dynamic; buf.dynamic = dynamic;
@ -1074,13 +1074,15 @@ CreateImageView(Vulkan* vk, ImageView* view, u32 w, u32 h, u32 ch, u8[] data)
if(ch == 4) if(ch == 4)
{ {
assert(Transfer(vk, view, data, w, h), "CreateImageView failure: Image Transfer error"); bool result = Transfer(vk, view, data, w, h);
assert(result);
} }
else else
{ {
Buffer buf; Buffer buf;
CreateBuffer(vk, &buf, BT.Storage, w * h * ch, false); CreateBuffer(vk, &buf, BT.Storage, w * h * ch, false);
assert(Transfer(vk, &buf, data), "CreateImageView failure: Buffer Transfer error"); bool result = Transfer(vk, &buf, data)
assert(result, "CreateImageView failure: Buffer Transfer error");
ImageView conv_view; ImageView conv_view;
CreateImageView(vk, &conv_view, w, h, FMT.RGBA_F32, IU.Convert); CreateImageView(vk, &conv_view, w, h, FMT.RGBA_F32, IU.Convert);
@ -1228,7 +1230,7 @@ CreateImageView(Vulkan* vk, ImageView* view, u32 w, u32 h, Format format, ImageU
VkResult result = vmaCreateImage(vk.vma, &image_info, &alloc_info, &view.image, &view.alloc, null); VkResult result = vmaCreateImage(vk.vma, &image_info, &alloc_info, &view.image, &view.alloc, null);
// TODO: handle errors and realloc // TODO: handle errors and realloc
assert(VkCheck("CreateImageView failure: vmaCreateImage error", result), "CreateImageView failure"); VkCheck("CreateImageView failure: vmaCreateImage error", result);
VkImageViewCreateInfo view_info = { VkImageViewCreateInfo view_info = {
sType: VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, sType: VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
@ -1244,7 +1246,7 @@ CreateImageView(Vulkan* vk, ImageView* view, u32 w, u32 h, Format format, ImageU
result = vkCreateImageView(vk.device, &view_info, null, &view.view); result = vkCreateImageView(vk.device, &view_info, null, &view.view);
// TODO: also handle here // TODO: also handle here
assert(VkCheck("CreateImageView failure: vkCreateImageView error", result), "CreateImageView failure"); VkCheck("CreateImageView failure: vkCreateImageView error", result);
view.layout = VK_IMAGE_LAYOUT_UNDEFINED; view.layout = VK_IMAGE_LAYOUT_UNDEFINED;
view.format = format; view.format = format;
@ -1950,7 +1952,7 @@ CreateComputePipeline(Vulkan* vk, CompPipelineInfo* comp_info)
}; };
Shader comp_module; Shader comp_module;
assert(BuildShader(vk, &comp_module, comp_info.shader), "Unable to build compute shader"); BuildShader(vk, &comp_module, comp_info.shader);
scope(exit) Destroy(vk, comp_module); scope(exit) Destroy(vk, comp_module);
__traits(getMember, &info.stage, "module") = comp_module; __traits(getMember, &info.stage, "module") = comp_module;
@ -1974,7 +1976,7 @@ CreateComputePipeline(Vulkan* vk, CompPipelineInfo* comp_info)
Pipeline pipeline_handle = pipeline.index; Pipeline pipeline_handle = pipeline.index;
VkResult result = vkCreateComputePipelines(vk.device, null, 1, &info, null, &pipeline.handle); VkResult result = vkCreateComputePipelines(vk.device, null, 1, &info, null, &pipeline.handle);
assert(VkCheck("CreateComputePipeline failure", result), "Unable to build pipeline"); VkCheck("CreateComputePipeline failure", result);
return pipeline_handle; return pipeline_handle;
} }