Changeset f5d5686 in opengl-game

Timestamp:

Jul 26, 2019, 8:23:44 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

621664a

Parents:

88ebdc8

Message:

Fix syntax errors in vulkan-game.cpp

File:

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

vulkan-game.cpp

@@ -173 +173 @@
       VkPipelineLayout pipelineLayout;
       VkPipeline graphicsPipeline;
-      VkCommandPool commandPool;
       VkDescriptorPool descriptorPool;
       vector<VkDescriptorSet> descriptorSets;
+
+      VkCommandPool commandPool;
+
+      VkImage textureImage;
+      VkDeviceMemory textureImageMemory;
 
       VkBuffer vertexBuffer;
@@ -192 +196 @@
       vector<VkSemaphore> renderFinishedSemaphores;
       vector<VkFence> inFlightFences;
-
-      VkImage textureImage;
-      VkDeviceMemory textureImageMemory;
 
       size_t currentFrame = 0;
@@ -960 +961 @@
 
          vkDestroyBuffer(device, stagingBuffer, nullptr);
-         vkDestroyMemory(device, stagingBufferMemory, nullptr);
+         vkFreeMemory(device, stagingBufferMemory, nullptr);
       }
 
       void createImage(uint32_t width, uint32_t height, VkFormat format, VkImageTiling tiling,
-            VkImageUsageFlags usage, VkMemoryPropertyFlags properties, VkImage& image, VkDeviceMemory& imageMemory) {
+            VkImageUsageFlags usage, VkMemoryPropertyFlags properties, VkImage& image,
+            VkDeviceMemory& imageMemory) {
          VkImageCreateInfo imageInfo = {};
          imageInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
@@ -999 +1001 @@
       }
 
-      void transitionImageLayout(VkImage image, VkFormat format, VkImageLayout oldLayout, VkImageLayout newLayout) {
+      void transitionImageLayout(VkImage image, VkFormat format, VkImageLayout oldLayout,
+            VkImageLayout newLayout) {
          VkCommandBuffer commandBuffer = beginSingleTimeCommands();
 
@@ -1014 +1017 @@
          barrier.subresourceRange.baseArrayLayer = 0;
          barrier.subresourceRange.layerCount = 1;
-         
-         VkPipelineStageFlags sourceFlags;
-         VkPipelineStageFlags destinationFlags;
+
+         VkPipelineStageFlags sourceStage;
+         VkPipelineStageFlags destinationStage;
 
          if (oldLayout == VK_IMAGE_LAYOUT_UNDEFINED && newLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) {
@@ -1036 +1039 @@
          vkCmdPipelineBarrier(
             commandBuffer,
-            sourceFlags, destinationFlags,
+            sourceStage, destinationStage,
             0,
             0, nullptr,
@@ -1053 +1056 @@
          region.bufferRowLength = 0;
          region.bufferImageHeight = 0;
-
          region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
          region.imageSubresource.mipLevel = 0;
          region.imageSubresource.baseArrayLayer = 0;
          region.imageSubresource.layerCount = 1;
-
          region.imageOffset = { 0, 0, 0 };
          region.imageExtent = { width, height, 1 };
@@ -1459 +1460 @@
 
          vkDestroyImage(device, textureImage, nullptr);
-         vkDestroyMemory(device, textureImageMemory, nullptr);
+         vkFreeMemory(device, textureImageMemory, nullptr);
 
          vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);