Make changes for breaking NZSL update
Fix build Fix compilation (again) Fix global included TextureAsset belongs to another branch Add missing include Fix include (should be good, finally)
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
#include <Nazara/Utility/UniformBuffer.hpp>
|
||||
#include <NazaraUtils/Signal.hpp>
|
||||
#include <NZSL/Ast/ConstantValue.hpp>
|
||||
#include <NZSL/Ast/Option.hpp>
|
||||
#include <array>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
@@ -30,7 +31,7 @@ namespace Nz
|
||||
{
|
||||
MaterialPassFlags flags;
|
||||
RenderStates states;
|
||||
std::unordered_map<UInt32, nzsl::Ast::ConstantSingleValue> options;
|
||||
std::unordered_map<nzsl::Ast::OptionHash, nzsl::Ast::ConstantSingleValue> options;
|
||||
std::vector<std::shared_ptr<UberShader>> shaders;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <Nazara/Renderer/RenderPipelineLayout.hpp>
|
||||
#include <NZSL/Ast/Module.hpp>
|
||||
#include <NZSL/Ast/RecursiveVisitor.hpp>
|
||||
#include <NZSL/Ast/Option.hpp>
|
||||
#include <NZSL/Math/FieldOffsets.hpp>
|
||||
#include <unordered_map>
|
||||
|
||||
@@ -82,7 +83,7 @@ namespace Nz
|
||||
struct OptionData
|
||||
{
|
||||
nzsl::Ast::ExpressionType type;
|
||||
UInt32 hash;
|
||||
nzsl::Ast::OptionHash hash;
|
||||
};
|
||||
|
||||
struct StructMemberData
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <NazaraUtils/Signal.hpp>
|
||||
#include <NZSL/ModuleResolver.hpp>
|
||||
#include <NZSL/Ast/Module.hpp>
|
||||
#include <NZSL/Ast/Option.hpp>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
|
||||
@@ -59,7 +60,7 @@ namespace Nz
|
||||
|
||||
struct Option
|
||||
{
|
||||
UInt32 hash;
|
||||
nzsl::Ast::OptionHash hash;
|
||||
};
|
||||
|
||||
NazaraSignal(OnShaderUpdated, UberShader* /*uberShader*/);
|
||||
|
||||
Reference in New Issue
Block a user