From 37d04f3be5a1de30b8ab4a4780b0e96667c17521 Mon Sep 17 00:00:00 2001 From: plapins Date: Mon, 20 Jun 2016 16:26:40 +0200 Subject: [PATCH] Fixed uninitialized variable problem in Tutorial05 and formatting (unnecessary spaces) in tutorials 04 and 05. --- Project/Tutorial04/Tutorial04.cpp | 2 +- Project/Tutorial05/Tutorial05.cpp | 4 ++-- Project/Tutorial05/Tutorial05.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Project/Tutorial04/Tutorial04.cpp b/Project/Tutorial04/Tutorial04.cpp index c75b4e7..2ab92c3 100644 --- a/Project/Tutorial04/Tutorial04.cpp +++ b/Project/Tutorial04/Tutorial04.cpp @@ -649,7 +649,7 @@ namespace ApiWithoutSecrets { return false; } - if( !PrepareFrame( current_rendering_resource.CommandBuffer, GetSwapChain( ).Images[image_index], current_rendering_resource.Framebuffer ) ) { + if( !PrepareFrame( current_rendering_resource.CommandBuffer, GetSwapChain().Images[image_index], current_rendering_resource.Framebuffer ) ) { return false; } diff --git a/Project/Tutorial05/Tutorial05.cpp b/Project/Tutorial05/Tutorial05.cpp index 40cf9bd..fb3b411 100644 --- a/Project/Tutorial05/Tutorial05.cpp +++ b/Project/Tutorial05/Tutorial05.cpp @@ -521,7 +521,7 @@ namespace ApiWithoutSecrets { 0, // VkDeviceSize dstOffset Vulkan.VertexBuffer.Size // VkDeviceSize size }; - vkCmdCopyBuffer(command_buffer, Vulkan.StagingBuffer.Handle, Vulkan.VertexBuffer.Handle, 1, &buffer_copy_info); + vkCmdCopyBuffer( command_buffer, Vulkan.StagingBuffer.Handle, Vulkan.VertexBuffer.Handle, 1, &buffer_copy_info ); VkBufferMemoryBarrier buffer_memory_barrier = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, // VkStructureType sType; @@ -728,7 +728,7 @@ namespace ApiWithoutSecrets { return false; } - if( !PrepareFrame( current_rendering_resource.CommandBuffer, GetSwapChain( ).Images[image_index], current_rendering_resource.Framebuffer ) ) { + if( !PrepareFrame( current_rendering_resource.CommandBuffer, GetSwapChain().Images[image_index], current_rendering_resource.Framebuffer ) ) { return false; } diff --git a/Project/Tutorial05/Tutorial05.h b/Project/Tutorial05/Tutorial05.h index ac7c556..b690f67 100644 --- a/Project/Tutorial05/Tutorial05.h +++ b/Project/Tutorial05/Tutorial05.h @@ -83,6 +83,7 @@ namespace ApiWithoutSecrets { RenderPass( VK_NULL_HANDLE ), GraphicsPipeline( VK_NULL_HANDLE ), VertexBuffer(), + StagingBuffer(), CommandPool( VK_NULL_HANDLE ), RenderingResources( ResourcesCount ) { }