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

Update for latest NZSL version

This commit is contained in:
SirLynix 2022-07-16 14:17:04 +02:00
parent 96599d1116
commit 6882163693
14 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/DeferredShading/main.cpp
View File

@ -4,7 +4,7 @@
#include <Nazara/Graphics.hpp>
#include <Nazara/Renderer.hpp>
#include <Nazara/Utility.hpp>
#include <NZSL/FieldOffsets.hpp>
#include <NZSL/Math/FieldOffsets.hpp>
#include <NZSL/Parser.hpp>
#include <array>
#include <chrono>

2
examples/GraphicsTest/main.cpp
View File

@ -2,8 +2,6 @@
#include <Nazara/Platform.hpp>
#include <Nazara/Graphics.hpp>
#include <Nazara/Renderer.hpp>
#include <NZSL/SpirvConstantCache.hpp>
#include <NZSL/SpirvPrinter.hpp>
#include <Nazara/Utility.hpp>
#include <array>
#include <chrono>

2
examples/Physics2DDemo/main.cpp
View File

@ -10,8 +10,6 @@
#include <Nazara/Physics2D/Components.hpp>
#include <Nazara/Physics2D/Systems.hpp>
#include <Nazara/Renderer.hpp>
#include <NZSL/SpirvConstantCache.hpp>
#include <NZSL/SpirvPrinter.hpp>
#include <Nazara/Utility.hpp>
#include <Nazara/Utility/Components.hpp>
#include <Nazara/Widgets.hpp>

2
examples/PhysicsDemo/main.cpp
View File

@ -10,8 +10,6 @@
#include <Nazara/Physics3D/Components.hpp>
#include <Nazara/Physics3D/Systems.hpp>
#include <Nazara/Renderer.hpp>
#include <NZSL/SpirvConstantCache.hpp>
#include <NZSL/SpirvPrinter.hpp>
#include <Nazara/Utility.hpp>
#include <Nazara/Utility/Components.hpp>
#include <entt/entt.hpp>

2
examples/Std140Debug/main.cpp
View File

@ -2,7 +2,7 @@
#include <Nazara/OpenGLRenderer.hpp>
#include <Nazara/OpenGLRenderer/Wrapper.hpp>
#include <Nazara/Renderer.hpp>
#include <NZSL/FieldOffsets.hpp>
#include <NZSL/Math/FieldOffsets.hpp>
#include <iostream>
#include <numeric>

2
examples/WidgetDemo/main.cpp
View File

@ -10,8 +10,6 @@
#include <Nazara/Physics3D/Components.hpp>
#include <Nazara/Physics3D/Systems.hpp>
#include <Nazara/Renderer.hpp>
#include <NZSL/SpirvConstantCache.hpp>
#include <NZSL/SpirvPrinter.hpp>
#include <Nazara/Utility.hpp>
#include <Nazara/Utility/Components.hpp>
#include <Nazara/Widgets.hpp>

2
src/Nazara/Graphics/BasicMaterial.cpp
View File

@ -10,8 +10,8 @@
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Utility/BufferMapper.hpp>
#include <Nazara/Utility/MaterialData.hpp>
#include <NZSL/FieldOffsets.hpp>
#include <NZSL/Parser.hpp>
#include <NZSL/Math/FieldOffsets.hpp>
#include <cassert>
#include <Nazara/Graphics/Debug.hpp>

2
src/Nazara/Graphics/DepthMaterial.cpp
View File

@ -3,8 +3,8 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Graphics/DepthMaterial.hpp>
#include <NZSL/FieldOffsets.hpp>
#include <NZSL/Parser.hpp>
#include <NZSL/Math/FieldOffsets.hpp>
#include <Nazara/Graphics/Debug.hpp>
namespace Nz

2
src/Nazara/Graphics/PhongLightingMaterial.cpp
View File

@ -9,8 +9,8 @@
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Utility/BufferMapper.hpp>
#include <Nazara/Utility/MaterialData.hpp>
#include <NZSL/FieldOffsets.hpp>
#include <NZSL/Parser.hpp>
#include <NZSL/Math/FieldOffsets.hpp>
#include <cassert>
#include <filesystem>
#include <Nazara/Graphics/Debug.hpp>

2
src/Nazara/Graphics/PredefinedShaderStructs.cpp
View File

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Graphics/PredefinedShaderStructs.hpp>
#include <NZSL/FieldOffsets.hpp>
#include <NZSL/Math/FieldOffsets.hpp>
#include <Nazara/Graphics/Debug.hpp>
namespace Nz

2
src/Nazara/VulkanRenderer/VulkanShaderModule.cpp
View File

@ -5,9 +5,9 @@
#include <Nazara/VulkanRenderer/VulkanShaderModule.hpp>
#include <NZSL/Lexer.hpp>
#include <NZSL/Parser.hpp>
#include <NZSL/SpirvDecoder.hpp>
#include <NZSL/SpirvWriter.hpp>
#include <NZSL/Ast/AstSerializer.hpp>
#include <NZSL/SpirV/SpirvDecoder.hpp>
#include <Nazara/VulkanRenderer/Debug.hpp>
namespace Nz

2
src/ShaderNode/Previews/PreviewValues.hpp
View File

@ -5,7 +5,7 @@
#include <Nazara/Prerequisites.hpp>
#include <ShaderNode/Enums.hpp>
#include <NZSL/Vector.hpp>
#include <NZSL/Math/Vector.hpp>
#include <array>
#include <vector>

4
src/ShaderNode/Widgets/CodeOutputWidget.cpp
View File

@ -4,8 +4,8 @@
#include <NZSL/Ast/ConstantPropagationVisitor.hpp>
#include <NZSL/Ast/EliminateUnusedPassVisitor.hpp>
#include <NZSL/Ast/SanitizeVisitor.hpp>
#include <NZSL/SpirvPrinter.hpp>
#include <NZSL/SpirvWriter.hpp>
#include <NZSL/SpirV/SpirvPrinter.hpp>
#include <ShaderNode/ShaderGraph.hpp>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
@ -36,7 +36,7 @@ m_shaderGraph(shaderGraph)
});
m_optimisationCheckbox = new QCheckBox;
m_optimisationCheckbox->setText("Enable optimisation");
m_optimisationCheckbox->setText("Enable optimization");
connect(m_optimisationCheckbox, &QCheckBox::stateChanged, [this](int)
{
Refresh();

3
xmake.lua
View File

@ -147,7 +147,8 @@ add_requires("openal-soft", { configs = { shared = true }})
add_requires("newtondynamics", { debug = is_plat("windows") and is_mode("debug") }) -- Newton doesn't like compiling in Debug on Linux
add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo")
add_requires("nazarautils", "nzsl", { debug = is_mode("debug") })
add_requires("nazarautils")
add_requires("nzsl", { debug = is_mode("debug"), configs = { with_symbols = not is_mode("release"), shared = true } })
if is_plat("macosx") then
add_requires("libx11")