From 1e91f88355d681ad23962ba5d3c8e909e17a85ba Mon Sep 17 00:00:00 2001 From: Dynamitos Date: Wed, 19 Jun 2024 10:33:19 +0200 Subject: [PATCH] Extending position only support --- res/shaders/DepthCullingMesh.slang | 8 +-- res/shaders/DepthCullingTask.slang | 2 +- res/shaders/DrawListMesh.slang | 6 +-- res/shaders/DrawListTask.slang | 3 +- res/shaders/VisibilityCompute.slang | 9 ++-- res/shaders/lib/MaterialParameter.slang | 6 +++ res/shaders/lib/Scene.slang | 33 +++--------- res/shaders/lib/StaticMeshVertexData.slang | 8 +-- res/shaders/lib/VertexData.slang | 1 - src/Engine/Graphics/Buffer.h | 2 +- src/Engine/Graphics/Initializer.h | 1 + src/Engine/Graphics/RenderPass/BasePass.cpp | 1 + .../Graphics/RenderPass/VisibilityPass.cpp | 8 ++- src/Engine/Graphics/Shader.cpp | 29 +++++------ src/Engine/Graphics/VertexData.h | 2 +- src/Engine/Graphics/Vulkan/Buffer.cpp | 50 ++++++++----------- src/Engine/Graphics/Vulkan/Buffer.h | 18 +++---- 17 files changed, 75 insertions(+), 112 deletions(-) diff --git a/res/shaders/DepthCullingMesh.slang b/res/shaders/DepthCullingMesh.slang index d069280..c13c588 100644 --- a/res/shaders/DepthCullingMesh.slang +++ b/res/shaders/DepthCullingMesh.slang @@ -8,7 +8,6 @@ struct PrimitiveAttributes #ifdef VISIBILITY uint32_t prim : SV_PrimitiveID; #endif - bool cull: SV_CullPrimitive; }; [numthreads(MESH_GROUP_SIZE, 1, 1)] @@ -38,9 +37,8 @@ void meshMain( uint local_idx1 = pScene.primitiveIndices[m.primitiveOffset + (p * 3) + 1]; uint local_idx2 = pScene.primitiveIndices[m.primitiveOffset + (p * 3) + 2]; indices[p] = uint3(local_idx0, local_idx1, local_idx2); - prim[p].cull = !cull.triangleCulled(p); #ifdef VISIBILITY - prim[p].prim = encodePrimitive(p, meshletId); + prim[p].prim = encodePrimitive(meshletId); #endif } } @@ -49,11 +47,7 @@ void meshMain( uint v = min(i, m.vertexCount - 1); { uint vertexIndex = pScene.vertexIndices[m.vertexOffset + v]; -#ifdef POS_ONLY - VertexAttributes attr = pVertexData.getPosition(m.indicesOffset + vertexIndex); -#else VertexAttributes attr = pVertexData.getAttributes(m.indicesOffset + vertexIndex); -#endif vertices[v] = attr.getParameter(inst.transformMatrix); } } diff --git a/res/shaders/DepthCullingTask.slang b/res/shaders/DepthCullingTask.slang index f8d3242..95dd7eb 100644 --- a/res/shaders/DepthCullingTask.slang +++ b/res/shaders/DepthCullingTask.slang @@ -52,7 +52,7 @@ void taskMain( MeshletDescription meshlet = pScene.meshletInfos[m]; MeshletCullingInfo culling = pScene.cullingInfos[cull]; // if any triangle was visible last frame, it was drawn by the cached pass already - if(!culling.anyVisible()) + if(!culling.wasVisible()) { // if the meshlet is outside of the frustum, we skip it since we cant do depth culling anyways if(meshlet.bounding.insideFrustum(viewFrustum)) diff --git a/res/shaders/DrawListMesh.slang b/res/shaders/DrawListMesh.slang index 304da5a..2cbca3a 100644 --- a/res/shaders/DrawListMesh.slang +++ b/res/shaders/DrawListMesh.slang @@ -40,7 +40,7 @@ void meshMain( indices[p] = uint3(local_idx0, local_idx1, local_idx2); prim[p].cull = false;//cull.triangleCulled(p); #ifdef VISIBILITY - prim[p].prim = encodePrimitive(p, meshletId); + prim[p].prim = encodePrimitive(meshletId); #endif } } @@ -49,11 +49,7 @@ void meshMain( uint v = min(i, m.vertexCount - 1); { uint vertexIndex = pScene.vertexIndices[m.vertexOffset + v]; -#ifdef POS_ONLY - VertexAttributes attr = pVertexData.getPosition(m.indicesOffset + vertexIndex); -#else VertexAttributes attr = pVertexData.getAttributes(m.indicesOffset + vertexIndex); -#endif vertices[v] = attr.getParameter(inst.transformMatrix); } } diff --git a/res/shaders/DrawListTask.slang b/res/shaders/DrawListTask.slang index 022b040..795a9f8 100644 --- a/res/shaders/DrawListTask.slang +++ b/res/shaders/DrawListTask.slang @@ -27,7 +27,8 @@ void taskMain( MeshletDescription meshlet = pScene.meshletInfos[m]; MeshletCullingInfo culling = pScene.cullingInfos[cull]; #ifdef DEPTH_CULLING - if(culling.anyVisible()) + // if depth culling is disabled, we draw the whole scene as if cached + if(culling.wasVisible()) #endif { uint index; diff --git a/res/shaders/VisibilityCompute.slang b/res/shaders/VisibilityCompute.slang index ce5c079..d9b07db 100644 --- a/res/shaders/VisibilityCompute.slang +++ b/res/shaders/VisibilityCompute.slang @@ -4,7 +4,7 @@ import Scene; struct VisibilityCullingData { Texture2D visibilityTexture; - globallycoherent RWStructuredBuffer cullingInfos; + RWStructuredBuffer cullingInfos; }; ParameterBlock pVisibilityParams; @@ -15,9 +15,6 @@ void computeMain( ){ int3 texCoords = int3(dispatchThreadID.xy, 0); uint encoded = pVisibilityParams.visibilityTexture.Load(texCoords).r; - uint2 decoded = decodePrimitive(encoded); - uint arrIdx = decoded.x / 32; - uint bit = decoded.x % 32; - uint32_t orig; - InterlockedOr(pVisibilityParams.cullingInfos[decoded.y].visible[arrIdx], (1 << bit), orig); + uint meshletId = decodePrimitive(encoded); + pVisibilityParams.cullingInfos[meshletId].visible = 1; } \ No newline at end of file diff --git a/res/shaders/lib/MaterialParameter.slang b/res/shaders/lib/MaterialParameter.slang index 5888cd5..97d468a 100644 --- a/res/shaders/lib/MaterialParameter.slang +++ b/res/shaders/lib/MaterialParameter.slang @@ -20,6 +20,7 @@ struct LightingParameter struct FragmentParameter { float4 position_CS : SV_Position; +#ifndef POS_ONLY float3 cameraPos_WS: POSITION0; float3 normal_WS : NORMAL0; float3 tangent_WS : TANGENT0; @@ -47,6 +48,7 @@ struct FragmentParameter result.normal_WS = normal_WS; return result; } +#endif }; // data passed to visibility render @@ -60,11 +62,13 @@ struct VisibilityParameter struct VertexAttributes { float3 position_MS; +#ifndef POS_ONLY float3 normal_MS; float3 tangent_MS; float3 biTangent_MS; float3 vertexColor; float2 texCoords[MAX_TEXCOORDS]; +#endif FragmentParameter getParameter(float4x4 transformMatrix) { float4 modelPos = float4(position_MS, 1); @@ -73,6 +77,7 @@ struct VertexAttributes float4 clipPos = mul(pViewParams.projectionMatrix, viewPos); FragmentParameter result; result.position_CS = clipPos; +#ifndef POS_ONLY float3x3 normalMatrix = float3x3(transformMatrix); float3 T = mul(normalMatrix, tangent_MS); float3 N = mul(normalMatrix, normal_MS); @@ -87,6 +92,7 @@ struct VertexAttributes { result.texCoords[i] = texCoords[i]; } +#endif return result; } }; diff --git a/res/shaders/lib/Scene.slang b/res/shaders/lib/Scene.slang index 5666d2b..4d1ff3d 100644 --- a/res/shaders/lib/Scene.slang +++ b/res/shaders/lib/Scene.slang @@ -34,26 +34,10 @@ struct InstanceData struct MeshletCullingInfo { - uint32_t visible[MAX_PRIMITIVES / 32]; - // lookup if a specific triangle is visible - bool triangleVisible(uint32_t primIndex) + uint32_t visible; + bool wasVisible() { - uint32_t arrIdx = primIndex / 32; - uint32_t cullIdx = primIndex % 32; - return (visible[arrIdx] & (1 << cullIdx)) != 0; - } - bool triangleCulled(uint32_t primIndex) - { - return !triangleVisible(primIndex); - } - bool anyVisible() - { - uint result = 0; - for(uint i = 0; i < MAX_PRIMITIVES / 32; ++i) - { - result |= visible[i]; - } - return result != 0; + return bool(visible); } }; @@ -80,17 +64,14 @@ struct Scene layout(set=2) ParameterBlock pScene; -uint32_t encodePrimitive(uint32_t primitiveId, uint32_t meshletId) +uint32_t encodePrimitive(uint32_t meshletId) { - return primitiveId + (meshletId * uint(MAX_PRIMITIVES)); + return meshletId; } -uint2 decodePrimitive(uint32_t encoded) +uint decodePrimitive(uint32_t encoded) { - uint prim = uint(encoded % MAX_PRIMITIVES); - encoded = encoded / MAX_PRIMITIVES; - uint meshletId = uint(encoded); - return uint2(prim, meshletId); + return encoded; } struct MeshPayload diff --git a/res/shaders/lib/StaticMeshVertexData.slang b/res/shaders/lib/StaticMeshVertexData.slang index c99d06c..8b55e5b 100644 --- a/res/shaders/lib/StaticMeshVertexData.slang +++ b/res/shaders/lib/StaticMeshVertexData.slang @@ -8,6 +8,7 @@ struct StaticMeshVertexData : IVertexData { VertexAttributes attributes; attributes.position_MS = positions[index].xyz; +#ifndef POS_ONLY attributes.normal_MS = normals[index].xyz; attributes.tangent_MS = tangents[index].xyz; attributes.biTangent_MS = biTangents[index].xyz; @@ -16,14 +17,9 @@ struct StaticMeshVertexData : IVertexData attributes.texCoords[i] = texCoords[i][index]; } attributes.vertexColor = color[index].xyz; +#endif return attributes; } - VertexAttributes getPosition(uint index) - { - VertexAttributes attributes; - attributes.position_MS = positions[index].xyz; - return attributes; - } StructuredBuffer positions; StructuredBuffer normals; StructuredBuffer tangents; diff --git a/res/shaders/lib/VertexData.slang b/res/shaders/lib/VertexData.slang index 84b4a7e..8791765 100644 --- a/res/shaders/lib/VertexData.slang +++ b/res/shaders/lib/VertexData.slang @@ -9,7 +9,6 @@ struct VertexInput interface IVertexData { VertexAttributes getAttributes(uint index); - VertexAttributes getPosition(uint index); }; layout(set=1) diff --git a/src/Engine/Graphics/Buffer.h b/src/Engine/Graphics/Buffer.h index b2d9631..7d4d340 100644 --- a/src/Engine/Graphics/Buffer.h +++ b/src/Engine/Graphics/Buffer.h @@ -76,7 +76,7 @@ class ShaderBuffer : public Buffer { public: ShaderBuffer(QueueFamilyMapping mapping, const ShaderBufferCreateInfo& createInfo); virtual ~ShaderBuffer(); - virtual void rotateBuffer(uint64 size, bool preserveContents = false, uint32 fillValue = 0) = 0; + virtual void rotateBuffer(uint64 size, bool preserveContents = false) = 0; virtual void updateContents(const ShaderBufferCreateInfo& sourceData) = 0; constexpr uint32 getNumElements() const { return numElements; } diff --git a/src/Engine/Graphics/Initializer.h b/src/Engine/Graphics/Initializer.h index c8a9672..48750c3 100644 --- a/src/Engine/Graphics/Initializer.h +++ b/src/Engine/Graphics/Initializer.h @@ -97,6 +97,7 @@ struct UniformBufferCreateInfo { struct ShaderBufferCreateInfo { DataSource sourceData = DataSource(); uint64 numElements = 1; + uint32 clearValue = 0; uint8 dynamic = 0; uint8 vertexBuffer = 0; std::string name = "Unnamed"; diff --git a/src/Engine/Graphics/RenderPass/BasePass.cpp b/src/Engine/Graphics/RenderPass/BasePass.cpp index 3ba806d..a2d7df7 100644 --- a/src/Engine/Graphics/RenderPass/BasePass.cpp +++ b/src/Engine/Graphics/RenderPass/BasePass.cpp @@ -94,6 +94,7 @@ void BasePass::render() { Gfx::ShaderPermutation permutation = graphics->getShaderCompiler()->getTemplate("BasePass"); permutation.setDepthCulling(true); // always use the culling info + permutation.setPositionOnly(false); for (VertexData* vertexData : VertexData::getList()) { vertexData->getInstanceDataSet()->updateBuffer(6, cullingBuffer); vertexData->getInstanceDataSet()->writeChanges(); diff --git a/src/Engine/Graphics/RenderPass/VisibilityPass.cpp b/src/Engine/Graphics/RenderPass/VisibilityPass.cpp index b678ae6..7ea3f38 100644 --- a/src/Engine/Graphics/RenderPass/VisibilityPass.cpp +++ b/src/Engine/Graphics/RenderPass/VisibilityPass.cpp @@ -11,7 +11,7 @@ VisibilityPass::~VisibilityPass() {} void VisibilityPass::beginFrame(const Component::Camera& cam) { RenderPass::beginFrame(cam); - cullingBuffer->rotateBuffer(VertexData::getMeshletCount() * sizeof(VertexData::MeshletCullingInfo), true, 0xffffffff); + cullingBuffer->rotateBuffer(VertexData::getMeshletCount() * sizeof(VertexData::MeshletCullingInfo), true); } void VisibilityPass::render() { @@ -77,7 +77,11 @@ void VisibilityPass::publishOutputs() { pipelineInfo.pipelineLayout = std::move(visibilityLayout); visibilityPipeline = graphics->createComputePipeline(std::move(pipelineInfo)); - cullingBuffer = graphics->createShaderBuffer(ShaderBufferCreateInfo{.dynamic = true, .name = "CullingBuffer"}); + cullingBuffer = graphics->createShaderBuffer(ShaderBufferCreateInfo{ + .clearValue = 0xffffffff, + .dynamic = true, + .name = "CullingBuffer", + }); resources->registerBufferOutput("CULLINGBUFFER", cullingBuffer); query = graphics->createPipelineStatisticsQuery(); diff --git a/src/Engine/Graphics/Shader.cpp b/src/Engine/Graphics/Shader.cpp index 1a7fb2c..37f9be5 100644 --- a/src/Engine/Graphics/Shader.cpp +++ b/src/Engine/Graphics/Shader.cpp @@ -1,11 +1,10 @@ #include "Shader.h" +#include "Graphics/Graphics.h" #include "Graphics/Initializer.h" #include "Material/Material.h" #include "ThreadPool.h" -#include "Graphics/Graphics.h" #include - using namespace Seele; using namespace Seele::Gfx; @@ -55,20 +54,18 @@ void ShaderCompiler::compile() { for (const auto& [vdName, vd] : vertexData) { if (pass.useMaterial) { for (const auto& [matName, mat] : materials) { - for (int x = 0; x < 2; x++) { - for (int y = 0; y < 2; y++) { - work.add([=]() { - ShaderPermutation permutation = getTemplate(name); - permutation.setPositionOnly(x); - permutation.setDepthCulling(y); - permutation.setVertexData(vd->getTypeName()); - OPipelineLayout layout = graphics->createPipelineLayout(pass.baseLayout->getName(), pass.baseLayout); - layout->addDescriptorLayout(vd->getVertexDataLayout()); - layout->addDescriptorLayout(vd->getInstanceDataLayout()); - permutation.setMaterial(mat->getName()); - createShaders(permutation, std::move(layout)); - }); - } + for (int y = 0; y < 2; y++) { + work.add([=]() { + ShaderPermutation permutation = getTemplate(name); + permutation.setPositionOnly(false); + permutation.setDepthCulling(y); + permutation.setVertexData(vd->getTypeName()); + OPipelineLayout layout = graphics->createPipelineLayout(pass.baseLayout->getName(), pass.baseLayout); + layout->addDescriptorLayout(vd->getVertexDataLayout()); + layout->addDescriptorLayout(vd->getInstanceDataLayout()); + permutation.setMaterial(mat->getName()); + createShaders(permutation, std::move(layout)); + }); } } } else { diff --git a/src/Engine/Graphics/VertexData.h b/src/Engine/Graphics/VertexData.h index 4d57f1b..20c2310 100644 --- a/src/Engine/Graphics/VertexData.h +++ b/src/Engine/Graphics/VertexData.h @@ -28,7 +28,7 @@ class VertexData { }; struct MeshletCullingInfo { - uint64_t cull[256 / 64]; + uint32_t cull; }; struct BatchedDrawCall { PMaterialInstance materialInstance; diff --git a/src/Engine/Graphics/Vulkan/Buffer.cpp b/src/Engine/Graphics/Vulkan/Buffer.cpp index 6f5e3c8..90e185d 100644 --- a/src/Engine/Graphics/Vulkan/Buffer.cpp +++ b/src/Engine/Graphics/Vulkan/Buffer.cpp @@ -166,11 +166,15 @@ void BufferAllocation::readContents(uint64 regionOffset, uint64 regionSize, void graphics->getDestructionManager()->queueResourceForDestruction(std::move(staging)); } -Buffer::Buffer(PGraphics graphics, uint64 size, VkBufferUsageFlags usage, Gfx::QueueType queueType, bool dynamic, std::string name) +Buffer::Buffer(PGraphics graphics, uint64 size, VkBufferUsageFlags usage, Gfx::QueueType queueType, bool dynamic, std::string name, + uint32 clearValue) : graphics(graphics), currentBuffer(0), initialOwner(queueType), usage(usage | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT), - dynamic(dynamic), name(name) { - createBuffer(size); + dynamic(dynamic), name(name), clearValue(clearValue) { + if (size > 0) { + buffers.add(nullptr); + createBuffer(size, 0); + } } Buffer::~Buffer() { @@ -187,7 +191,7 @@ void Buffer::readContents(uint64 regionOffset, uint64 regionSize, void* buffer) getAlloc()->readContents(regionOffset, regionSize, buffer); } -void Buffer::rotateBuffer(uint64 size, bool preserveContents, uint32 fillValue) { +void Buffer::rotateBuffer(uint64 size, bool preserveContents) { assert(dynamic); if (buffers.size() > 0) { size = std::max(getSize(), size); @@ -198,41 +202,23 @@ void Buffer::rotateBuffer(uint64 size, bool preserveContents, uint32 fillValue) } if (buffers[i]->size < size) { graphics->getDestructionManager()->queueResourceForDestruction(std::move(buffers[i])); - uint32 family = graphics->getFamilyMapping().getQueueTypeFamilyIndex(initialOwner); - VkBufferCreateInfo info = { - .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, - .pNext = nullptr, - .flags = 0, - .size = size, - .usage = usage, - .sharingMode = VK_SHARING_MODE_EXCLUSIVE, - .queueFamilyIndexCount = 1, - .pQueueFamilyIndices = &family, - }; - VmaAllocationCreateInfo allocInfo = { - .usage = VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE, - }; - buffers[i] = new BufferAllocation(graphics, name, info, allocInfo, initialOwner); + createBuffer(size, i); } if (preserveContents) { copyBuffer(currentBuffer, i); - if (buffers[i]->size > buffers[currentBuffer]->size) { - PCommand command = graphics->getQueueCommands(getAlloc()->owner)->getCommands(); - vkCmdFillBuffer(command->getHandle(), buffers[i]->buffer, buffers[currentBuffer]->size, - buffers[i]->size - buffers[currentBuffer]->size, fillValue); - } } currentBuffer = i; return; } - createBuffer(size); + buffers.add(nullptr); + createBuffer(size, buffers.size() - 1); if (preserveContents) { copyBuffer(currentBuffer, buffers.size() - 1); } currentBuffer = buffers.size() - 1; } -void Buffer::createBuffer(uint64 size) { +void Buffer::createBuffer(uint64 size, uint32 destIndex) { if (size > 0) { uint32 family = graphics->getFamilyMapping().getQueueTypeFamilyIndex(initialOwner); VkBufferCreateInfo info = { @@ -246,9 +232,13 @@ void Buffer::createBuffer(uint64 size) { .pQueueFamilyIndices = &family, }; VmaAllocationCreateInfo allocInfo = { - .usage = VMA_MEMORY_USAGE_AUTO, + .usage = VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE, }; - buffers.add(new BufferAllocation(graphics, name, info, allocInfo, initialOwner)); + buffers[destIndex] = new BufferAllocation(graphics, name, info, allocInfo, initialOwner); + PCommand command = graphics->getQueueCommands(initialOwner)->getCommands(); + vkCmdFillBuffer(command->getHandle(), buffers[destIndex]->buffer, 0, VK_WHOLE_SIZE, clearValue); + pipelineBarrier(VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT); } } @@ -349,9 +339,9 @@ void ShaderBuffer::updateContents(const ShaderBufferCreateInfo& createInfo) { } } -void ShaderBuffer::rotateBuffer(uint64 size, bool preserveContents, uint32 fillValue) { +void ShaderBuffer::rotateBuffer(uint64 size, bool preserveContents) { assert(dynamic); - Vulkan::Buffer::rotateBuffer(size, preserveContents, fillValue); + Vulkan::Buffer::rotateBuffer(size, preserveContents); } void ShaderBuffer::clear() { diff --git a/src/Engine/Graphics/Vulkan/Buffer.h b/src/Engine/Graphics/Vulkan/Buffer.h index e8f6840..5870d7e 100644 --- a/src/Engine/Graphics/Vulkan/Buffer.h +++ b/src/Engine/Graphics/Vulkan/Buffer.h @@ -10,10 +10,10 @@ DECLARE_REF(Command) DECLARE_REF(Fence) class BufferAllocation : public CommandBoundResource { public: - BufferAllocation(PGraphics graphics, const std::string& name, VkBufferCreateInfo bufferInfo, VmaAllocationCreateInfo allocInfo, Gfx::QueueType owner, uint64 alignment = 0); + BufferAllocation(PGraphics graphics, const std::string& name, VkBufferCreateInfo bufferInfo, VmaAllocationCreateInfo allocInfo, + Gfx::QueueType owner, uint64 alignment = 0); virtual ~BufferAllocation(); - void pipelineBarrier(VkAccessFlags srcAccess, VkPipelineStageFlags srcStage, VkAccessFlags dstAccess, - VkPipelineStageFlags dstStage); + void pipelineBarrier(VkAccessFlags srcAccess, VkPipelineStageFlags srcStage, VkAccessFlags dstAccess, VkPipelineStageFlags dstStage); void transferOwnership(Gfx::QueueType newOwner); void updateContents(uint64 regionOffset, uint64 regionSize, void* ptr); void readContents(uint64 regionOffset, uint64 regionSize, void* ptr); @@ -28,7 +28,7 @@ class BufferAllocation : public CommandBoundResource { DEFINE_REF(BufferAllocation); class Buffer { public: - Buffer(PGraphics graphics, uint64 size, VkBufferUsageFlags usage, Gfx::QueueType initialOwner, bool dynamic, std::string name); + Buffer(PGraphics graphics, uint64 size, VkBufferUsageFlags usage, Gfx::QueueType initialOwner, bool dynamic, std::string name, uint32 clearValue = 0); virtual ~Buffer(); VkBuffer getHandle() const { return buffers[currentBuffer]->buffer; } VkDeviceAddress getDeviceAddress() const { return buffers[currentBuffer]->deviceAddress; } @@ -45,13 +45,13 @@ class Buffer { VkBufferUsageFlags usage; bool dynamic; std::string name; - void rotateBuffer(uint64 size, bool preserveContents = false, uint32 fillValue = 0); - void createBuffer(uint64 size); + uint32 clearValue; + void rotateBuffer(uint64 size, bool preserveContents = false); + void createBuffer(uint64 size, uint32 destIndex); void copyBuffer(uint64 src, uint64 dest); void transferOwnership(Gfx::QueueType newOwner); - void pipelineBarrier(VkAccessFlags srcAccess, VkPipelineStageFlags srcStage, VkAccessFlags dstAccess, - VkPipelineStageFlags dstStage); + void pipelineBarrier(VkAccessFlags srcAccess, VkPipelineStageFlags srcStage, VkAccessFlags dstAccess, VkPipelineStageFlags dstStage); }; DEFINE_REF(Buffer) @@ -107,7 +107,7 @@ class ShaderBuffer : public Gfx::ShaderBuffer, public Buffer { ShaderBuffer(PGraphics graphics, const ShaderBufferCreateInfo& sourceData); virtual ~ShaderBuffer(); virtual void updateContents(const ShaderBufferCreateInfo& createInfo) override; - virtual void rotateBuffer(uint64 size, bool preserveContents = false, uint32 fillValue = 0) override; + virtual void rotateBuffer(uint64 size, bool preserveContents = false) override; virtual void clear() override;