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

Fix infinite GEVulkanTexture::waitImageView if createImageView failed

Browse Source
This commit is contained in:
Benau 2022-08-31 11:20:04 +08:00
parent 38b995bf61
commit 4ceec85edc
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,7 +444,11 @@ bool GEVulkanTexture::createImageView(VkImageAspectFlags aspect_flags)
m_ondemand_loading.store(false); m_ondemand_loading.store(false);
return true; return true;
} }
return false; else
{
m_ondemand_loading.store(false);
return false;
}
} // createImageView } // createImageView
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -514,7 +518,10 @@ void GEVulkanTexture::reloadInternal()
void GEVulkanTexture::upload(uint8_t* data, bool generate_hq_mipmap) void GEVulkanTexture::upload(uint8_t* data, bool generate_hq_mipmap)
{ {
if (!createTextureImage(data, generate_hq_mipmap)) if (!createTextureImage(data, generate_hq_mipmap))
{
m_ondemand_loading.store(false);
return; return;
}
if (!createImageView(VK_IMAGE_ASPECT_COLOR_BIT)) if (!createImageView(VK_IMAGE_ASPECT_COLOR_BIT))
return; return;
m_texture_size = m_size.Width * m_size.Height * (isSingleChannel() ? 1 : 4); m_texture_size = m_size.Width * m_size.Height * (isSingleChannel() ? 1 : 4);