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

Add initial support for compute pipelines

Browse Source
This commit is contained in:
SirLynix
2022-12-24 11:54:55 +01:00
committed by Jérôme Leclercq
parent e4064997d8
commit 9578ba3ef5
57 changed files with 915 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/Nazara/Graphics/ShaderReflection.hpp
View File

@@ -45,6 +45,13 @@ namespace Nz
UInt32 bindingIndex;
};
struct ExternalSampler : ExternalData
{
UInt32 arraySize;
nzsl::ImageType imageType;
nzsl::Ast::PrimitiveType sampledType;
};
struct ExternalStorageBlock : ExternalData
{
std::size_t structIndex;
@@ -53,8 +60,10 @@ namespace Nz
struct ExternalTexture : ExternalData
{
UInt32 arraySize;
nzsl::AccessPolicy accessPolicy;
nzsl::ImageFormat imageFormat;
nzsl::ImageType imageType;
nzsl::Ast::PrimitiveType sampledType;
nzsl::Ast::PrimitiveType baseType;
};
struct ExternalUniformBlock : ExternalData
@@ -64,8 +73,9 @@ namespace Nz
struct ExternalBlockData
{
std::unordered_map<std::string /*tag*/, ExternalSampler> samplers;
std::unordered_map<std::string /*tag*/, ExternalStorageBlock> storageBlocks;
std::unordered_map<std::string /*tag*/, ExternalTexture> samplers;
std::unordered_map<std::string /*tag*/, ExternalTexture> textures;
std::unordered_map<std::string /*tag*/, ExternalUniformBlock> uniformBlocks;
};

2
include/Nazara/Graphics/SubmeshRenderer.hpp
View File

@@ -33,7 +33,7 @@ namespace Nz
private:
std::vector<ShaderBinding::Binding> m_bindingCache;
std::vector<ShaderBinding::TextureBinding> m_textureBindingCache;
std::vector<ShaderBinding::SampledTextureBinding> m_textureBindingCache;
RenderElementPool<RenderSubmesh> m_submeshPool;
};

2
include/Nazara/Graphics/Tilemap.hpp
View File

@@ -11,8 +11,8 @@
#include <Nazara/Core/Color.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/InstancedRenderable.hpp>
#include <Nazara/Utils/Bitset.hpp>
#include <Nazara/Utility/VertexStruct.hpp>
#include <Nazara/Utils/Bitset.hpp>
#include <memory>
namespace Nz