diff options
| -rw-r--r-- | src/game.cpp | 2 | ||||
| -rw-r--r-- | src/window.cpp | 25 |
2 files changed, 18 insertions, 9 deletions
diff --git a/src/game.cpp b/src/game.cpp index 366eee8..50c7199 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -198,7 +198,7 @@ void ParseInstance(std::ifstream &stream) { while (stream.getline(readLine, readLineLength)) { if (strstr(PKE_FILE_OBJ_END, readLine)) { if (entTypeCode[0] == '\0') { - printf("[Game::ParseInstance] Failed to create instance from save file. No EntTypeCode present."); + printf("[Game::ParseInstance] Failed to create instance from save file. No EntTypeCode present.\n"); break; } int64_t existingEntityTypeIndex = EntityType_FindByTypeCode(entTypeCode); diff --git a/src/window.cpp b/src/window.cpp index ec8eba9..279c876 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -421,7 +421,7 @@ void InitVulkan() { transferFamilyIndex = FindQueueFamilyIndex(vkPhysicalDevice, -1, VK_QUEUE_TRANSFER_BIT); } if (transferFamilyIndex == 0xFFFFFFFF) { - printf("Failed to find transfer queue index"); + printf("Failed to find transfer queue index\n"); throw("Failed to find transfer queue index"); } @@ -554,11 +554,15 @@ void CreateImageResources_Inner(VkImageCreateInfo *imageCreateInfo, VkImageViewC vkAllocateMemory(vkDevice, &vkMemoryAllocateInfo, vkAllocator, deviceMemory); for (long i = 0; i < MAX_FRAMES_IN_FLIGHT; ++i) { - vkCreateImage(vkDevice, imageCreateInfo, vkAllocator, &images[i]); - vkBindImageMemory(vkDevice, images[i], *deviceMemory, paddedImageSize * i); + VkResult result; + result = vkCreateImage(vkDevice, imageCreateInfo, vkAllocator, &images[i]); + assert(result == VK_SUCCESS); + result = vkBindImageMemory(vkDevice, images[i], *deviceMemory, paddedImageSize * i); + assert(result == VK_SUCCESS); imageViewCreateInfo->image = images[i]; - vkCreateImageView(vkDevice, imageViewCreateInfo, vkAllocator, &imageViews[i]); + result = vkCreateImageView(vkDevice, imageViewCreateInfo, vkAllocator, &imageViews[i]); + assert(result == VK_SUCCESS); } } @@ -1575,7 +1579,9 @@ void CreateGraphicsPipelines() { dbgTextureCI.pQueueFamilyIndices = nullptr; dbgTextureCI.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; - vkCreateImage(vkDevice, &dbgTextureCI, vkAllocator, &pkeDebugHitbox.vkImage); + VkResult result; + result = vkCreateImage(vkDevice, &dbgTextureCI, vkAllocator, &pkeDebugHitbox.vkImage); + assert(result == VK_SUCCESS); VkMemoryRequirements imageMemReqs; vkGetImageMemoryRequirements(vkDevice, pkeDebugHitbox.vkImage, &imageMemReqs); @@ -1587,8 +1593,10 @@ void CreateGraphicsPipelines() { if (imageAllocInfo.memoryTypeIndex == 0) { imageAllocInfo.memoryTypeIndex = FindMemoryTypeIndex(imageMemReqs.memoryTypeBits, 0); } - vkAllocateMemory(vkDevice, &imageAllocInfo, vkAllocator, &pkeDebugHitbox.textureMemory); - vkBindImageMemory(vkDevice, pkeDebugHitbox.vkImage, pkeDebugHitbox.textureMemory, 0); + result = vkAllocateMemory(vkDevice, &imageAllocInfo, vkAllocator, &pkeDebugHitbox.textureMemory); + assert(result == VK_SUCCESS); + result = vkBindImageMemory(vkDevice, pkeDebugHitbox.vkImage, pkeDebugHitbox.textureMemory, 0); + assert(result == VK_SUCCESS); VkImageViewCreateInfo dbgImageViewCI; dbgImageViewCI.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; @@ -1611,7 +1619,8 @@ void CreateGraphicsPipelines() { .layerCount = 1, }; - vkCreateImageView(vkDevice, &dbgImageViewCI, vkAllocator, &pkeDebugHitbox.vkImageView); + result = vkCreateImageView(vkDevice, &dbgImageViewCI, vkAllocator, &pkeDebugHitbox.vkImageView); + assert(result == VK_SUCCESS); /* * 0: #373b3e (55,59,62) // dark grey (desaturated light blue) |