Switching to ezvcpkg build

CMakeLists.txt

@@ -3,6 +3,12 @@ cmake_policy(VERSION 3.6)
 include("cmake/defaults.cmake")
 set(NAME VulkanCppExamples)
 
+include("cmake/ezvcpkg.cmake")
+
+ezvcpkg_fetch(
+    PACKAGES assimp basisu imgui glad glfw3 gli glm vulkan 
+    UPDATE_TOOLCHAIN
+)
 
 project(${NAME})
 

base/CMakeLists.txt

@@ -25,8 +25,8 @@ file(GLOB_RECURSE COMMON_SOURCE *.c *.cpp *.h *.hpp)
 add_library(${TARGET_NAME} STATIC ${COMMON_SOURCE})
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "common")
 add_dependencies(${TARGET_NAME} shaders)
-target_link_libraries(${TARGET_NAME} imgui)
 
+target_basisu()
 target_glfw3()
 target_glm()
 target_gli()
@@ -37,5 +37,5 @@ target_glad()
 
 if (ANDROID)
     add_dependencies(${TARGET_NAME} app-glue)
-    target_link_libraries(${TARGET_NAME} app-glue android log m)
+    target_link_libraries(${TARGET_NAME} PRIVATE app-glue android log m)
 endif()

base/gl.cpp

@@ -95,6 +95,6 @@ static void debugMessageCallback(GLenum source, GLenum type, GLuint id, GLenum s
 
 void gl::setupDebugLogging() {
     glDebugMessageCallback(debugMessageCallback, NULL);
-    glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
+    glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
 }
 #endif

base/ui.cpp

@@ -381,9 +381,11 @@ void UIOverlay::update() {
             context.trash<vks::Buffer>(vertexBuffer);
             vertexBuffer = vks::Buffer();
         }
-        vertexBuffer = context.createBuffer(vk::BufferUsageFlagBits::eVertexBuffer, vk::MemoryPropertyFlagBits::eHostVisible, vertexBufferSize);
-        vertexBuffer.map();
-        updateCmdBuffers = true;
+		if (vertexCount) {
+			vertexBuffer = context.createBuffer(vk::BufferUsageFlagBits::eVertexBuffer, vk::MemoryPropertyFlagBits::eHostVisible, vertexBufferSize);
+			vertexBuffer.map();
+			updateCmdBuffers = true;
+		}
     }
 
     // Index buffer
@@ -394,9 +396,11 @@ void UIOverlay::update() {
             indexBuffer.unmap();
             indexBuffer.destroy();
         }
-        indexBuffer = context.createBuffer(vk::BufferUsageFlagBits::eIndexBuffer, vk::MemoryPropertyFlagBits::eHostVisible, indexBufferSize);
-        indexBuffer.map();
-        updateCmdBuffers = true;
+		if (indexCount) {
+			indexBuffer = context.createBuffer(vk::BufferUsageFlagBits::eIndexBuffer, vk::MemoryPropertyFlagBits::eHostVisible, indexBufferSize);
+			indexBuffer.map();
+			updateCmdBuffers = true;
+		}
     }
 
     // Upload data
@@ -412,8 +416,12 @@ void UIOverlay::update() {
     }
 
     // Flush to make writes visible to GPU
-    vertexBuffer.flush();
-    indexBuffer.flush();
+	if (vertexBuffer) {
+		vertexBuffer.flush();
+    }
+	if (indexBuffer) {
+		indexBuffer.flush();
+	}
 
     if (updateCmdBuffers) {
         updateCommandBuffers();

base/vulkanExampleBase.cpp

@@ -67,20 +67,24 @@ ExampleBase::~ExampleBase() {
 }
 
 void ExampleBase::run() {
+    try {
 // Android initialization is handled in APP_CMD_INIT_WINDOW event
 #if !defined(__ANDROID__)
-    glfwInit();
-    setupWindow();
-    initVulkan();
-    setupSwapchain();
-    prepare();
+        glfwInit();
+        setupWindow();
+        initVulkan();
+        setupSwapchain();
+        prepare();
 #endif
 
-    renderLoop();
+        renderLoop();
 
-    // Once we exit the render loop, wait for everything to become idle before proceeding to the descructor.
-    context.queue.waitIdle();
-    context.device.waitIdle();
+        // Once we exit the render loop, wait for everything to become idle before proceeding to the descructor.
+        context.queue.waitIdle();
+        context.device.waitIdle();
+    } catch(const std::system_error& err) {
+        std::cerr << err.what() << std::endl;
+    }
 }
 
 void ExampleBase::getEnabledFeatures() {
@@ -258,6 +262,8 @@ void ExampleBase::setupUi() {
     overlayCreateInfo.depthformat = depthFormat;
     overlayCreateInfo.size = size;
 
+    ImGui::SetCurrentContext(ImGui::CreateContext());
+
     // Virtual function call for example to customize overlay creation
     OnSetupUIOverlay(overlayCreateInfo);
     ui.create(overlayCreateInfo);
@@ -350,7 +356,7 @@ void ExampleBase::prepareFrame() {
 }
 
 void ExampleBase::submitFrame() {
-    bool submitOverlay = settings.overlay && ui.visible;
+    bool submitOverlay = settings.overlay && ui.visible && (ui.cmdBuffers.size() > currentBuffer);
     if (submitOverlay) {
         vk::SubmitInfo submitInfo;
         // Wait for color attachment output to finish before rendering the text overlay