Changeset 8667f76 in opengl-game

Timestamp:

Jul 19, 2019, 9:49:52 PM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

80edd70

Parents:

0e6ecf3

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (07/19/19 21:45:27)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (07/19/19 21:49:52)

Message:

Move getWindowSize and getRequiredExtensions to the game gui

Files:

• game-gui-glfw.cpp (modified) (1 diff)
• game-gui-glfw.hpp (modified) (1 diff)
• game-gui-sdl.cpp (modified) (1 diff)
• game-gui-sdl.hpp (modified) (1 diff)
• game-gui.hpp (modified) (2 diffs)
• vulkan-game.cpp (modified) (6 diffs)

game-gui-glfw.cpp

@@ -26 +26 @@
       RTWO_SUCCESS : RTWO_ERROR;
 }
+
+vector<const char*> GameGui_GLFW::GetRequiredExtensions() {
+   uint32_t glfwExtensionCount = 0;
+   const char** glfwExtensions;
+
+   glfwExtensions = glfwGetRequiredInstanceExtensions(&glfwExtensionCount);
+
+   vector<const char*> extensions(glfwExtensions, glfwExtensions + glfwExtensionCount);
+
+   return extensions;
+}
+
+void GameGui_GLFW::GetWindowSize(int* width, int* height) {
+   glfwGetFramebufferSize(window, width, height);
+}

game-gui-glfw.hpp

@@ -16 +16 @@
 
       bool CreateVulkanSurface(VkInstance instance, VkSurfaceKHR* surface);
+      vector<const char*> GetRequiredExtensions();
+      void GetWindowSize(int* width, int* height);
 
    private:

game-gui-sdl.cpp

@@ -37 +37 @@
       RTWO_SUCCESS : RTWO_ERROR;
 }
+
+vector<const char*> GameGui_SDL::GetRequiredExtensions() {
+   uint32_t extensionCount = 0;
+   SDL_Vulkan_GetInstanceExtensions(window, &extensionCount, nullptr);
+
+   vector<const char*> extensions(extensionCount);
+   SDL_Vulkan_GetInstanceExtensions(window, &extensionCount, extensions.data());
+
+   return extensions;
+}
+
+void GameGui_SDL::GetWindowSize(int* width, int* height) {
+   SDL_GetWindowSize(window, width, height);
+}

game-gui-sdl.hpp

@@ -16 +16 @@
 
       bool CreateVulkanSurface(VkInstance instance, VkSurfaceKHR* surface);
+      vector<const char*> GetRequiredExtensions();
+      void GetWindowSize(int* width, int* height);
 
    private:

game-gui.hpp

@@ -5 +5 @@
 
 #include <string>
+#include <vector>
 
 using namespace std;
@@ -21 +22 @@
       virtual void DestroyWindow() = 0;
 
-      virtual bool CreateVulkanSurface(VkInstance instance, VkSurfaceKHR* surface) = 0; 
+      virtual bool CreateVulkanSurface(VkInstance instance, VkSurfaceKHR* surface) = 0;
+      virtual vector<const char*> GetRequiredExtensions() = 0;
+      virtual void GetWindowSize(int* width, int* height) = 0;
 };
 

vulkan-game.cpp

@@ -14 +14 @@
 #include <optional>
 #include <set>
-#include <vector>
 
 using namespace std;
@@ -125 +124 @@
       bool framebufferResized = false;
 
-      // both SDL and GLFW create window functions return NULL on failure
       bool initWindow() {
          if (gui->Init() == RTWO_ERROR) {
@@ -160 +158 @@
       void recreateSwapChain() {
          int width = 0, height = 0;
-         SDL_GetWindowSize(window, &width, &height);
+         gui->GetWindowSize(&width, &height);
 
          while (width == 0 || height == 0 ||
             (SDL_GetWindowFlags(window) & SDL_WINDOW_MINIMIZED) != 0) {
             SDL_WaitEvent(nullptr);
-            SDL_GetWindowSize(window, &width, &height);
+            gui->GetWindowSize(&width, &height);
          }
 
@@ -219 +217 @@
          createInfo.ppEnabledExtensionNames = extensions.data();
 
-         cout << endl << "SDL extensions:" << endl;
+         cout << endl << "Extensions:" << endl;
          for (const char* extensionName : extensions) {
             cout << extensionName << endl;
@@ -488 +486 @@
          } else {
             int width, height;
-            SDL_GetWindowSize(window, &width, &height);
+            gui->GetWindowSize(&width, &height);
 
             VkExtent2D actualExtent = {
@@ -511 +509 @@
 
       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());
+         vector<const char*> extensions = gui->GetRequiredExtensions();
 
          if (enableValidationLayers) {