diff --git a/base/VulkanBuffer.cpp b/base/VulkanBuffer.cpp new file mode 100644 index 00000000..cbab771a --- /dev/null +++ b/base/VulkanBuffer.cpp @@ -0,0 +1,137 @@ +/* +* Vulkan buffer class +* +* Encapsulates a Vulkan buffer +* +* Copyright (C) 2016 by Sascha Willems - www.saschawillems.de +* +* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) +*/ + +#pragma once + +#include "VulkanBuffer.h" + +namespace vks +{ + /** + * Map a memory range of this buffer. If successful, mapped points to the specified buffer range. + * + * @param size (Optional) Size of the memory range to map. Pass VK_WHOLE_SIZE to map the complete buffer range. + * @param offset (Optional) Byte offset from beginning + * + * @return VkResult of the buffer mapping call + */ + VkResult Buffer::map(VkDeviceSize size, VkDeviceSize offset) + { + return vkMapMemory(device, memory, offset, size, 0, &mapped); + } + + /** + * Unmap a mapped memory range + * + * @note Does not return a result as vkUnmapMemory can't fail + */ + void Buffer::unmap() + { + if (mapped) + { + vkUnmapMemory(device, memory); + mapped = nullptr; + } + } + + /** + * Attach the allocated memory block to the buffer + * + * @param offset (Optional) Byte offset (from the beginning) for the memory region to bind + * + * @return VkResult of the bindBufferMemory call + */ + VkResult Buffer::bind(VkDeviceSize offset) + { + return vkBindBufferMemory(device, buffer, memory, offset); + } + + /** + * Setup the default descriptor for this buffer + * + * @param size (Optional) Size of the memory range of the descriptor + * @param offset (Optional) Byte offset from beginning + * + */ + void Buffer::setupDescriptor(VkDeviceSize size, VkDeviceSize offset) + { + descriptor.offset = offset; + descriptor.buffer = buffer; + descriptor.range = size; + } + + /** + * Copies the specified data to the mapped buffer + * + * @param data Pointer to the data to copy + * @param size Size of the data to copy in machine units + * + */ + void Buffer::copyTo(void* data, VkDeviceSize size) + { + assert(mapped); + memcpy(mapped, data, size); + } + + /** + * Flush a memory range of the buffer to make it visible to the device + * + * @note Only required for non-coherent memory + * + * @param size (Optional) Size of the memory range to flush. Pass VK_WHOLE_SIZE to flush the complete buffer range. + * @param offset (Optional) Byte offset from beginning + * + * @return VkResult of the flush call + */ + VkResult Buffer::flush(VkDeviceSize size, VkDeviceSize offset) + { + VkMappedMemoryRange mappedRange = {}; + mappedRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; + mappedRange.memory = memory; + mappedRange.offset = offset; + mappedRange.size = size; + return vkFlushMappedMemoryRanges(device, 1, &mappedRange); + } + + /** + * Invalidate a memory range of the buffer to make it visible to the host + * + * @note Only required for non-coherent memory + * + * @param size (Optional) Size of the memory range to invalidate. Pass VK_WHOLE_SIZE to invalidate the complete buffer range. + * @param offset (Optional) Byte offset from beginning + * + * @return VkResult of the invalidate call + */ + VkResult Buffer::invalidate(VkDeviceSize size, VkDeviceSize offset) + { + VkMappedMemoryRange mappedRange = {}; + mappedRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; + mappedRange.memory = memory; + mappedRange.offset = offset; + mappedRange.size = size; + return vkInvalidateMappedMemoryRanges(device, 1, &mappedRange); + } + + /** + * Release all Vulkan resources held by this buffer + */ + void Buffer::destroy() + { + if (buffer) + { + vkDestroyBuffer(device, buffer, nullptr); + } + if (memory) + { + vkFreeMemory(device, memory, nullptr); + } + } +}; diff --git a/base/VulkanBuffer.h b/base/VulkanBuffer.h new file mode 100644 index 00000000..bd2a421f --- /dev/null +++ b/base/VulkanBuffer.h @@ -0,0 +1,46 @@ +/* +* Vulkan buffer class +* +* Encapsulates a Vulkan buffer +* +* Copyright (C) 2016 by Sascha Willems - www.saschawillems.de +* +* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) +*/ + +#pragma once + +#include + +#include "vulkan/vulkan.h" +#include "VulkanTools.h" + +namespace vks +{ + /** + * @brief Encapsulates access to a Vulkan buffer backed up by device memory + * @note To be filled by an external source like the VulkanDevice + */ + struct Buffer + { + VkDevice device; + VkBuffer buffer = VK_NULL_HANDLE; + VkDeviceMemory memory = VK_NULL_HANDLE; + VkDescriptorBufferInfo descriptor; + VkDeviceSize size = 0; + VkDeviceSize alignment = 0; + void* mapped = nullptr; + /** @brief Usage flags to be filled by external source at buffer creation (to query at some later point) */ + VkBufferUsageFlags usageFlags; + /** @brief Memory property flags to be filled by external source at buffer creation (to query at some later point) */ + VkMemoryPropertyFlags memoryPropertyFlags; + VkResult map(VkDeviceSize size = VK_WHOLE_SIZE, VkDeviceSize offset = 0); + void unmap(); + VkResult bind(VkDeviceSize offset = 0); + void setupDescriptor(VkDeviceSize size = VK_WHOLE_SIZE, VkDeviceSize offset = 0); + void copyTo(void* data, VkDeviceSize size); + VkResult flush(VkDeviceSize size = VK_WHOLE_SIZE, VkDeviceSize offset = 0); + VkResult invalidate(VkDeviceSize size = VK_WHOLE_SIZE, VkDeviceSize offset = 0); + void destroy(); + }; +} \ No newline at end of file diff --git a/base/VulkanBuffer.hpp b/base/VulkanBuffer.hpp deleted file mode 100644 index 5a630f22..00000000 --- a/base/VulkanBuffer.hpp +++ /dev/null @@ -1,161 +0,0 @@ -/* -* Vulkan buffer class -* -* Encapsulates a Vulkan buffer -* -* Copyright (C) 2016 by Sascha Willems - www.saschawillems.de -* -* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -*/ - -#pragma once - -#include - -#include "vulkan/vulkan.h" -#include "VulkanTools.h" - -namespace vks -{ - /** - * @brief Encapsulates access to a Vulkan buffer backed up by device memory - * @note To be filled by an external source like the VulkanDevice - */ - struct Buffer - { - VkDevice device; - VkBuffer buffer = VK_NULL_HANDLE; - VkDeviceMemory memory = VK_NULL_HANDLE; - VkDescriptorBufferInfo descriptor; - VkDeviceSize size = 0; - VkDeviceSize alignment = 0; - void* mapped = nullptr; - - /** @brief Usage flags to be filled by external source at buffer creation (to query at some later point) */ - VkBufferUsageFlags usageFlags; - /** @brief Memory property flags to be filled by external source at buffer creation (to query at some later point) */ - VkMemoryPropertyFlags memoryPropertyFlags; - - /** - * Map a memory range of this buffer. If successful, mapped points to the specified buffer range. - * - * @param size (Optional) Size of the memory range to map. Pass VK_WHOLE_SIZE to map the complete buffer range. - * @param offset (Optional) Byte offset from beginning - * - * @return VkResult of the buffer mapping call - */ - VkResult map(VkDeviceSize size = VK_WHOLE_SIZE, VkDeviceSize offset = 0) - { - return vkMapMemory(device, memory, offset, size, 0, &mapped); - } - - /** - * Unmap a mapped memory range - * - * @note Does not return a result as vkUnmapMemory can't fail - */ - void unmap() - { - if (mapped) - { - vkUnmapMemory(device, memory); - mapped = nullptr; - } - } - - /** - * Attach the allocated memory block to the buffer - * - * @param offset (Optional) Byte offset (from the beginning) for the memory region to bind - * - * @return VkResult of the bindBufferMemory call - */ - VkResult bind(VkDeviceSize offset = 0) - { - return vkBindBufferMemory(device, buffer, memory, offset); - } - - /** - * Setup the default descriptor for this buffer - * - * @param size (Optional) Size of the memory range of the descriptor - * @param offset (Optional) Byte offset from beginning - * - */ - void setupDescriptor(VkDeviceSize size = VK_WHOLE_SIZE, VkDeviceSize offset = 0) - { - descriptor.offset = offset; - descriptor.buffer = buffer; - descriptor.range = size; - } - - /** - * Copies the specified data to the mapped buffer - * - * @param data Pointer to the data to copy - * @param size Size of the data to copy in machine units - * - */ - void copyTo(void* data, VkDeviceSize size) - { - assert(mapped); - memcpy(mapped, data, size); - } - - /** - * Flush a memory range of the buffer to make it visible to the device - * - * @note Only required for non-coherent memory - * - * @param size (Optional) Size of the memory range to flush. Pass VK_WHOLE_SIZE to flush the complete buffer range. - * @param offset (Optional) Byte offset from beginning - * - * @return VkResult of the flush call - */ - VkResult flush(VkDeviceSize size = VK_WHOLE_SIZE, VkDeviceSize offset = 0) - { - VkMappedMemoryRange mappedRange = {}; - mappedRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; - mappedRange.memory = memory; - mappedRange.offset = offset; - mappedRange.size = size; - return vkFlushMappedMemoryRanges(device, 1, &mappedRange); - } - - /** - * Invalidate a memory range of the buffer to make it visible to the host - * - * @note Only required for non-coherent memory - * - * @param size (Optional) Size of the memory range to invalidate. Pass VK_WHOLE_SIZE to invalidate the complete buffer range. - * @param offset (Optional) Byte offset from beginning - * - * @return VkResult of the invalidate call - */ - VkResult invalidate(VkDeviceSize size = VK_WHOLE_SIZE, VkDeviceSize offset = 0) - { - VkMappedMemoryRange mappedRange = {}; - mappedRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; - mappedRange.memory = memory; - mappedRange.offset = offset; - mappedRange.size = size; - return vkInvalidateMappedMemoryRanges(device, 1, &mappedRange); - } - - /** - * Release all Vulkan resources held by this buffer - */ - void destroy() - { - if (buffer) - { - vkDestroyBuffer(device, buffer, nullptr); - } - if (memory) - { - vkFreeMemory(device, memory, nullptr); - } - } - - }; -} \ No newline at end of file diff --git a/base/VulkanDevice.hpp b/base/VulkanDevice.hpp index 2d20dc01..4317339f 100644 --- a/base/VulkanDevice.hpp +++ b/base/VulkanDevice.hpp @@ -15,7 +15,7 @@ #include #include "vulkan/vulkan.h" #include "VulkanTools.h" -#include "VulkanBuffer.hpp" +#include "VulkanBuffer.h" namespace vks { diff --git a/base/VulkanHeightmap.hpp b/base/VulkanHeightmap.hpp index 96da0685..37d11c64 100644 --- a/base/VulkanHeightmap.hpp +++ b/base/VulkanHeightmap.hpp @@ -11,7 +11,7 @@ #include "vulkan/vulkan.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" +#include "VulkanBuffer.h" #include #include diff --git a/base/VulkanTexture.hpp b/base/VulkanTexture.hpp index 9ac5c62e..2c37a881 100644 --- a/base/VulkanTexture.hpp +++ b/base/VulkanTexture.hpp @@ -20,7 +20,7 @@ #include "VulkanTools.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" +#include "VulkanBuffer.h" #if defined(__ANDROID__) #include diff --git a/base/VulkanUIOverlay.h b/base/VulkanUIOverlay.h index 42b17b9b..754d4c89 100644 --- a/base/VulkanUIOverlay.h +++ b/base/VulkanUIOverlay.h @@ -19,7 +19,7 @@ #include #include "VulkanTools.h" #include "VulkanDebug.h" -#include "VulkanBuffer.hpp" +#include "VulkanBuffer.h" #include "VulkanDevice.hpp" #include "../external/imgui/imgui.h" diff --git a/base/vulkanexamplebase.h b/base/vulkanexamplebase.h index 66119c66..0e2a5d67 100644 --- a/base/vulkanexamplebase.h +++ b/base/vulkanexamplebase.h @@ -48,6 +48,7 @@ #include "VulkanDebug.h" #include "VulkanUIOverlay.h" #include "VulkanSwapChain.h" +#include "VulkanBuffer.h" #include "VulkanInitializers.hpp" #include "VulkanDevice.hpp" diff --git a/examples/bloom/bloom.cpp b/examples/bloom/bloom.cpp index 02276ab9..ba949b7b 100644 --- a/examples/bloom/bloom.cpp +++ b/examples/bloom/bloom.cpp @@ -21,7 +21,6 @@ #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" -#include "VulkanBuffer.hpp" #define ENABLE_VALIDATION false diff --git a/examples/computecullandlod/computecullandlod.cpp b/examples/computecullandlod/computecullandlod.cpp index 7f8fdbbe..b18f811f 100644 --- a/examples/computecullandlod/computecullandlod.cpp +++ b/examples/computecullandlod/computecullandlod.cpp @@ -22,7 +22,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #include "frustum.hpp" diff --git a/examples/computeshader/computeshader.cpp b/examples/computeshader/computeshader.cpp index e9a3e081..b9e5416f 100644 --- a/examples/computeshader/computeshader.cpp +++ b/examples/computeshader/computeshader.cpp @@ -20,7 +20,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" -#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false diff --git a/examples/conservativeraster/conservativeraster.cpp b/examples/conservativeraster/conservativeraster.cpp index f247f77d..e6292b9c 100644 --- a/examples/conservativeraster/conservativeraster.cpp +++ b/examples/conservativeraster/conservativeraster.cpp @@ -23,7 +23,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #define ENABLE_VALIDATION false diff --git a/examples/debugmarker/debugmarker.cpp b/examples/debugmarker/debugmarker.cpp index dbb7fff0..6d065034 100644 --- a/examples/debugmarker/debugmarker.cpp +++ b/examples/debugmarker/debugmarker.cpp @@ -25,7 +25,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #define ENABLE_VALIDATION false diff --git a/examples/deferred/deferred.cpp b/examples/deferred/deferred.cpp index 1e74b392..3e9bc1ef 100644 --- a/examples/deferred/deferred.cpp +++ b/examples/deferred/deferred.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/deferredmultisampling/deferredmultisampling.cpp b/examples/deferredmultisampling/deferredmultisampling.cpp index 2c58bedc..ccd7309e 100644 --- a/examples/deferredmultisampling/deferredmultisampling.cpp +++ b/examples/deferredmultisampling/deferredmultisampling.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanFrameBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/deferredshadows/deferredshadows.cpp b/examples/deferredshadows/deferredshadows.cpp index 4f191c1e..12876ac1 100644 --- a/examples/deferredshadows/deferredshadows.cpp +++ b/examples/deferredshadows/deferredshadows.cpp @@ -20,7 +20,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanFrameBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/descriptorindexing/descriptorindexing.cpp b/examples/descriptorindexing/descriptorindexing.cpp index 8cc5a916..152075c3 100644 --- a/examples/descriptorindexing/descriptorindexing.cpp +++ b/examples/descriptorindexing/descriptorindexing.cpp @@ -24,7 +24,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" -#include "VulkanBuffer.hpp" #define ENABLE_VALIDATION false diff --git a/examples/displacement/displacement.cpp b/examples/displacement/displacement.cpp index 1f2a9692..3f811965 100644 --- a/examples/displacement/displacement.cpp +++ b/examples/displacement/displacement.cpp @@ -21,7 +21,6 @@ #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" -#include "VulkanBuffer.hpp" #define ENABLE_VALIDATION false diff --git a/examples/distancefieldfonts/distancefieldfonts.cpp b/examples/distancefieldfonts/distancefieldfonts.cpp index 17f1c34d..337196b5 100644 --- a/examples/distancefieldfonts/distancefieldfonts.cpp +++ b/examples/distancefieldfonts/distancefieldfonts.cpp @@ -24,7 +24,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" -#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false diff --git a/examples/dynamicuniformbuffer/dynamicuniformbuffer.cpp b/examples/dynamicuniformbuffer/dynamicuniformbuffer.cpp index 7d0fae1d..f2e12161 100644 --- a/examples/dynamicuniformbuffer/dynamicuniformbuffer.cpp +++ b/examples/dynamicuniformbuffer/dynamicuniformbuffer.cpp @@ -32,7 +32,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false diff --git a/examples/gears/vulkangear.h b/examples/gears/vulkangear.h index 3a59b41a..b34f78b9 100644 --- a/examples/gears/vulkangear.h +++ b/examples/gears/vulkangear.h @@ -22,7 +22,6 @@ #include "vulkan/vulkan.h" #include "VulkanTools.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" struct Vertex { diff --git a/examples/hdr/hdr.cpp b/examples/hdr/hdr.cpp index e23bb550..8052cf6f 100644 --- a/examples/hdr/hdr.cpp +++ b/examples/hdr/hdr.cpp @@ -21,7 +21,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #include "VulkanTexture.hpp" diff --git a/examples/imgui/main.cpp b/examples/imgui/main.cpp index 0f54426f..ab53e1b5 100644 --- a/examples/imgui/main.cpp +++ b/examples/imgui/main.cpp @@ -24,7 +24,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #define ENABLE_VALIDATION false diff --git a/examples/indirectdraw/indirectdraw.cpp b/examples/indirectdraw/indirectdraw.cpp index 8ff7d685..f35d3ff6 100644 --- a/examples/indirectdraw/indirectdraw.cpp +++ b/examples/indirectdraw/indirectdraw.cpp @@ -34,7 +34,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/inlineuniformblocks/inlineuniformblocks.cpp b/examples/inlineuniformblocks/inlineuniformblocks.cpp index 9576d0bc..eff84c9e 100644 --- a/examples/inlineuniformblocks/inlineuniformblocks.cpp +++ b/examples/inlineuniformblocks/inlineuniformblocks.cpp @@ -23,7 +23,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #define ENABLE_VALIDATION false diff --git a/examples/instancing/instancing.cpp b/examples/instancing/instancing.cpp index 63afe13f..a86d7d49 100644 --- a/examples/instancing/instancing.cpp +++ b/examples/instancing/instancing.cpp @@ -21,7 +21,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/multisampling/multisampling.cpp b/examples/multisampling/multisampling.cpp index ede1e933..232e675b 100644 --- a/examples/multisampling/multisampling.cpp +++ b/examples/multisampling/multisampling.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/nv_ray_tracing_basic/nv_ray_tracing_basic.cpp b/examples/nv_ray_tracing_basic/nv_ray_tracing_basic.cpp index 74549e1f..4b3ea16c 100644 --- a/examples/nv_ray_tracing_basic/nv_ray_tracing_basic.cpp +++ b/examples/nv_ray_tracing_basic/nv_ray_tracing_basic.cpp @@ -20,7 +20,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" // Ray tracing acceleration structure struct AccelerationStructure { diff --git a/examples/nv_ray_tracing_reflections/nv_ray_tracing_reflections.cpp b/examples/nv_ray_tracing_reflections/nv_ray_tracing_reflections.cpp index 0827f9f2..414a74f0 100644 --- a/examples/nv_ray_tracing_reflections/nv_ray_tracing_reflections.cpp +++ b/examples/nv_ray_tracing_reflections/nv_ray_tracing_reflections.cpp @@ -22,7 +22,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" // Ray tracing acceleration structure diff --git a/examples/nv_ray_tracing_shadows/nv_ray_tracing_shadows.cpp b/examples/nv_ray_tracing_shadows/nv_ray_tracing_shadows.cpp index 4b7e3d4f..26c811a8 100644 --- a/examples/nv_ray_tracing_shadows/nv_ray_tracing_shadows.cpp +++ b/examples/nv_ray_tracing_shadows/nv_ray_tracing_shadows.cpp @@ -22,7 +22,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" // Ray tracing acceleration structure diff --git a/examples/occlusionquery/occlusionquery.cpp b/examples/occlusionquery/occlusionquery.cpp index 48c0bb1f..6273af76 100644 --- a/examples/occlusionquery/occlusionquery.cpp +++ b/examples/occlusionquery/occlusionquery.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #define VERTEX_BUFFER_BIND_ID 0 diff --git a/examples/offscreen/offscreen.cpp b/examples/offscreen/offscreen.cpp index 2e6a6b30..bce615a4 100644 --- a/examples/offscreen/offscreen.cpp +++ b/examples/offscreen/offscreen.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #define ENABLE_VALIDATION false diff --git a/examples/parallaxmapping/parallaxmapping.cpp b/examples/parallaxmapping/parallaxmapping.cpp index 2a81af84..bbd2d5f1 100644 --- a/examples/parallaxmapping/parallaxmapping.cpp +++ b/examples/parallaxmapping/parallaxmapping.cpp @@ -20,7 +20,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/particlefire/particlefire.cpp b/examples/particlefire/particlefire.cpp index 7db566b7..17374aed 100644 --- a/examples/particlefire/particlefire.cpp +++ b/examples/particlefire/particlefire.cpp @@ -21,7 +21,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/pbrbasic/pbrbasic.cpp b/examples/pbrbasic/pbrbasic.cpp index 116b3105..c24f3b7d 100644 --- a/examples/pbrbasic/pbrbasic.cpp +++ b/examples/pbrbasic/pbrbasic.cpp @@ -21,7 +21,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #define VERTEX_BUFFER_BIND_ID 0 diff --git a/examples/pbribl/pbribl.cpp b/examples/pbribl/pbribl.cpp index 94ad61e6..cf0b48a1 100644 --- a/examples/pbribl/pbribl.cpp +++ b/examples/pbribl/pbribl.cpp @@ -24,7 +24,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/pbrtexture/pbrtexture.cpp b/examples/pbrtexture/pbrtexture.cpp index db1e7d16..16553780 100644 --- a/examples/pbrtexture/pbrtexture.cpp +++ b/examples/pbrtexture/pbrtexture.cpp @@ -24,7 +24,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/pipelines/pipelines.cpp b/examples/pipelines/pipelines.cpp index 4c8f138d..6fb5148b 100644 --- a/examples/pipelines/pipelines.cpp +++ b/examples/pipelines/pipelines.cpp @@ -20,7 +20,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" -#include "VulkanBuffer.hpp" #define ENABLE_VALIDATION false diff --git a/examples/pipelinestatistics/pipelinestatistics.cpp b/examples/pipelinestatistics/pipelinestatistics.cpp index d80c5613..1968b63c 100644 --- a/examples/pipelinestatistics/pipelinestatistics.cpp +++ b/examples/pipelinestatistics/pipelinestatistics.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #define ENABLE_VALIDATION false diff --git a/examples/pushconstants/pushconstants.cpp b/examples/pushconstants/pushconstants.cpp index a8e2f062..1c8653f0 100644 --- a/examples/pushconstants/pushconstants.cpp +++ b/examples/pushconstants/pushconstants.cpp @@ -26,7 +26,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #define VERTEX_BUFFER_BIND_ID 0 diff --git a/examples/radialblur/radialblur.cpp b/examples/radialblur/radialblur.cpp index f0c1b1d3..e67b65bb 100644 --- a/examples/radialblur/radialblur.cpp +++ b/examples/radialblur/radialblur.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/shadowmapping/shadowmapping.cpp b/examples/shadowmapping/shadowmapping.cpp index 69e8678c..17f5a2ac 100644 --- a/examples/shadowmapping/shadowmapping.cpp +++ b/examples/shadowmapping/shadowmapping.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #define ENABLE_VALIDATION false diff --git a/examples/shadowmappingcascade/shadowmappingcascade.cpp b/examples/shadowmappingcascade/shadowmappingcascade.cpp index d0ddfe93..2fd337e6 100644 --- a/examples/shadowmappingcascade/shadowmappingcascade.cpp +++ b/examples/shadowmappingcascade/shadowmappingcascade.cpp @@ -30,7 +30,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/shadowmappingomni/shadowmappingomni.cpp b/examples/shadowmappingomni/shadowmappingomni.cpp index 44506291..77ce9851 100644 --- a/examples/shadowmappingomni/shadowmappingomni.cpp +++ b/examples/shadowmappingomni/shadowmappingomni.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/specializationconstants/specializationconstants.cpp b/examples/specializationconstants/specializationconstants.cpp index 72246efc..ebf95b18 100644 --- a/examples/specializationconstants/specializationconstants.cpp +++ b/examples/specializationconstants/specializationconstants.cpp @@ -23,7 +23,6 @@ #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" -#include "VulkanBuffer.hpp" #define ENABLE_VALIDATION false diff --git a/examples/sphericalenvmapping/sphericalenvmapping.cpp b/examples/sphericalenvmapping/sphericalenvmapping.cpp index 0c30fcca..9a3d6dc9 100644 --- a/examples/sphericalenvmapping/sphericalenvmapping.cpp +++ b/examples/sphericalenvmapping/sphericalenvmapping.cpp @@ -24,7 +24,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" diff --git a/examples/stencilbuffer/stencilbuffer.cpp b/examples/stencilbuffer/stencilbuffer.cpp index fac7fa9c..30ff623d 100644 --- a/examples/stencilbuffer/stencilbuffer.cpp +++ b/examples/stencilbuffer/stencilbuffer.cpp @@ -20,7 +20,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanglTFModel.h" -#include "VulkanBuffer.hpp" #define ENABLE_VALIDATION false diff --git a/examples/terraintessellation/terraintessellation.cpp b/examples/terraintessellation/terraintessellation.cpp index 1a90b651..52add4cd 100644 --- a/examples/terraintessellation/terraintessellation.cpp +++ b/examples/terraintessellation/terraintessellation.cpp @@ -20,7 +20,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" #include "frustum.hpp" diff --git a/examples/tessellation/tessellation.cpp b/examples/tessellation/tessellation.cpp index 8a5d19ca..e975e56e 100644 --- a/examples/tessellation/tessellation.cpp +++ b/examples/tessellation/tessellation.cpp @@ -24,7 +24,6 @@ #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" -#include "VulkanBuffer.hpp" #define ENABLE_VALIDATION false diff --git a/examples/textoverlay/textoverlay.cpp b/examples/textoverlay/textoverlay.cpp index 046057bc..ae471798 100644 --- a/examples/textoverlay/textoverlay.cpp +++ b/examples/textoverlay/textoverlay.cpp @@ -24,7 +24,6 @@ #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #include "../external/stb/stb_font_consolas_24_latin1.inl" diff --git a/examples/texture/texture.cpp b/examples/texture/texture.cpp index 75c76a03..613f4203 100644 --- a/examples/texture/texture.cpp +++ b/examples/texture/texture.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" #include #include diff --git a/examples/texture3d/texture3d.cpp b/examples/texture3d/texture3d.cpp index ab4ec382..5f0a480b 100644 --- a/examples/texture3d/texture3d.cpp +++ b/examples/texture3d/texture3d.cpp @@ -23,7 +23,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false diff --git a/examples/texturearray/texturearray.cpp b/examples/texturearray/texturearray.cpp index 50af7193..d8baf605 100644 --- a/examples/texturearray/texturearray.cpp +++ b/examples/texturearray/texturearray.cpp @@ -21,7 +21,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" -#include "VulkanBuffer.hpp" #include #include diff --git a/examples/texturecubemap/texturecubemap.cpp b/examples/texturecubemap/texturecubemap.cpp index 9e17356b..cb082bc8 100644 --- a/examples/texturecubemap/texturecubemap.cpp +++ b/examples/texturecubemap/texturecubemap.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" #include diff --git a/examples/texturecubemaparray/texturecubemaparray.cpp b/examples/texturecubemaparray/texturecubemaparray.cpp index abbc5953..b269bc96 100644 --- a/examples/texturecubemaparray/texturecubemaparray.cpp +++ b/examples/texturecubemaparray/texturecubemaparray.cpp @@ -19,7 +19,6 @@ #include #include "vulkanexamplebase.h" -#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanglTFModel.h" #include diff --git a/examples/texturemipmapgen/texturemipmapgen.cpp b/examples/texturemipmapgen/texturemipmapgen.cpp index ccb570ab..781e6fab 100644 --- a/examples/texturemipmapgen/texturemipmapgen.cpp +++ b/examples/texturemipmapgen/texturemipmapgen.cpp @@ -21,7 +21,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #include #include diff --git a/examples/texturesparseresidency/texturesparseresidency.h b/examples/texturesparseresidency/texturesparseresidency.h index e7ef2de3..a333fef4 100644 --- a/examples/texturesparseresidency/texturesparseresidency.h +++ b/examples/texturesparseresidency/texturesparseresidency.h @@ -27,7 +27,6 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "VulkanBuffer.hpp" #include "VulkanglTFModel.h" #define ENABLE_VALIDATION false