Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extending position only support

Browse Source
This commit is contained in:
Dynamitos
2024-06-19 10:33:19 +02:00
parent e501a69b36
commit 1e91f88355
17 changed files with 75 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Graphics/Buffer.h
+1 -1
View File
@@ -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; }
src/Engine/Graphics/Initializer.h
+1
View File
@@ -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";
src/Engine/Graphics/RenderPass/BasePass.cpp
+1
View File
@@ -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();
src/Engine/Graphics/RenderPass/VisibilityPass.cpp
+6 -2
View File
@@ -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();
src/Engine/Graphics/Shader.cpp
+13 -16
View File
@@ -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 <fmt/core.h>
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 {
src/Engine/Graphics/VertexData.h
+1 -1
View File
@@ -28,7 +28,7 @@ class VertexData {
};
struct MeshletCullingInfo {
uint64_t cull[256 / 64];
uint32_t cull;
};
struct BatchedDrawCall {
PMaterialInstance materialInstance;
src/Engine/Graphics/Vulkan/Buffer.cpp
+20 -30
View File
@@ -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() {
src/Engine/Graphics/Vulkan/Buffer.h
+9 -9
View File
@@ -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;