claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check vkWaitForFences result

Browse source
This commit is contained in:
saschawillems 2016-03-19 19:28:08 +01:00
parent 1faccf429a
commit 6b50c207ae
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
base/vulkanTextureLoader.hpp
View file

@ -67,6 +67,8 @@ namespace vkTools
// Load a 2D texture // Load a 2D texture
void loadTexture(const char* filename, VkFormat format, VulkanTexture *texture, bool forceLinear, VkImageUsageFlags imageUsageFlags) void loadTexture(const char* filename, VkFormat format, VulkanTexture *texture, bool forceLinear, VkImageUsageFlags imageUsageFlags)
{ {
std::cout << "Loading \"" << filename << "\"..." << std::endl;
gli::texture2D tex2D(gli::load(filename)); gli::texture2D tex2D(gli::load(filename));
assert(!tex2D.empty()); assert(!tex2D.empty());
@ -204,7 +206,7 @@ namespace vkTools
copyRegion.extent.width = tex2D[level].dimensions().x; copyRegion.extent.width = tex2D[level].dimensions().x;
copyRegion.extent.height = tex2D[level].dimensions().y; copyRegion.extent.height = tex2D[level].dimensions().y;
copyRegion.extent.depth = 1; copyRegion.extent.depth = 0;
// Put image copy into command buffer // Put image copy into command buffer
vkCmdCopyImage( vkCmdCopyImage(
@ -241,15 +243,16 @@ namespace vkTools
vkTools::checkResult(vkQueueSubmit(queue, 1, &submitInfo, copyFence)); vkTools::checkResult(vkQueueSubmit(queue, 1, &submitInfo, copyFence));
vkWaitForFences(device, 1, &copyFence, VK_TRUE, DEFAULT_FENCE_TIMEOUT); vkTools::checkResult(vkWaitForFences(device, 1, &copyFence, VK_TRUE, DEFAULT_FENCE_TIMEOUT));
vkDestroyFence(device, copyFence, nullptr); vkDestroyFence(device, copyFence, nullptr);
// Destroy linear images used as staging buffers after copies have been finished // Destroy linear images used as staging buffers after copies have been finished
for (auto& level : mipLevels) //for (auto& level : mipLevels)
for (uint32_t i = 0; i < mipLevels.size(); i++)
{ {
vkDestroyImage(device, level.image, nullptr); vkDestroyImage(device, mipLevels[i].image, nullptr);
vkFreeMemory(device, level.memory, nullptr); vkFreeMemory(device, mipLevels[i].memory, nullptr);
} }
} }
else else
@ -563,7 +566,7 @@ namespace vkTools
vkTools::checkResult(vkQueueSubmit(queue, 1, &submitInfo, copyFence)); vkTools::checkResult(vkQueueSubmit(queue, 1, &submitInfo, copyFence));
vkWaitForFences(device, 1, &copyFence, VK_TRUE, DEFAULT_FENCE_TIMEOUT); vkTools::checkResult(vkWaitForFences(device, 1, &copyFence, VK_TRUE, DEFAULT_FENCE_TIMEOUT));
vkDestroyFence(device, copyFence, nullptr); vkDestroyFence(device, copyFence, nullptr);
@ -773,7 +776,7 @@ namespace vkTools
vkTools::checkResult(vkQueueSubmit(queue, 1, &submitInfo, copyFence)); vkTools::checkResult(vkQueueSubmit(queue, 1, &submitInfo, copyFence));
vkWaitForFences(device, 1, &copyFence, VK_TRUE, DEFAULT_FENCE_TIMEOUT); vkTools::checkResult(vkWaitForFences(device, 1, &copyFence, VK_TRUE, DEFAULT_FENCE_TIMEOUT));
vkDestroyFence(device, copyFence, nullptr); vkDestroyFence(device, copyFence, nullptr);