Fix basic triangle example

jherico · Apr 13, 2018 · 37a3f34 · 37a3f34
1 parent dafe948
commit 37a3f34
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/base/glfw/glfw.hpp b/base/glfw/glfw.hpp
@@ -62,7 +62,7 @@ class Window {
     }
 
     void runWindowLoop(const std::function<void()>& frameHandler) {
-        while (0 != glfwWindowShouldClose(window)) {
+        while (0 == glfwWindowShouldClose(window)) {
             glfwPollEvents();
             frameHandler();
         }

diff --git a/examples/triangle/triangle.cpp b/examples/triangle/triangle.cpp
@@ -112,10 +112,16 @@ class TriangleExample : public glfw::Window {
         context.requireDeviceExtensions({ VK_KHR_SWAPCHAIN_EXTENSION_NAME });
         context.createInstance();
 
+        // The `surface` should be created before the Vulkan `device` because the device selection needs to pick a queue 
+        // that will support presentation to the surface
+        auto surface = createSurface(context.instance);
+
+        context.createDevice(surface);
+
         cmdPool = context.getCommandPool();
 
         swapChain.setup(context.physicalDevice, context.device, context.queue, context.queueIndices.graphics);
-        swapChain.setSurface(createSurface(context.instance));
+        swapChain.setSurface(surface);
         swapChain.create(size);
 
         setupRenderPass();