diff --git a/base/vulkanbuffer.hpp b/base/VulkanBuffer.hpp similarity index 99% rename from base/vulkanbuffer.hpp rename to base/VulkanBuffer.hpp index f255828a..586a8ea3 100644 --- a/base/vulkanbuffer.hpp +++ b/base/VulkanBuffer.hpp @@ -15,7 +15,7 @@ #include "vulkan/vulkan.h" #include "vulkantools.h" -namespace vk +namespace vks { /** * @brief Encapsulates access to a Vulkan buffer backed up by device memory diff --git a/base/VulkanDevice.hpp b/base/VulkanDevice.hpp index f98f1e24..3ba75502 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.hpp" namespace vks { @@ -388,7 +388,7 @@ namespace vks * * @return VK_SUCCESS if buffer handle and memory have been created and (optionally passed) data has been copied */ - VkResult createBuffer(VkBufferUsageFlags usageFlags, VkMemoryPropertyFlags memoryPropertyFlags, vk::Buffer *buffer, VkDeviceSize size, void *data = nullptr) + VkResult createBuffer(VkBufferUsageFlags usageFlags, VkMemoryPropertyFlags memoryPropertyFlags, vks::Buffer *buffer, VkDeviceSize size, void *data = nullptr) { buffer->device = logicalDevice; @@ -435,7 +435,7 @@ namespace vks * * @note Source and destionation pointers must have the approriate transfer usage flags set (TRANSFER_SRC / TRANSFER_DST) */ - void copyBuffer(vk::Buffer *src, vk::Buffer *dst, VkQueue queue, VkBufferCopy *copyRegion = nullptr) + void copyBuffer(vks::Buffer *src, vks::Buffer *dst, VkQueue queue, VkBufferCopy *copyRegion = nullptr) { assert(dst->size <= src->size); assert(src->buffer && src->buffer); diff --git a/base/VulkanModel.hpp b/base/VulkanModel.hpp index 9e035386..fc6a1c05 100644 --- a/base/VulkanModel.hpp +++ b/base/VulkanModel.hpp @@ -26,7 +26,7 @@ #include #include "VulkanDevice.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #if defined(__ANDROID__) #include @@ -108,8 +108,8 @@ namespace vks struct Model { VkDevice device = nullptr; - vk::Buffer vertices; - vk::Buffer indices; + vks::Buffer vertices; + vks::Buffer indices; uint32_t indexCount = 0; uint32_t vertexCount = 0; @@ -306,7 +306,7 @@ namespace vks // Use staging buffer to move vertex and index buffer to device local memory // Create staging buffers - vk::Buffer vertexStaging, indexStaging; + vks::Buffer vertexStaging, indexStaging; // Vertex buffer VK_CHECK_RESULT(device->createBuffer( diff --git a/base/VulkanTexture.hpp b/base/VulkanTexture.hpp index 08405433..2234f0ee 100644 --- a/base/VulkanTexture.hpp +++ b/base/VulkanTexture.hpp @@ -19,7 +19,7 @@ #include "vulkantools.h" #include "VulkanDevice.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #if defined(__ANDROID__) #include diff --git a/base/vulkanheightmap.hpp b/base/vulkanheightmap.hpp index 64b44c1a..08592270 100644 --- a/base/vulkanheightmap.hpp +++ b/base/vulkanheightmap.hpp @@ -12,7 +12,7 @@ #include "vulkan/vulkan.h" #include "VulkanDevice.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" namespace vkTools { @@ -31,8 +31,8 @@ namespace vkTools float heightScale = 1.0f; float uvScale = 1.0f; - vk::Buffer vertexBuffer; - vk::Buffer indexBuffer; + vks::Buffer vertexBuffer; + vks::Buffer indexBuffer; struct Vertex { glm::vec3 pos; @@ -192,7 +192,7 @@ namespace vkTools // Generate Vulkan buffers - vk::Buffer vertexStaging, indexStaging; + vks::Buffer vertexStaging, indexStaging; // Create staging buffers device->createBuffer( diff --git a/base/vulkantextoverlay.hpp b/base/vulkantextoverlay.hpp index 9c8d5bf3..012b4023 100644 --- a/base/vulkantextoverlay.hpp +++ b/base/vulkantextoverlay.hpp @@ -19,7 +19,7 @@ #include #include "vulkantools.h" #include "vulkandebug.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanDevice.hpp" #include "../external/stb/stb_font_consolas_24_latin1.inl" @@ -54,7 +54,7 @@ private: VkSampler sampler; VkImage image; VkImageView view; - vk::Buffer vertexBuffer; + vks::Buffer vertexBuffer; VkDeviceMemory imageMemory; VkDescriptorPool descriptorPool; VkDescriptorSetLayout descriptorSetLayout; @@ -203,7 +203,7 @@ public: VK_CHECK_RESULT(vkBindImageMemory(vulkanDevice->logicalDevice, image, imageMemory, 0)); // Staging - vk::Buffer stagingBuffer; + vks::Buffer stagingBuffer; VK_CHECK_RESULT(vulkanDevice->createBuffer( VK_BUFFER_USAGE_TRANSFER_SRC_BIT, diff --git a/bloom/bloom.cpp b/bloom/bloom.cpp index cd4e1895..157c66ba 100644 --- a/bloom/bloom.cpp +++ b/bloom/bloom.cpp @@ -21,7 +21,7 @@ #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -60,9 +60,9 @@ public: } vertices; struct { - vk::Buffer scene; - vk::Buffer skyBox; - vk::Buffer blurParams; + vks::Buffer scene; + vks::Buffer skyBox; + vks::Buffer blurParams; } uniformBuffers; struct UBO { diff --git a/computecullandlod/computecullandlod.cpp b/computecullandlod/computecullandlod.cpp index ac69378c..04135f0b 100644 --- a/computecullandlod/computecullandlod.cpp +++ b/computecullandlod/computecullandlod.cpp @@ -22,7 +22,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanModel.hpp" #include "frustum.hpp" @@ -68,10 +68,10 @@ public: }; // Contains the instanced data - vk::Buffer instanceBuffer; + vks::Buffer instanceBuffer; // Contains the indirect drawing commands - vk::Buffer indirectCommandsBuffer; - vk::Buffer indirectDrawCountBuffer; + vks::Buffer indirectCommandsBuffer; + vks::Buffer indirectDrawCountBuffer; // Indirect draw statistics (updated via compute) struct { @@ -90,7 +90,7 @@ public: } uboScene; struct { - vk::Buffer scene; + vks::Buffer scene; } uniformData; struct { @@ -103,7 +103,7 @@ public: // Resources for the compute part of the example struct { - vk::Buffer lodLevelsBuffers; // Contains index start and counts for the different lod levels + vks::Buffer lodLevelsBuffers; // Contains index start and counts for the different lod levels VkQueue queue; // Separate queue for compute commands (queue family may differ from the one used for graphics) VkCommandPool commandPool; // Use a separate command pool (queue family may differ from the one used for graphics) VkCommandBuffer commandBuffer; // Command buffer storing the dispatch commands and barriers @@ -484,7 +484,7 @@ public: { objectCount = OBJECT_COUNT * OBJECT_COUNT * OBJECT_COUNT; - vk::Buffer stagingBuffer; + vks::Buffer stagingBuffer; std::vector instanceData(objectCount); indirectCommands.resize(objectCount); diff --git a/computenbody/computenbody.cpp b/computenbody/computenbody.cpp index 04eac1e3..4dfe0f2e 100644 --- a/computenbody/computenbody.cpp +++ b/computenbody/computenbody.cpp @@ -49,7 +49,7 @@ public: // Resources for the graphics part of the example struct { - vk::Buffer uniformBuffer; // Contains scene matrices + vks::Buffer uniformBuffer; // Contains scene matrices VkDescriptorSetLayout descriptorSetLayout; // Particle system rendering shader binding layout VkDescriptorSet descriptorSet; // Particle system rendering shader bindings VkPipelineLayout pipelineLayout; // Layout of the graphics pipeline @@ -63,8 +63,8 @@ public: // Resources for the compute part of the example struct { - vk::Buffer storageBuffer; // (Shader) storage buffer object containing the particles - vk::Buffer uniformBuffer; // Uniform buffer object containing particle system parameters + vks::Buffer storageBuffer; // (Shader) storage buffer object containing the particles + vks::Buffer uniformBuffer; // Uniform buffer object containing particle system parameters VkQueue queue; // Separate queue for compute commands (queue family may differ from the one used for graphics) VkCommandPool commandPool; // Use a separate command pool (queue family may differ from the one used for graphics) VkCommandBuffer commandBuffer; // Command buffer storing the dispatch commands and barriers @@ -333,7 +333,7 @@ public: // Staging // SSBO won't be changed on the host after upload so copy to device local memory - vk::Buffer stagingBuffer; + vks::Buffer stagingBuffer; vulkanDevice->createBuffer( VK_BUFFER_USAGE_TRANSFER_SRC_BIT, diff --git a/computeparticles/computeparticles.cpp b/computeparticles/computeparticles.cpp index 0865d786..03daf67c 100644 --- a/computeparticles/computeparticles.cpp +++ b/computeparticles/computeparticles.cpp @@ -61,8 +61,8 @@ public: // Resources for the compute part of the example struct { - vk::Buffer storageBuffer; // (Shader) storage buffer object containing the particles - vk::Buffer uniformBuffer; // Uniform buffer object containing particle system parameters + vks::Buffer storageBuffer; // (Shader) storage buffer object containing the particles + vks::Buffer uniformBuffer; // Uniform buffer object containing particle system parameters VkQueue queue; // Separate queue for compute commands (queue family may differ from the one used for graphics) VkCommandPool commandPool; // Use a separate command pool (queue family may differ from the one used for graphics) VkCommandBuffer commandBuffer; // Command buffer storing the dispatch commands and barriers @@ -250,7 +250,7 @@ public: // Staging // SSBO won't be changed on the host after upload so copy to device local memory - vk::Buffer stagingBuffer; + vks::Buffer stagingBuffer; vulkanDevice->createBuffer( VK_BUFFER_USAGE_TRANSFER_SRC_BIT, diff --git a/computeshader/computeshader.cpp b/computeshader/computeshader.cpp index 418caf93..756a530d 100644 --- a/computeshader/computeshader.cpp +++ b/computeshader/computeshader.cpp @@ -20,7 +20,7 @@ #include #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -66,11 +66,11 @@ public: uint32_t queueFamilyIndex; // Family index of the graphics queue, used for barriers } compute; - vk::Buffer vertexBuffer; - vk::Buffer indexBuffer; + vks::Buffer vertexBuffer; + vks::Buffer indexBuffer; uint32_t indexCount; - vk::Buffer uniformBufferVS; + vks::Buffer uniformBufferVS; struct { glm::mat4 projection; diff --git a/debugmarker/debugmarker.cpp b/debugmarker/debugmarker.cpp index 34feb810..bbdea6b0 100644 --- a/debugmarker/debugmarker.cpp +++ b/debugmarker/debugmarker.cpp @@ -19,7 +19,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanModel.hpp" #define VERTEX_BUFFER_BIND_ID 0 @@ -188,7 +188,7 @@ public: Scene scene, sceneGlow; - vk::Buffer uniformBuffer; + vks::Buffer uniformBuffer; struct UBOVS { glm::mat4 projection; diff --git a/deferred/deferred.cpp b/deferred/deferred.cpp index a0698cbc..58205aee 100644 --- a/deferred/deferred.cpp +++ b/deferred/deferred.cpp @@ -19,7 +19,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -89,9 +89,9 @@ public: } uboFragmentLights; struct { - vk::Buffer vsFullScreen; - vk::Buffer vsOffscreen; - vk::Buffer fsLights; + vks::Buffer vsFullScreen; + vks::Buffer vsOffscreen; + vks::Buffer fsLights; } uniformBuffers; struct { diff --git a/deferredmultisampling/deferredmultisampling.cpp b/deferredmultisampling/deferredmultisampling.cpp index 392cb29a..846a5763 100644 --- a/deferredmultisampling/deferredmultisampling.cpp +++ b/deferredmultisampling/deferredmultisampling.cpp @@ -19,7 +19,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -87,9 +87,9 @@ public: } uboFragmentLights; struct { - vk::Buffer vsFullScreen; - vk::Buffer vsOffscreen; - vk::Buffer fsLights; + vks::Buffer vsFullScreen; + vks::Buffer vsOffscreen; + vks::Buffer fsLights; } uniformBuffers; struct { diff --git a/deferredshadows/deferredshadows.cpp b/deferredshadows/deferredshadows.cpp index f4366714..2c90c85a 100644 --- a/deferredshadows/deferredshadows.cpp +++ b/deferredshadows/deferredshadows.cpp @@ -20,7 +20,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanFramebuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -125,10 +125,10 @@ public: } uboFragmentLights; struct { - vk::Buffer vsFullScreen; - vk::Buffer vsOffscreen; - vk::Buffer fsLights; - vk::Buffer uboShadowGS; + vks::Buffer vsFullScreen; + vks::Buffer vsOffscreen; + vks::Buffer fsLights; + vks::Buffer uboShadowGS; } uniformBuffers; struct { diff --git a/displacement/displacement.cpp b/displacement/displacement.cpp index 6cae6723..d31e720c 100644 --- a/displacement/displacement.cpp +++ b/displacement/displacement.cpp @@ -22,7 +22,7 @@ #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -55,7 +55,7 @@ public: } models; struct { - vk::Buffer tessControl, tessEval; + vks::Buffer tessControl, tessEval; } uniformBuffers; struct UBOTessControl { diff --git a/distancefieldfonts/distancefieldfonts.cpp b/distancefieldfonts/distancefieldfonts.cpp index 8e45fa06..bb197518 100644 --- a/distancefieldfonts/distancefieldfonts.cpp +++ b/distancefieldfonts/distancefieldfonts.cpp @@ -24,7 +24,7 @@ #include #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -76,13 +76,13 @@ public: std::vector attributeDescriptions; } vertices; - vk::Buffer vertexBuffer; - vk::Buffer indexBuffer; + vks::Buffer vertexBuffer; + vks::Buffer indexBuffer; uint32_t indexCount; struct { - vk::Buffer vs; - vk::Buffer fs; + vks::Buffer vs; + vks::Buffer fs; } uniformBuffers; struct UBOVS { diff --git a/dynamicuniformbuffer/dynamicuniformbuffer.cpp b/dynamicuniformbuffer/dynamicuniformbuffer.cpp index a335d0a4..5b117192 100644 --- a/dynamicuniformbuffer/dynamicuniformbuffer.cpp +++ b/dynamicuniformbuffer/dynamicuniformbuffer.cpp @@ -32,7 +32,7 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -77,13 +77,13 @@ public: std::vector attributeDescriptions; } vertices; - vk::Buffer vertexBuffer; - vk::Buffer indexBuffer; + vks::Buffer vertexBuffer; + vks::Buffer indexBuffer; uint32_t indexCount; struct { - vk::Buffer view; - vk::Buffer dynamic; + vks::Buffer view; + vks::Buffer dynamic; } uniformBuffers; struct { diff --git a/gears/vulkangear.cpp b/gears/vulkangear.cpp index 9060276a..2939d0ce 100644 --- a/gears/vulkangear.cpp +++ b/gears/vulkangear.cpp @@ -173,7 +173,7 @@ void VulkanGear::generate(GearInfo *gearinfo, VkQueue queue) if (useStaging) { - vk::Buffer vertexStaging, indexStaging; + vks::Buffer vertexStaging, indexStaging; // Create staging buffers // Vertex data diff --git a/gears/vulkangear.h b/gears/vulkangear.h index affd04b3..d415cf9e 100644 --- a/gears/vulkangear.h +++ b/gears/vulkangear.h @@ -23,7 +23,7 @@ #include "vulkantools.h" #include "VulkanDevice.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" struct Vertex { @@ -77,12 +77,12 @@ private: float rotSpeed; float rotOffset; - vk::Buffer vertexBuffer; - vk::Buffer indexBuffer; + vks::Buffer vertexBuffer; + vks::Buffer indexBuffer; uint32_t indexCount; UBO ubo; - vk::Buffer uniformBuffer; + vks::Buffer uniformBuffer; int32_t newVertex(std::vector *vBuffer, float x, float y, float z, const glm::vec3& normal); void newFace(std::vector *iBuffer, int a, int b, int c); diff --git a/geometryshader/geometryshader.cpp b/geometryshader/geometryshader.cpp index 84a844f2..56b19f91 100644 --- a/geometryshader/geometryshader.cpp +++ b/geometryshader/geometryshader.cpp @@ -57,8 +57,8 @@ public: } uboGS; struct { - vk::Buffer VS; - vk::Buffer GS; + vks::Buffer VS; + vks::Buffer GS; } uniformBuffers; struct { diff --git a/hdr/hdr.cpp b/hdr/hdr.cpp index c9268f22..e6725f6a 100644 --- a/hdr/hdr.cpp +++ b/hdr/hdr.cpp @@ -21,7 +21,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanModel.hpp" #include "VulkanTexture.hpp" @@ -51,8 +51,8 @@ public: } models; struct { - vk::Buffer matrices; - vk::Buffer params; + vks::Buffer matrices; + vks::Buffer params; } uniformBuffers; struct UBOVS { diff --git a/indirectdraw/indirectdraw.cpp b/indirectdraw/indirectdraw.cpp index a21bc466..fb75fda1 100644 --- a/indirectdraw/indirectdraw.cpp +++ b/indirectdraw/indirectdraw.cpp @@ -34,7 +34,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -90,9 +90,9 @@ public: }; // Contains the instanced data - vk::Buffer instanceBuffer; + vks::Buffer instanceBuffer; // Contains the indirect drawing commands - vk::Buffer indirectCommandsBuffer; + vks::Buffer indirectCommandsBuffer; uint32_t indirectDrawCount; struct { @@ -101,7 +101,7 @@ public: } uboVS; struct { - vk::Buffer scene; + vks::Buffer scene; } uniformData; struct { @@ -536,7 +536,7 @@ public: objectCount += indirectCmd.instanceCount; } - vk::Buffer stagingBuffer; + vks::Buffer stagingBuffer; VK_CHECK_RESULT(vulkanDevice->createBuffer( VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, @@ -574,7 +574,7 @@ public: instanceData[i].texIndex = i / OBJECT_INSTANCE_COUNT; } - vk::Buffer stagingBuffer; + vks::Buffer stagingBuffer; VK_CHECK_RESULT(vulkanDevice->createBuffer( VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, diff --git a/instancing/instancing.cpp b/instancing/instancing.cpp index bb52b6f8..08c5d6ef 100644 --- a/instancing/instancing.cpp +++ b/instancing/instancing.cpp @@ -21,7 +21,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -75,7 +75,7 @@ public: } uboVS; struct { - vk::Buffer scene; + vks::Buffer scene; } uniformBuffers; VkPipelineLayout pipelineLayout; diff --git a/mesh/mesh.cpp b/mesh/mesh.cpp index aeea2b53..dac12f61 100644 --- a/mesh/mesh.cpp +++ b/mesh/mesh.cpp @@ -77,7 +77,7 @@ public: } model; struct { - vk::Buffer scene; + vks::Buffer scene; } uniformBuffers; struct { diff --git a/multisampling/multisampling.cpp b/multisampling/multisampling.cpp index b193717c..0588b135 100644 --- a/multisampling/multisampling.cpp +++ b/multisampling/multisampling.cpp @@ -19,7 +19,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -67,7 +67,7 @@ public: std::vector attributeDescriptions; } vertices; - vk::Buffer uniformBuffer; + vks::Buffer uniformBuffer; struct UBOVS { glm::mat4 projection; diff --git a/occlusionquery/occlusionquery.cpp b/occlusionquery/occlusionquery.cpp index e903543c..658522a1 100644 --- a/occlusionquery/occlusionquery.cpp +++ b/occlusionquery/occlusionquery.cpp @@ -19,7 +19,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanModel.hpp" #define VERTEX_BUFFER_BIND_ID 0 @@ -42,9 +42,9 @@ public: } models; struct { - vk::Buffer occluder; - vk::Buffer teapot; - vk::Buffer sphere; + vks::Buffer occluder; + vks::Buffer teapot; + vks::Buffer sphere; } uniformBuffers; struct UBOVS { diff --git a/offscreen/offscreen.cpp b/offscreen/offscreen.cpp index 1a47ed76..7d10121c 100644 --- a/offscreen/offscreen.cpp +++ b/offscreen/offscreen.cpp @@ -21,7 +21,7 @@ #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -60,10 +60,10 @@ public: } vertices; struct { - vk::Buffer vsShared; - vk::Buffer vsMirror; - vk::Buffer vsOffScreen; - vk::Buffer vsDebugQuad; + vks::Buffer vsShared; + vks::Buffer vsMirror; + vks::Buffer vsOffScreen; + vks::Buffer vsDebugQuad; } uniformBuffers; struct UBO { diff --git a/parallaxmapping/parallaxmapping.cpp b/parallaxmapping/parallaxmapping.cpp index 71d484b7..0ecbd268 100644 --- a/parallaxmapping/parallaxmapping.cpp +++ b/parallaxmapping/parallaxmapping.cpp @@ -20,7 +20,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -58,8 +58,8 @@ public: } models; struct { - vk::Buffer vertexShader; - vk::Buffer fragmentShader; + vks::Buffer vertexShader; + vks::Buffer fragmentShader; } uniformBuffers; struct { diff --git a/particlefire/particlefire.cpp b/particlefire/particlefire.cpp index 6ebd1d9c..fa356f6e 100644 --- a/particlefire/particlefire.cpp +++ b/particlefire/particlefire.cpp @@ -20,7 +20,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -89,8 +89,8 @@ public: } particles; struct { - vk::Buffer fire; - vk::Buffer environment; + vks::Buffer fire; + vks::Buffer environment; } uniformBuffers; struct UBOVS { diff --git a/pipelines/pipelines.cpp b/pipelines/pipelines.cpp index d01f524f..ac7f7b73 100644 --- a/pipelines/pipelines.cpp +++ b/pipelines/pipelines.cpp @@ -20,7 +20,7 @@ #include #include "vulkanexamplebase.h" #include "VulkanModel.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -46,7 +46,7 @@ public: vks::Model cube; } models; - vk::Buffer uniformBuffer; + vks::Buffer uniformBuffer; // Same uniform buffer layout as shader struct UBOVS { diff --git a/pushconstants/pushconstants.cpp b/pushconstants/pushconstants.cpp index 9c5b7a9f..232a90f6 100644 --- a/pushconstants/pushconstants.cpp +++ b/pushconstants/pushconstants.cpp @@ -19,7 +19,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanModel.hpp" #define VERTEX_BUFFER_BIND_ID 0 @@ -46,7 +46,7 @@ public: vks::Model scene; } models; - vk::Buffer uniformBuffer; + vks::Buffer uniformBuffer; struct UBOVS { glm::mat4 projection; diff --git a/radialblur/radialblur.cpp b/radialblur/radialblur.cpp index f0004079..647f444d 100644 --- a/radialblur/radialblur.cpp +++ b/radialblur/radialblur.cpp @@ -19,7 +19,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -59,8 +59,8 @@ public: } vertices; struct { - vk::Buffer scene; - vk::Buffer blurParams; + vks::Buffer scene; + vks::Buffer blurParams; } uniformBuffers; struct UboVS { diff --git a/raytracing/raytracing.cpp b/raytracing/raytracing.cpp index 3e2366c2..f6bb94fa 100644 --- a/raytracing/raytracing.cpp +++ b/raytracing/raytracing.cpp @@ -47,10 +47,10 @@ public: // Resources for the compute part of the example struct { struct { - vk::Buffer spheres; // (Shader) storage buffer object with scene spheres - vk::Buffer planes; // (Shader) storage buffer object with scene planes + vks::Buffer spheres; // (Shader) storage buffer object with scene spheres + vks::Buffer planes; // (Shader) storage buffer object with scene planes } storageBuffers; - vk::Buffer uniformBuffer; // Uniform buffer object containing scene data + vks::Buffer uniformBuffer; // Uniform buffer object containing scene data VkQueue queue; // Separate queue for compute commands (queue family may differ from the one used for graphics) VkCommandPool commandPool; // Use a separate command pool (queue family may differ from the one used for graphics) VkCommandBuffer commandBuffer; // Command buffer storing the dispatch commands and barriers @@ -326,7 +326,7 @@ public: VkDeviceSize storageBufferSize = spheres.size() * sizeof(Sphere); // Stage - vk::Buffer stagingBuffer; + vks::Buffer stagingBuffer; vulkanDevice->createBuffer( VK_BUFFER_USAGE_TRANSFER_SRC_BIT, diff --git a/scenerendering/scenerendering.cpp b/scenerendering/scenerendering.cpp index eb3e1f94..914b153e 100644 --- a/scenerendering/scenerendering.cpp +++ b/scenerendering/scenerendering.cpp @@ -42,7 +42,7 @@ #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" #include "VulkanDevice.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -112,8 +112,8 @@ private: // We will be using one single index and vertex buffer // containing vertices and indices for all meshes in the scene // This allows us to keep memory allocations down - vk::Buffer vertexBuffer; - vk::Buffer indexBuffer; + vks::Buffer vertexBuffer; + vks::Buffer indexBuffer; VkDescriptorSet descriptorSetScene; @@ -322,7 +322,7 @@ private: size_t vertexDataSize = vertices.size() * sizeof(Vertex); size_t indexDataSize = indices.size() * sizeof(uint32_t); - vk::Buffer vertexStaging, indexStaging; + vks::Buffer vertexStaging, indexStaging; // Vertex buffer // Staging buffer @@ -402,7 +402,7 @@ public: // Shared ubo containing matrices used by all // materials and meshes - vk::Buffer uniformBuffer; + vks::Buffer uniformBuffer; struct UniformData { glm::mat4 projection; glm::mat4 view; diff --git a/screenshot/screenshot.cpp b/screenshot/screenshot.cpp index 9ace966b..d816c51c 100644 --- a/screenshot/screenshot.cpp +++ b/screenshot/screenshot.cpp @@ -44,7 +44,7 @@ public: vks::Model object; } models; - vk::Buffer uniformBuffer; + vks::Buffer uniformBuffer; struct { glm::mat4 projection; diff --git a/shadowmapping/shadowmapping.cpp b/shadowmapping/shadowmapping.cpp index fc5becf6..d0cb5ac7 100644 --- a/shadowmapping/shadowmapping.cpp +++ b/shadowmapping/shadowmapping.cpp @@ -19,7 +19,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanModel.hpp" #define VERTEX_BUFFER_BIND_ID 0 @@ -80,9 +80,9 @@ public: } vertices; struct { - vk::Buffer scene; - vk::Buffer offscreen; - vk::Buffer debug; + vks::Buffer scene; + vks::Buffer offscreen; + vks::Buffer debug; } uniformBuffers; struct { diff --git a/shadowmappingomni/shadowmappingomni.cpp b/shadowmappingomni/shadowmappingomni.cpp index 35f07dac..0cff89cb 100644 --- a/shadowmappingomni/shadowmappingomni.cpp +++ b/shadowmappingomni/shadowmappingomni.cpp @@ -19,7 +19,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -62,8 +62,8 @@ public: } models; struct { - vk::Buffer scene; - vk::Buffer offscreen; + vks::Buffer scene; + vks::Buffer offscreen; } uniformBuffers; struct { diff --git a/skeletalanimation/skeletalanimation.cpp b/skeletalanimation/skeletalanimation.cpp index ac8068fb..fed38632 100644 --- a/skeletalanimation/skeletalanimation.cpp +++ b/skeletalanimation/skeletalanimation.cpp @@ -25,7 +25,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -360,8 +360,8 @@ public: SkinnedMesh *skinnedMesh = nullptr; struct { - vk::Buffer mesh; - vk::Buffer floor; + vks::Buffer mesh; + vks::Buffer floor; } uniformBuffers; struct { diff --git a/specializationconstants/specializationconstants.cpp b/specializationconstants/specializationconstants.cpp index ef82c04d..b1bd35fd 100644 --- a/specializationconstants/specializationconstants.cpp +++ b/specializationconstants/specializationconstants.cpp @@ -23,7 +23,7 @@ #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -53,7 +53,7 @@ public: vks::Texture2D colormap; } textures; - vk::Buffer uniformBuffer; + vks::Buffer uniformBuffer; // Same uniform buffer layout as shader struct UBOVS { diff --git a/sphericalenvmapping/sphericalenvmapping.cpp b/sphericalenvmapping/sphericalenvmapping.cpp index bb843cb2..adb606dd 100644 --- a/sphericalenvmapping/sphericalenvmapping.cpp +++ b/sphericalenvmapping/sphericalenvmapping.cpp @@ -24,7 +24,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -56,7 +56,7 @@ public: vks::Texture2DArray matCapArray; } textures; - vk::Buffer uniformBuffer; + vks::Buffer uniformBuffer; struct UBOVS { glm::mat4 projection; diff --git a/ssao/ssao.cpp b/ssao/ssao.cpp index 0aa016f8..22feb0b6 100644 --- a/ssao/ssao.cpp +++ b/ssao/ssao.cpp @@ -104,9 +104,9 @@ public: } descriptorSetLayouts; struct { - vk::Buffer sceneMatrices; - vk::Buffer ssaoKernel; - vk::Buffer ssaoParams; + vks::Buffer sceneMatrices; + vks::Buffer ssaoKernel; + vks::Buffer ssaoParams; } uniformBuffers; // Framebuffer for offscreen rendering diff --git a/subpasses/subpasses.cpp b/subpasses/subpasses.cpp index 0e51a1e0..422103bf 100644 --- a/subpasses/subpasses.cpp +++ b/subpasses/subpasses.cpp @@ -72,8 +72,8 @@ public: } uboLights; struct { - vk::Buffer GBuffer; - vk::Buffer lights; + vks::Buffer GBuffer; + vks::Buffer lights; } uniformBuffers; struct { diff --git a/terraintessellation/terraintessellation.cpp b/terraintessellation/terraintessellation.cpp index 952547ae..86fafed3 100644 --- a/terraintessellation/terraintessellation.cpp +++ b/terraintessellation/terraintessellation.cpp @@ -21,7 +21,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" #include "frustum.hpp" @@ -60,8 +60,8 @@ public: } vertices; struct { - vk::Buffer terrainTessellation; - vk::Buffer skysphereVertex; + vks::Buffer terrainTessellation; + vks::Buffer skysphereVertex; } uniformBuffers; // Shared values for tessellation control and evaluation stages diff --git a/tessellation/tessellation.cpp b/tessellation/tessellation.cpp index 4665a216..39e8b12c 100644 --- a/tessellation/tessellation.cpp +++ b/tessellation/tessellation.cpp @@ -24,7 +24,7 @@ #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -56,7 +56,7 @@ public: } models; struct { - vk::Buffer tessControl, tessEval; + vks::Buffer tessControl, tessEval; } uniformBuffers; struct UBOTessControl { diff --git a/textoverlay/textoverlay.cpp b/textoverlay/textoverlay.cpp index bcb3a16b..002db3be 100644 --- a/textoverlay/textoverlay.cpp +++ b/textoverlay/textoverlay.cpp @@ -24,7 +24,7 @@ #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanModel.hpp" #include "VulkanTexture.hpp" @@ -713,7 +713,7 @@ public: std::vector attributeDescriptions; } vertices; - vk::Buffer uniformBuffer; + vks::Buffer uniformBuffer; struct UBOVS { glm::mat4 projection; diff --git a/texture/texture.cpp b/texture/texture.cpp index ef6bf1f5..9c9ed001 100644 --- a/texture/texture.cpp +++ b/texture/texture.cpp @@ -21,7 +21,7 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -54,11 +54,11 @@ public: std::vector attributeDescriptions; } vertices; - vk::Buffer vertexBuffer; - vk::Buffer indexBuffer; + vks::Buffer vertexBuffer; + vks::Buffer indexBuffer; uint32_t indexCount; - vk::Buffer uniformBufferVS; + vks::Buffer uniformBufferVS; struct { glm::mat4 projection; diff --git a/texture3d/texture3d.cpp b/texture3d/texture3d.cpp index 7080411c..623c9a36 100644 --- a/texture3d/texture3d.cpp +++ b/texture3d/texture3d.cpp @@ -23,7 +23,7 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanModel.hpp" #define VERTEX_BUFFER_BIND_ID 0 @@ -171,11 +171,11 @@ public: std::vector inputAttributes; } vertices; - vk::Buffer vertexBuffer; - vk::Buffer indexBuffer; + vks::Buffer vertexBuffer; + vks::Buffer indexBuffer; uint32_t indexCount; - vk::Buffer uniformBufferVS; + vks::Buffer uniformBufferVS; struct UboVS { glm::mat4 projection; diff --git a/texturearray/texturearray.cpp b/texturearray/texturearray.cpp index ff1bc9b9..87b37ade 100644 --- a/texturearray/texturearray.cpp +++ b/texturearray/texturearray.cpp @@ -21,7 +21,7 @@ #include #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #define VERTEX_BUFFER_BIND_ID 0 #define ENABLE_VALIDATION false @@ -46,11 +46,11 @@ public: std::vector attributeDescriptions; } vertices; - vk::Buffer vertexBuffer; - vk::Buffer indexBuffer; + vks::Buffer vertexBuffer; + vks::Buffer indexBuffer; uint32_t indexCount; - vk::Buffer uniformBufferVS; + vks::Buffer uniformBufferVS; struct UboInstanceData { // Model matrix diff --git a/texturecubemap/texturecubemap.cpp b/texturecubemap/texturecubemap.cpp index b8206b4c..7f195703 100644 --- a/texturecubemap/texturecubemap.cpp +++ b/texturecubemap/texturecubemap.cpp @@ -21,7 +21,7 @@ #include #include "vulkanexamplebase.h" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanTexture.hpp" #include "VulkanModel.hpp" @@ -55,8 +55,8 @@ public: } models; struct { - vk::Buffer object; - vk::Buffer skybox; + vks::Buffer object; + vks::Buffer skybox; } uniformBuffers; struct UBOVS { diff --git a/texturemipmapgen/texturemipmapgen.cpp b/texturemipmapgen/texturemipmapgen.cpp index cf91a610..48079432 100644 --- a/texturemipmapgen/texturemipmapgen.cpp +++ b/texturemipmapgen/texturemipmapgen.cpp @@ -24,7 +24,7 @@ #include #include "vulkanexamplebase.h" #include "VulkanDevice.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "VulkanModel.hpp" #define VERTEX_BUFFER_BIND_ID 0 @@ -63,7 +63,7 @@ public: std::vector attributeDescriptions; } vertices; - vk::Buffer uniformBufferVS; + vks::Buffer uniformBufferVS; struct uboVS { glm::mat4 projection; diff --git a/texturesparseresidency/texturesparseresidency.cpp b/texturesparseresidency/texturesparseresidency.cpp index 88bf72dd..c4c6b639 100644 --- a/texturesparseresidency/texturesparseresidency.cpp +++ b/texturesparseresidency/texturesparseresidency.cpp @@ -32,7 +32,7 @@ todos: #include "vulkanexamplebase.h" #include "VulkanTexture.hpp" #include "VulkanDevice.hpp" -#include "vulkanbuffer.hpp" +#include "VulkanBuffer.hpp" #include "vulkanheightmap.hpp" #define VERTEX_BUFFER_BIND_ID 0 @@ -207,7 +207,7 @@ public: uint32_t indexCount; - vk::Buffer uniformBufferVS; + vks::Buffer uniformBufferVS; struct UboVS { glm::mat4 projection; diff --git a/vulkanExamples.sln b/vulkanExamples.sln index 453b7884..ceae1483 100644 --- a/vulkanExamples.sln +++ b/vulkanExamples.sln @@ -80,7 +80,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Base", "Base", "{09B9A54B-F base\threadpool.hpp = base\threadpool.hpp base\vulkanandroid.cpp = base\vulkanandroid.cpp base\vulkanandroid.h = base\vulkanandroid.h - base\vulkanbuffer.hpp = base\vulkanbuffer.hpp + base\VulkanBuffer.hpp = base\VulkanBuffer.hpp base\vulkandebug.cpp = base\vulkandebug.cpp base\vulkandebug.h = base\vulkandebug.h base\VulkanDevice.hpp = base\VulkanDevice.hpp diff --git a/vulkanscene/vulkanscene.cpp b/vulkanscene/vulkanscene.cpp index a36298cc..dba3187d 100644 --- a/vulkanscene/vulkanscene.cpp +++ b/vulkanscene/vulkanscene.cpp @@ -60,7 +60,7 @@ public: std::vector demoModels; struct { - vk::Buffer meshVS; + vks::Buffer meshVS; } uniformData; struct {