mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #619 from jonpikum/glfw-vulkan-demo

Browse Source 
Minor fixes for GLFW Vulkan Demo
This commit is contained in:
Rob Loach 2024-04-04 13:07:10 -04:00 committed by GitHub
commit d1fa8f7614
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demo/glfw_vulkan/main.c
View File

@ -758,7 +758,6 @@ bool create_swap_chain(struct vulkan_demo *demo) {
VkResult result; VkResult result;
VkSwapchainCreateInfoKHR create_info; VkSwapchainCreateInfoKHR create_info;
uint32_t queue_family_indices[2]; uint32_t queue_family_indices[2];
uint32_t old_swap_chain_images_len;
bool ret = false; bool ret = false;
queue_family_indices[0] = (uint32_t)demo->indices.graphics; queue_family_indices[0] = (uint32_t)demo->indices.graphics;
@ -815,22 +814,12 @@ bool create_swap_chain(struct vulkan_demo *demo) {
goto cleanup; goto cleanup;
} }
old_swap_chain_images_len = demo->swap_chain_images_len;
result = vkGetSwapchainImagesKHR(demo->device, demo->swap_chain, result = vkGetSwapchainImagesKHR(demo->device, demo->swap_chain,
&demo->swap_chain_images_len, NULL); &demo->swap_chain_images_len, NULL);
if (result != VK_SUCCESS) { if (result != VK_SUCCESS) {
fprintf(stderr, "vkGetSwapchainImagesKHR failed: %d\n", result); fprintf(stderr, "vkGetSwapchainImagesKHR failed: %d\n", result);
goto cleanup; goto cleanup;
} }
if (old_swap_chain_images_len > 0 &&
old_swap_chain_images_len != demo->swap_chain_images_len) {
fprintf(stderr,
"number of assigned swap chain images changed between "
"runs. old: %u, new: %u\n",
(unsigned)old_swap_chain_images_len,
(unsigned)demo->swap_chain_images_len);
goto cleanup;
}
if (demo->swap_chain_images == NULL) { if (demo->swap_chain_images == NULL) {
demo->swap_chain_images = demo->swap_chain_images =
malloc(demo->swap_chain_images_len * sizeof(VkImage)); malloc(demo->swap_chain_images_len * sizeof(VkImage));
@ -2219,7 +2208,7 @@ int main(void) {
if (result == VK_ERROR_OUT_OF_DATE_KHR) { if (result == VK_ERROR_OUT_OF_DATE_KHR) {
continue; continue;
} }
if (result != VK_SUCCESS) { if (result != VK_SUCCESS && result != VK_SUBOPTIMAL_KHR) {
fprintf(stderr, "vkAcquireNextImageKHR failed: %d\n", result); fprintf(stderr, "vkAcquireNextImageKHR failed: %d\n", result);
return false; return false;
} }