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

Fix compilation with last nzsl version

This commit is contained in:
SirLynix 2022-07-27 23:15:08 +02:00
parent ddd9ecc2a2
commit 6004987dee
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ShaderNode/ShaderGraph.cpp
View File

@ -464,7 +464,7 @@ nzsl::Ast::ModulePtr ShaderGraph::ToModule() const
for (const auto& structInfo : m_structs) for (const auto& structInfo : m_structs)
{ {
nzsl::Ast::StructDescription structDesc; nzsl::Ast::StructDescription structDesc;
structDesc.layout = nzsl::StructLayout::Std140; structDesc.layout = nzsl::Ast::MemoryLayout::Std140;
structDesc.name = structInfo.name; structDesc.name = structInfo.name;
for (const auto& memberInfo : structInfo.members) for (const auto& memberInfo : structInfo.members)

2
src/ShaderNode/Widgets/MainWindow.cpp
View File

@ -192,7 +192,7 @@ void MainWindow::OnCompile()
Nz::File file(fileName.toStdString(), Nz::OpenMode::WriteOnly); Nz::File file(fileName.toStdString(), Nz::OpenMode::WriteOnly);
nzsl::Serializer serializer; nzsl::Serializer serializer;
nzsl::Ast::SerializeShader(serializer, shaderModule); nzsl::Ast::SerializeShader(serializer, *shaderModule);
const std::vector<std::uint8_t>& data = serializer.GetData(); const std::vector<std::uint8_t>& data = serializer.GetData();
file.Write(data.data(), data.size()); file.Write(data.data(), data.size());