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

ShaderNode: Fix compilation

This commit is contained in:
Lynix 2022-06-07 20:59:54 +02:00
parent 61722d1c9b
commit 916fecbf37
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ void CodeOutputWidget::Refresh()
shaderModule = nzsl::Ast::EliminateUnusedPass(*shaderModule); shaderModule = nzsl::Ast::EliminateUnusedPass(*shaderModule);
} }
std::string output; std::string codeOutput;
OutputLanguage outputLang = static_cast<OutputLanguage>(m_outputLang->currentIndex()); OutputLanguage outputLang = static_cast<OutputLanguage>(m_outputLang->currentIndex());
switch (outputLang) switch (outputLang)
{ {
@ -92,14 +92,15 @@ void CodeOutputWidget::Refresh()
bindingMapping.emplace(Nz::UInt64(texture.setIndex) << 32 | Nz::UInt64(texture.bindingIndex), bindingMapping.size()); bindingMapping.emplace(Nz::UInt64(texture.setIndex) << 32 | Nz::UInt64(texture.bindingIndex), bindingMapping.size());
nzsl::GlslWriter writer; nzsl::GlslWriter writer;
output = writer.Generate(ShaderGraph::ToShaderStageType(m_shaderGraph.GetType()), *shaderModule, bindingMapping, states); nzsl::GlslWriter::Output output = writer.Generate(ShaderGraph::ToShaderStageType(m_shaderGraph.GetType()), *shaderModule, bindingMapping, states);
codeOutput = std::move(output.code);
break; break;
} }
case OutputLanguage::NZSL: case OutputLanguage::NZSL:
{ {
nzsl::LangWriter writer; nzsl::LangWriter writer;
output = writer.Generate(*shaderModule, states); codeOutput = writer.Generate(*shaderModule, states);
break; break;
} }
@ -109,13 +110,13 @@ void CodeOutputWidget::Refresh()
std::vector<std::uint32_t> spirv = writer.Generate(*shaderModule, states); std::vector<std::uint32_t> spirv = writer.Generate(*shaderModule, states);
nzsl::SpirvPrinter printer; nzsl::SpirvPrinter printer;
output = printer.Print(spirv.data(), spirv.size()); codeOutput = printer.Print(spirv.data(), spirv.size());
break; break;
} }
} }
int scrollValue = m_textOutput->verticalScrollBar()->value(); int scrollValue = m_textOutput->verticalScrollBar()->value();
m_textOutput->setText(QString::fromStdString(output)); m_textOutput->setText(QString::fromStdString(codeOutput));
m_textOutput->verticalScrollBar()->setValue(scrollValue); m_textOutput->verticalScrollBar()->setValue(scrollValue);
} }
catch (const std::exception& e) catch (const std::exception& e)