Changeset c1c2021 in opengl-game for vulkan-ref.cpp

Timestamp:

Sep 23, 2019, 12:32:48 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

502bd0b

Parents:

a0c5f28

Message:

In vulkangame, add code to create a logical device

File:

• vulkan-ref.cpp (modified) (12 diffs)

vulkan-ref.cpp

@@ -164 +164 @@
 
       VkPhysicalDevice physicalDevice = VK_NULL_HANDLE;
-/*** END OF REFACTORED CODE ***/
       VkDevice device;
 
       VkQueue graphicsQueue;
       VkQueue presentQueue;
+/*** END OF REFACTORED CODE ***/
 
       VkSwapchainKHR swapChain;
@@ -316 +316 @@
          createSurface();
          pickPhysicalDevice();
+         createLogicalDevice();
 /*** END OF REFACTORED CODE ***/
-         createLogicalDevice();
          createSwapChain();
          createImageViews();
@@ -561 +561 @@
          return requiredExtensions.empty();
       }
-/*** END OF REFACTORED CODE ***/
 
       void createLogicalDevice() {
@@ -609 +608 @@
          vkGetDeviceQueue(device, indices.presentFamily.value(), 0, &presentQueue);
       }
+/*** END OF REFACTORED CODE ***/
 
       void createSwapChain() {
@@ -1674 +1674 @@
       }
 
+/*** START OF REFACTORED CODE ***/
       void mainLoop() {
          // TODO: Create some generic event-handling functions in game-gui-*
@@ -1690 +1691 @@
                   quit = true;
                }
+/*** END OF REFACTORED CODE ***/
                if (e.type == SDL_WINDOWEVENT) {
                   if (e.window.event == SDL_WINDOWEVENT_SIZE_CHANGED ||
@@ -1696 +1698 @@
                   }
                }
+/*** START OF REFACTORED CODE ***/
             }
 
@@ -1705 +1708 @@
          vkDeviceWaitIdle(device);
       }
+/*** END OF REFACTORED CODE ***/
 
       void drawFrame() {
@@ -1853 +1857 @@
       }
 
+/*** START OF REFACTORED CODE ***/
       void cleanup() {
          cleanupSwapChain();
+/*** END OF REFACTORED CODE ***/
 
          vkDestroySampler(device, textureSampler, nullptr);
@@ -1880 +1886 @@
 
          vkDestroyCommandPool(device, commandPool, nullptr);
+/*** START OF REFACTORED CODE ***/
          vkDestroyDevice(device, nullptr);
          vkDestroySurfaceKHR(instance, surface, nullptr);
 
-/*** START OF REFACTORED CODE ***/
          if (enableValidationLayers) {
             DestroyDebugUtilsMessengerEXT(instance, debugMessenger, nullptr);
@@ -1919 +1925 @@
          gui->shutdown();
          delete gui;
+      }
+
+      void cleanupSwapChain() {
 /*** END OF REFACTORED CODE ***/
-      }
-
-      void cleanupSwapChain() {
          vkDestroyImageView(device, depthImageView, nullptr);
          vkDestroyImage(device, depthImage, nullptr);
@@ -1948 +1954 @@
             vkFreeMemory(device, uniformBuffersMemory[i], nullptr);
          }
-      }
+/*** START OF REFACTORED CODE ***/
+      }
+/*** END OF REFACTORED CODE ***/
 
       void cleanupPipeline(GraphicsPipelineInfo& pipeline) {