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

Fix compilation

This commit is contained in:
Jérôme Leclercq 2022-01-21 21:33:43 +01:00
parent 7976ea27b9
commit b442af513c
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
examples/DeferredShading/main.cpp
View File

@ -131,7 +131,11 @@ int main()
std::shared_ptr<Nz::GraphicalMesh> cubeMeshGfx = std::make_shared<Nz::GraphicalMesh>(*cubeMesh); std::shared_ptr<Nz::GraphicalMesh> cubeMeshGfx = std::make_shared<Nz::GraphicalMesh>(*cubeMesh);
Nz::RenderPipelineLayoutInfo skyboxPipelineLayoutInfo; Nz::RenderPipelineLayoutInfo skyboxPipelineLayoutInfo;
Nz::Graphics::FillViewerPipelineLayout(skyboxPipelineLayoutInfo, 0); skyboxPipelineLayoutInfo.bindings.push_back({
0, 0,
Nz::ShaderBindingType::UniformBuffer,
Nz::ShaderStageType_All
});
auto& textureBinding = skyboxPipelineLayoutInfo.bindings.emplace_back(); auto& textureBinding = skyboxPipelineLayoutInfo.bindings.emplace_back();
textureBinding.setIndex = 0; textureBinding.setIndex = 0;
@ -260,7 +264,11 @@ int main()
Nz::RenderPipelineLayoutInfo lightingPipelineLayoutInfo; Nz::RenderPipelineLayoutInfo lightingPipelineLayoutInfo;
Nz::Graphics::FillViewerPipelineLayout(lightingPipelineLayoutInfo, 0); lightingPipelineLayoutInfo.bindings.push_back({
0, 0,
Nz::ShaderBindingType::UniformBuffer,
Nz::ShaderStageType_All
});
for (unsigned int i = 0; i < 3; ++i) for (unsigned int i = 0; i < 3; ++i)
{ {
@ -356,7 +364,11 @@ int main()
// Bloom data // Bloom data
Nz::RenderPipelineLayoutInfo fullscreenPipelineLayoutInfoViewer; Nz::RenderPipelineLayoutInfo fullscreenPipelineLayoutInfoViewer;
Nz::Graphics::FillViewerPipelineLayout(fullscreenPipelineLayoutInfoViewer, 0); fullscreenPipelineLayoutInfoViewer.bindings.push_back({
0, 0,
Nz::ShaderBindingType::UniformBuffer,
Nz::ShaderStageType_All
});
fullscreenPipelineLayoutInfoViewer.bindings.push_back({ fullscreenPipelineLayoutInfoViewer.bindings.push_back({
0, 1, 0, 1,
@ -443,7 +455,11 @@ int main()
std::shared_ptr<Nz::ShaderBinding> bloomBlitBinding; std::shared_ptr<Nz::ShaderBinding> bloomBlitBinding;
Nz::RenderPipelineLayoutInfo bloomBlendPipelineLayoutInfo; Nz::RenderPipelineLayoutInfo bloomBlendPipelineLayoutInfo;
Nz::Graphics::FillViewerPipelineLayout(bloomBlendPipelineLayoutInfo, 0); bloomBlendPipelineLayoutInfo.bindings.push_back({
0, 0,
Nz::ShaderBindingType::UniformBuffer,
Nz::ShaderStageType_All
});
/*bloomBlendPipelineLayoutInfo.bindings.push_back({ /*bloomBlendPipelineLayoutInfo.bindings.push_back({
0, 1, 0, 1,
@ -860,7 +876,7 @@ int main()
for (const auto& element : elements) for (const auto& element : elements)
elementPointers.emplace_back(element.get()); elementPointers.emplace_back(element.get());
submeshRenderer.Prepare(viewerInstance, *submeshRendererData, *currentFrame, elementPointers.data(), elementPointers.size()); submeshRenderer.Prepare(viewerInstance, *submeshRendererData, *currentFrame, {}, elementPointers.data(), elementPointers.size());
submeshRenderer.Render(viewerInstance, *submeshRendererData, builder, elementPointers.data(), elementPointers.size()); submeshRenderer.Render(viewerInstance, *submeshRendererData, builder, elementPointers.data(), elementPointers.size());
}); });
@ -924,7 +940,7 @@ int main()
for (const auto& element : elements) for (const auto& element : elements)
elementPointers.emplace_back(element.get()); elementPointers.emplace_back(element.get());
spritechainRenderer.Prepare(viewerInstance, *spriteRendererData, *currentFrame, elementPointers.data(), elementPointers.size()); spritechainRenderer.Prepare(viewerInstance, *spriteRendererData, *currentFrame, {}, elementPointers.data(), elementPointers.size());
spritechainRenderer.Render(viewerInstance, *spriteRendererData, builder, elementPointers.data(), elementPointers.size()); spritechainRenderer.Render(viewerInstance, *spriteRendererData, builder, elementPointers.data(), elementPointers.size());
}); });
forwardPass.SetExecutionCallback([&] forwardPass.SetExecutionCallback([&]
@ -952,7 +968,7 @@ int main()
for (const auto& element : elements) for (const auto& element : elements)
elementPointers.emplace_back(element.get()); elementPointers.emplace_back(element.get());
spritechainRenderer.Prepare(viewerInstance, *spriteRendererData, *currentFrame, elementPointers.data(), elementPointers.size()); spritechainRenderer.Prepare(viewerInstance, *spriteRendererData, *currentFrame, {}, elementPointers.data(), elementPointers.size());
spritechainRenderer.Render(viewerInstance, *spriteRendererData, builder, elementPointers.data(), elementPointers.size()); spritechainRenderer.Render(viewerInstance, *spriteRendererData, builder, elementPointers.data(), elementPointers.size());
}); });