ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle possible error from createTextureImage

Browse Source
This commit is contained in:
Benau 2022-03-15 14:04:36 +08:00
parent 4b28f5b9af
commit d6265f3bf7
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/graphics_engine/src/ge_vulkan_texture.cpp
View File

@ -82,15 +82,21 @@ bool GEVulkanTexture::createTextureImage(uint8_t* texture_data)
if (!success)
return false;
VkResult ret = VK_SUCCESS;
void* data;
vkMapMemory(m_vulkan_device, staging_buffer_memory, 0, image_size, 0, &data);
if ((ret = vkMapMemory(m_vulkan_device, staging_buffer_memory, 0,
image_size, 0, &data)) != VK_SUCCESS)
goto destroy;
memcpy(data, texture_data, (size_t)(image_size));
vkUnmapMemory(m_vulkan_device, staging_buffer_memory);
success = createImage(VK_IMAGE_USAGE_TRANSFER_DST_BIT |
VK_IMAGE_USAGE_SAMPLED_BIT);
if (!success)
return false;
{
ret = VK_NOT_READY;
goto destroy;
}
transitionImageLayout(VK_IMAGE_LAYOUT_UNDEFINED,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
@ -100,10 +106,11 @@ bool GEVulkanTexture::createTextureImage(uint8_t* texture_data)
transitionImageLayout(VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
destroy:
vkDestroyBuffer(m_vulkan_device, staging_buffer, NULL);
vkFreeMemory(m_vulkan_device, staging_buffer_memory, NULL);
return true;
return ret == VK_SUCCESS;
} // createTextureImage
// ----------------------------------------------------------------------------