Changes in vulkan-game.cpp [e8445f0:cb6fabb] in opengl-game

File:

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

vulkan-game.cpp

@@ -92 +92 @@
    seedRandomNums();
 
+   cout << "DEBUGGING IS " << (ENABLE_VALIDATION_LAYERS ? "ON" : "OFF") << endl;
+
    cout << "Vulkan Game" << endl;
-
-   cout << "DEBUGGING IS " << (ENABLE_VALIDATION_LAYERS ? "ON" : "OFF") << endl;
 
    if (initUI(width, height, guiFlags) == RTWO_ERROR) {
@@ -853 +853 @@
       ImGui::NewFrame();
 
-      (this->*currentRenderScreenFn)(gui->getWindowWidth(), gui->getWindowHeight());
+      int w, h;
+      SDL_GetWindowSize(((GameGui_SDL*)gui)->window, &w, &h);
+
+      // Probably a retina display
+      // TODO: Find a better fix for this. Maybe I should use SDL_Vulkan_GetWindowSize here instead
+      // of SDL_Vulkan_GetDrawableSize
+      if (w < gui->getWindowWidth() && h < gui->getWindowHeight()) {
+         (this->*currentRenderScreenFn)(w, h);
+      } else {
+         (this->*currentRenderScreenFn)(gui->getWindowWidth(), gui->getWindowHeight());
+      }
 
       ImGui::Render();
@@ -1049 +1059 @@
    explosion_UBO.cur_time = curTime;
 
-   VulkanUtils::copyDataToMemory(device, object_VP_mats, uniformBuffersMemory_modelPipeline[imageIndex], 0);
-
-   VulkanUtils::copyDataToMemory(device, ship_VP_mats, uniformBuffersMemory_shipPipeline[imageIndex], 0);
-
-   VulkanUtils::copyDataToMemory(device, asteroid_VP_mats, uniformBuffersMemory_asteroidPipeline[imageIndex], 0);
-
-   VulkanUtils::copyDataToMemory(device, laser_VP_mats, uniformBuffersMemory_laserPipeline[imageIndex], 0);
-
-   VulkanUtils::copyDataToMemory(device, explosion_UBO, uniformBuffersMemory_explosionPipeline[imageIndex], 0);
+   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_modelPipeline[imageIndex], 0, object_VP_mats);
+
+   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_shipPipeline[imageIndex], 0, ship_VP_mats);
+
+   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_asteroidPipeline[imageIndex], 0, asteroid_VP_mats);
+
+   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_laserPipeline[imageIndex], 0, laser_VP_mats);
+
+   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_explosionPipeline[imageIndex], 0, explosion_UBO);
 }