Merge branch 'master' into examples_refactor

This commit is contained in:
omar
2018-02-20 16:18:02 +01:00
14 changed files with 123 additions and 62 deletions

View File

@ -26,7 +26,7 @@
#include "imgui.h"
#include "imgui_impl_vulkan.h"
// Vulkan Data
// Vulkan data
static VkAllocationCallbacks* g_Allocator = NULL;
static VkPhysicalDevice g_Gpu = VK_NULL_HANDLE;
static VkDevice g_Device = VK_NULL_HANDLE;
@ -703,7 +703,6 @@ bool ImGui_ImplVulkan_Init(ImGui_ImplVulkan_InitData *init_data)
g_CheckVkResult = init_data->check_vk_result;
ImGui_ImplVulkan_CreateDeviceObjects();
return true;
}