claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved VulkanBuffer to vks namespce (Refs #260)

Browse source
This commit is contained in:
saschawillems 2017-02-12 10:44:51 +01:00
parent f917ea6640
commit 776b6f0106
54 changed files with 165 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/vulkanbuffer.hpp → base/VulkanBuffer.hpp
View file

@ -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

6
base/VulkanDevice.hpp
View file

@ -15,7 +15,7 @@
#include <algorithm>
#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);

8
base/VulkanModel.hpp
View file

@ -26,7 +26,7 @@
#include <glm/gtc/type_ptr.hpp>
#include "VulkanDevice.hpp"
#include "vulkanbuffer.hpp"
#include "VulkanBuffer.hpp"
#if defined(__ANDROID__)
#include <android/asset_manager.h>
@ -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(

2
base/VulkanTexture.hpp
View file

@ -19,7 +19,7 @@
#include "vulkantools.h"
#include "VulkanDevice.hpp"
#include "vulkanbuffer.hpp"
#include "VulkanBuffer.hpp"
#if defined(__ANDROID__)
#include <android/asset_manager.h>

8
base/vulkanheightmap.hpp
View file

@ -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(

6
base/vulkantextoverlay.hpp
View file

@ -19,7 +19,7 @@
#include <vulkan/vulkan.h>
#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,

8
bloom/bloom.cpp
View file

@ -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 {

14
computecullandlod/computecullandlod.cpp
View file

@ -22,7 +22,7 @@
#include <vulkan/vulkan.h>
#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> instanceData(objectCount);
indirectCommands.resize(objectCount);

8
computenbody/computenbody.cpp
View file

@ -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,

6
computeparticles/computeparticles.cpp
View file

@ -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,

8
computeshader/computeshader.cpp
View file

@ -20,7 +20,7 @@
#include <vulkan/vulkan.h>
#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;

4
debugmarker/debugmarker.cpp
View file

@ -19,7 +19,7 @@
#include <vulkan/vulkan.h>
#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;

8
deferred/deferred.cpp
View file

@ -19,7 +19,7 @@
#include <vulkan/vulkan.h>
#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 {

8
deferredmultisampling/deferredmultisampling.cpp
View file

@ -19,7 +19,7 @@
#include <vulkan/vulkan.h>
#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 {

10
deferredshadows/deferredshadows.cpp
View file

@ -20,7 +20,7 @@
#include <vulkan/vulkan.h>
#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 {

4
displacement/displacement.cpp
View file

@ -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 {

10
distancefieldfonts/distancefieldfonts.cpp
View file

@ -24,7 +24,7 @@
#include <vulkan/vulkan.h>
#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<VkVertexInputAttributeDescription> 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 {

10
dynamicuniformbuffer/dynamicuniformbuffer.cpp
View file

@ -32,7 +32,7 @@
#include <vulkan/vulkan.h>
#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<VkVertexInputAttributeDescription> 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 {

2
gears/vulkangear.cpp
View file

@ -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

8
gears/vulkangear.h
View file

@ -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<Vertex> *vBuffer, float x, float y, float z, const glm::vec3& normal);
void newFace(std::vector<uint32_t> *iBuffer, int a, int b, int c);

4
geometryshader/geometryshader.cpp
View file

@ -57,8 +57,8 @@ public:
} uboGS;
struct {
vk::Buffer VS;
vk::Buffer GS;
vks::Buffer VS;
vks::Buffer GS;
} uniformBuffers;
struct {

6
hdr/hdr.cpp
View file

@ -21,7 +21,7 @@
#include <vulkan/vulkan.h>
#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 {

12
indirectdraw/indirectdraw.cpp
View file

@ -34,7 +34,7 @@
#include <vulkan/vulkan.h>
#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,

4
instancing/instancing.cpp
View file

@ -21,7 +21,7 @@
#include <vulkan/vulkan.h>
#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;

2
mesh/mesh.cpp
View file

@ -77,7 +77,7 @@ public:
} model;
struct {
vk::Buffer scene;
vks::Buffer scene;
} uniformBuffers;
struct {

4
multisampling/multisampling.cpp
View file

@ -19,7 +19,7 @@
#include <vulkan/vulkan.h>
#include "vulkanexamplebase.h"
#include "vulkanbuffer.hpp"
#include "VulkanBuffer.hpp"
#include "VulkanTexture.hpp"
#include "VulkanModel.hpp"
@ -67,7 +67,7 @@ public:
std::vector<VkVertexInputAttributeDescription> attributeDescriptions;
} vertices;
vk::Buffer uniformBuffer;
vks::Buffer uniformBuffer;
struct UBOVS {
glm::mat4 projection;

8
occlusionquery/occlusionquery.cpp
View file

@ -19,7 +19,7 @@
#include <vulkan/vulkan.h>
#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 {

10
offscreen/offscreen.cpp
View file

@ -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 {

6
parallaxmapping/parallaxmapping.cpp
View file

@ -20,7 +20,7 @@
#include <vulkan/vulkan.h>
#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 {

6
particlefire/particlefire.cpp
View file

@ -20,7 +20,7 @@
#include <vulkan/vulkan.h>
#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 {

4
pipelines/pipelines.cpp
View file

@ -20,7 +20,7 @@
#include <vulkan/vulkan.h>
#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 {

4
pushconstants/pushconstants.cpp
View file

@ -19,7 +19,7 @@
#include <vulkan/vulkan.h>
#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;

6
radialblur/radialblur.cpp
View file

@ -19,7 +19,7 @@
#include <vulkan/vulkan.h>
#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 {

8
raytracing/raytracing.cpp
View file

@ -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,

10
scenerendering/scenerendering.cpp
View file

@ -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;

2
screenshot/screenshot.cpp
View file

@ -44,7 +44,7 @@ public:
vks::Model object;
} models;
vk::Buffer uniformBuffer;
vks::Buffer uniformBuffer;
struct {
glm::mat4 projection;

8
shadowmapping/shadowmapping.cpp
View file

@ -19,7 +19,7 @@
#include <vulkan/vulkan.h>
#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 {

6
shadowmappingomni/shadowmappingomni.cpp
View file

@ -19,7 +19,7 @@
#include <vulkan/vulkan.h>
#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 {

6
skeletalanimation/skeletalanimation.cpp
View file

@ -25,7 +25,7 @@
#include <vulkan/vulkan.h>
#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 {

4
specializationconstants/specializationconstants.cpp
View file

@ -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 {

4
sphericalenvmapping/sphericalenvmapping.cpp
View file

@ -24,7 +24,7 @@
#include <vulkan/vulkan.h>
#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;

6
ssao/ssao.cpp
View file

@ -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

4
subpasses/subpasses.cpp
View file

@ -72,8 +72,8 @@ public:
} uboLights;
struct {
vk::Buffer GBuffer;
vk::Buffer lights;
vks::Buffer GBuffer;
vks::Buffer lights;
} uniformBuffers;
struct {

6
terraintessellation/terraintessellation.cpp
View file

@ -21,7 +21,7 @@
#include <vulkan/vulkan.h>
#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

4
tessellation/tessellation.cpp
View file

@ -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 {

4
textoverlay/textoverlay.cpp
View file

@ -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<VkVertexInputAttributeDescription> attributeDescriptions;
} vertices;
vk::Buffer uniformBuffer;
vks::Buffer uniformBuffer;
struct UBOVS {
glm::mat4 projection;

8
texture/texture.cpp
View file

@ -21,7 +21,7 @@
#include <vulkan/vulkan.h>
#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<VkVertexInputAttributeDescription> 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;

8
texture3d/texture3d.cpp
View file

@ -23,7 +23,7 @@
#include <vulkan/vulkan.h>
#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<VkVertexInputAttributeDescription> 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;

8
texturearray/texturearray.cpp
View file

@ -21,7 +21,7 @@
#include <vulkan/vulkan.h>
#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<VkVertexInputAttributeDescription> 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

6
texturecubemap/texturecubemap.cpp
View file

@ -21,7 +21,7 @@
#include <vulkan/vulkan.h>
#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 {

4
texturemipmapgen/texturemipmapgen.cpp
View file

@ -24,7 +24,7 @@
#include <vulkan/vulkan.h>
#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<VkVertexInputAttributeDescription> attributeDescriptions;
} vertices;
vk::Buffer uniformBufferVS;
vks::Buffer uniformBufferVS;
struct uboVS {
glm::mat4 projection;

4
texturesparseresidency/texturesparseresidency.cpp
View file

@ -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;

2
vulkanExamples.sln
View file

@ -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

2
vulkanscene/vulkanscene.cpp
View file

@ -60,7 +60,7 @@ public:
std::vector<DemoModel> demoModels;
struct {
vk::Buffer meshVS;
vks::Buffer meshVS;
} uniformData;
struct {