Merge branch 'master' into State_inherit

Author: robertosfield

include/vsg/vk/CommandBuffer.h

@@ -46,8 +46,8 @@ namespace vsg
 
         VkCommandBufferLevel level() const { return _level; }
 
-        /// reset the CommandBuffer for the new frame.
-        void reset();
+        /// reset the CommandBuffer
+        void reset(VkCommandBufferResetFlags flags = 0);
 
         Device* getDevice() { return _device; }
         const Device* getDevice() const { return _device; }

include/vsg/vk/CommandPool.h

@@ -32,7 +32,7 @@ namespace vsg
         const uint32_t queueFamilyIndex;
         const VkCommandPoolCreateFlags flags;
 
-        void reset(VkCommandPoolResetFlags reset_flags = VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT) const { vkResetCommandPool(*_device, _commandPool, reset_flags); }
+        void reset(VkCommandPoolResetFlags reset_flags = 0) const;
 
         /// allocate CommandBuffer from CommandPool
         ref_ptr<CommandBuffer> allocate(VkCommandBufferLevel level = VK_COMMAND_BUFFER_LEVEL_PRIMARY);

src/vsg/vk/CommandBuffer.cpp

@@ -42,12 +42,12 @@ CommandBuffer::~CommandBuffer()
     }
 }
 
-void CommandBuffer::reset()
+void CommandBuffer::reset(VkCommandBufferResetFlags flags)
 {
     _currentPipelineLayout = VK_NULL_HANDLE;
     _currentPushConstantStageFlags = 0;
 
-    _commandPool->reset();
+    vkResetCommandBuffer(_commandBuffer, flags);
 }
 
 void CommandBuffer::setCurrentPipelineLayout(const PipelineLayout* pipelineLayout)

src/vsg/vk/CommandPool.cpp

@@ -68,3 +68,8 @@ void CommandPool::free(CommandBuffer* commandBuffer)
         commandBuffer->_commandBuffer = 0;
     }
 }
+
+void CommandPool::reset(VkCommandPoolResetFlags reset_flags) const
+{
+    vkResetCommandPool(*_device, _commandPool, reset_flags);
+}