sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics/FrameGraph: Add support for texture arrays

Browse Source
This commit is contained in:
SirLynix
2023-08-31 18:00:58 +02:00
parent 5b11e53d33
commit b1487a04fd
5 changed files with 90 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/Nazara/Graphics/FrameGraph.hpp
View File

@@ -33,6 +33,8 @@ namespace Nz
~FrameGraph() = default;
inline std::size_t AddAttachment(FramePassAttachment attachment);
inline std::size_t AddAttachmentArray(FramePassAttachment attachment, std::size_t layerCount);
inline std::size_t AddAttachmentArrayLayer(std::size_t attachmentId, std::size_t layerIndex);
inline std::size_t AddAttachmentCube(FramePassAttachment attachment);
inline std::size_t AddAttachmentCubeFace(std::size_t attachmentId, CubemapFace face);
inline std::size_t AddAttachmentProxy(std::string name, std::size_t attachmentId);
@@ -55,6 +57,11 @@ namespace Nz
using PassIdToPhysicalPassIndex = std::unordered_map<std::size_t /*passId*/, std::size_t /*physicalPassId*/>;
using TextureBarrier = BakedFrameGraph::TextureBarrier;
struct AttachmentArray : FramePassAttachment
{
std::size_t layerCount;
};
struct AttachmentCube : FramePassAttachment
{
};
@@ -103,6 +110,7 @@ namespace Nz
std::vector<PhysicalPassData> physicalPasses;
std::vector<FrameGraphTextureData> textures;
std::vector<std::size_t> texture2DPool;
std::vector<std::size_t> texture2DArrayPool;
std::vector<std::size_t> textureCubePool;
AttachmentIdToPassId attachmentLastUse;
AttachmentIdToPassMap attachmentReadList;
@@ -128,7 +136,7 @@ namespace Nz
void ReorderPasses();
void TraverseGraph(std::size_t passIndex);
using AttachmentType = std::variant<FramePassAttachment, AttachmentProxy, AttachmentCube, AttachmentLayer>;
using AttachmentType = std::variant<FramePassAttachment, AttachmentProxy, AttachmentArray, AttachmentCube, AttachmentLayer>;
std::vector<std::size_t> m_backbufferOutputs;
std::vector<FramePass> m_framePasses;

27
include/Nazara/Graphics/FrameGraph.inl
View File

@@ -15,6 +15,33 @@ namespace Nz
return id;
}
inline std::size_t FrameGraph::AddAttachmentArray(FramePassAttachment attachment, std::size_t layerCount)
{
AttachmentArray attachmentArray{ std::move(attachment) };
attachmentArray.layerCount = layerCount;
std::size_t id = m_attachments.size();
m_attachments.emplace_back(std::move(attachmentArray));
return id;
}
inline std::size_t FrameGraph::AddAttachmentArrayLayer(std::size_t attachmentId, std::size_t layerIndex)
{
attachmentId = ResolveAttachmentIndex(attachmentId);
assert(std::holds_alternative<AttachmentArray>(m_attachments[attachmentId]));
assert(layerIndex < std::get<AttachmentArray>(m_attachments[attachmentId]).layerCount);
std::size_t id = m_attachments.size();
m_attachments.emplace_back(AttachmentLayer{
attachmentId,
layerIndex
});
return id;
}
inline std::size_t FrameGraph::AddAttachmentCube(FramePassAttachment attachment)
{
std::size_t id = m_attachments.size();

1
include/Nazara/Graphics/FrameGraphStructs.hpp
View File

@@ -32,6 +32,7 @@ namespace Nz
TextureUsageFlags usage;
unsigned int width;
unsigned int height;
unsigned int layerCount;
};
}