Changeset a8f0577 in opengl-game

Timestamp:

Jul 8, 2019, 5:01:29 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

80de39d

Parents:

7dcd925

Message:

Fix validation layer integration

Files:

• makefile (modified) (3 diffs)
• vulkan-game-ref.cpp (deleted)
• vulkan-game.cpp (modified) (6 diffs)

makefile

@@ -34 +34 @@
         $(CC) $^ $(DEP) $(CFLAGS) -o $@
 
-CXX_FLAGS = -std=c++17 -Wall -pedantic # -O3 -rdynamic
+CXX_FLAGS = -std=c++17 -Wall -pedantic# -O3 -rdynamic
 
 ifeq ($(OS),Darwin)
@@ -51 +51 @@
 endif
 
-LIBS = -lSDL2
+LIBS = `pkg-config --static --libs sdl2`
 ifeq ($(OS),Darwin)
         LIBS := $(VULKAN_SDK_PATH)/lib/libvulkan.dylib $(LIBS)
@@ -61 +61 @@
 LIB_FLAGS = $(LIB_PATHS) $(LIBS)
 
-vulkangame: vulkan-game-ref.cpp #vulkan-game.cpp game-gui-sdl.cpp
+vulkangame: vulkan-game.cpp game-gui-sdl.cpp
         $(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS)
 

vulkan-game.cpp

@@ -20 +20 @@
 using namespace std;
 using namespace glm;
-
-bool checkValidationLayerSupport();
-vector<const char*> getRequiredExtensions(SDL_Window* window);
 
 const int SCREEN_WIDTH = 800;
@@ -68 +65 @@
          }
          initVulkan();
-         createInstance();
          mainLoop();
          cleanup();
@@ -125 +121 @@
          createInfo.pApplicationInfo = &appInfo;
 
-         auto extensions = getRequiredExtensions(window);
+         vector<const char*> extensions = getRequiredExtensions();
          createInfo.enabledExtensionCount = static_cast<uint32_t>(extensions.size());
          createInfo.ppEnabledExtensionNames = extensions.data();
@@ -156 +152 @@
       }
 
+      bool checkValidationLayerSupport() {
+         uint32_t layerCount;
+         vkEnumerateInstanceLayerProperties(&layerCount, nullptr);
+
+         vector<VkLayerProperties> availableLayers(layerCount);
+         vkEnumerateInstanceLayerProperties(&layerCount, availableLayers.data());
+
+         for (const char* layerName : validationLayers) {
+            bool layerFound = false;
+
+            for (const auto& layerProperties : availableLayers) {
+               if (strcmp(layerName, layerProperties.layerName) == 0) {
+                  layerFound = true;
+                  break;
+               }
+            }
+
+            if (!layerFound) {
+               return false;
+            }
+         }
+
+         return true;
+      }
+
+      vector<const char*> getRequiredExtensions() {
+         uint32_t extensionCount = 0;
+         SDL_Vulkan_GetInstanceExtensions(window, &extensionCount, nullptr);
+
+         vector<const char*> extensions(extensionCount);
+         SDL_Vulkan_GetInstanceExtensions(window, &extensionCount, extensions.data());
+
+         if (enableValidationLayers) {
+            extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
+         }
+
+         return extensions;
+      }
+
       void mainLoop() {
          // TODO: Create some generic event-handling functions in game-gui-*
@@ -204 +239 @@
       }
 };
-
-vector<const char*> getRequiredExtensions(SDL_Window* window) {
-   uint32_t extensionCount;
-   SDL_Vulkan_GetInstanceExtensions(window, &extensionCount, nullptr);
-
-   vector<const char*> extensions(extensionCount);
-   SDL_Vulkan_GetInstanceExtensions(window, &extensionCount, extensions.data());
-
-   if (enableValidationLayers) {
-      extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
-   }
-
-   return extensions;
-}
-
-bool checkValidationLayerSupport() {
-   uint32_t layerCount;
-   vkEnumerateInstanceLayerProperties(&layerCount, nullptr);
-
-   vector<VkLayerProperties> availableLayers(layerCount);
-   vkEnumerateInstanceLayerProperties(&layerCount, availableLayers.data());
-
-   for (const char* layerName : validationLayers) {
-      bool layerFound = false;
-
-      for (const auto& layerProperties : availableLayers) {
-         if (strcmp(layerName, layerProperties.layerName) == 0) {
-            layerFound = true;
-            break;
-         }
-      }
-
-      if (!layerFound) {
-         return false;
-      }
-   }
-
-   return true;
-}
 
 int main() {
@@ -251 +247 @@
    cout << "DEBUGGING IS ON" << endl;
 #endif
+
    /*
    mat4 matrix;