Changeset 8667f76 in opengl-game for vulkan-game.cpp

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

File:

• vulkan-game.cpp (modified) (6 diffs)

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) {