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

Rework shader bindings (WIP)

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-10-16 12:10:14 +02:00
parent cb716e5da5
commit 58485cfa79
23 changed files with 171 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/Nazara/Graphics/MaterialSettings.inl
View File

@@ -18,14 +18,11 @@ namespace Nz
m_data(std::move(data))
{
RenderPipelineLayoutInfo info;
Graphics::FillDrawDataPipelineLayout(info);
Graphics::FillViewerPipelineLayout(info);
Graphics::FillWorldPipelineLayout(info);
for (const Texture& textureInfo : m_data.textures)
{
info.bindings.push_back({
Graphics::MaterialBindingSet,
0,
textureInfo.bindingIndex,
ShaderBindingType::Texture,
textureInfo.shaderStages
@@ -35,7 +32,7 @@ namespace Nz
for (const UniformBlock& ubo : m_data.uniformBlocks)
{
info.bindings.push_back({
Graphics::MaterialBindingSet,
0,
ubo.bindingIndex,
ShaderBindingType::UniformBuffer,
ubo.shaderStages
@@ -45,7 +42,7 @@ namespace Nz
for (const SharedUniformBlock& ubo : m_data.sharedUniformBlocks)
{
info.bindings.push_back({
Graphics::MaterialBindingSet,
0,
ubo.bindingIndex,
ShaderBindingType::UniformBuffer,
ubo.shaderStages