Index: vulkan-game.cpp
===================================================================
--- vulkan-game.cpp	(revision 88ebdc83080ccaca68fabaf59ab879ce5e2eb2f0)
+++ vulkan-game.cpp	(revision f5d5686168e47cbab6259ae2addd03d7f505575e)
@@ -173,7 +173,11 @@
       VkPipelineLayout pipelineLayout;
       VkPipeline graphicsPipeline;
-      VkCommandPool commandPool;
       VkDescriptorPool descriptorPool;
       vector<VkDescriptorSet> descriptorSets;
+
+      VkCommandPool commandPool;
+
+      VkImage textureImage;
+      VkDeviceMemory textureImageMemory;
 
       VkBuffer vertexBuffer;
@@ -192,7 +196,4 @@
       vector<VkSemaphore> renderFinishedSemaphores;
       vector<VkFence> inFlightFences;
-
-      VkImage textureImage;
-      VkDeviceMemory textureImageMemory;
 
       size_t currentFrame = 0;
@@ -960,9 +961,10 @@
 
          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,5 +1001,6 @@
       }
 
-      void transitionImageLayout(VkImage image, VkFormat format, VkImageLayout oldLayout, VkImageLayout newLayout) {
+      void transitionImageLayout(VkImage image, VkFormat format, VkImageLayout oldLayout,
+            VkImageLayout newLayout) {
          VkCommandBuffer commandBuffer = beginSingleTimeCommands();
 
@@ -1014,7 +1017,7 @@
          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,5 +1039,5 @@
          vkCmdPipelineBarrier(
             commandBuffer,
-            sourceFlags, destinationFlags,
+            sourceStage, destinationStage,
             0,
             0, nullptr,
@@ -1053,10 +1056,8 @@
          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,5 +1460,5 @@
 
          vkDestroyImage(device, textureImage, nullptr);
-         vkDestroyMemory(device, textureImageMemory, nullptr);
+         vkFreeMemory(device, textureImageMemory, nullptr);
 
          vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);