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

Shader: Add module statement

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-03-01 19:36:18 +01:00
parent ad892dfb43
commit 99e07e6e1e
56 changed files with 418 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/VulkanRenderer/VulkanDevice.cpp
View File

@@ -61,10 +61,10 @@ namespace Nz
return pipelineLayout;
}
std::shared_ptr<ShaderModule> VulkanDevice::InstantiateShaderModule(ShaderStageTypeFlags stages, ShaderAst::Statement& shaderAst, const ShaderWriter::States& states)
std::shared_ptr<ShaderModule> VulkanDevice::InstantiateShaderModule(ShaderStageTypeFlags stages, ShaderAst::Module& shaderModule, const ShaderWriter::States& states)
{
auto stage = std::make_shared<VulkanShaderModule>();
if (!stage->Create(*this, stages, shaderAst, states))
if (!stage->Create(*this, stages, shaderModule, states))
throw std::runtime_error("failed to instantiate vulkan shader module");
return stage;

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

@@ -57,14 +57,14 @@ namespace Nz
};
}
bool VulkanShaderModule::Create(Vk::Device& device, ShaderStageTypeFlags shaderStages, ShaderAst::Statement& shaderAst, const ShaderWriter::States& states)
bool VulkanShaderModule::Create(Vk::Device& device, ShaderStageTypeFlags shaderStages, ShaderAst::Module& shaderModule, const ShaderWriter::States& states)
{
SpirvWriter::Environment env;
SpirvWriter writer;
writer.SetEnv(env);
std::vector<UInt32> code = writer.Generate(shaderAst, states);
std::vector<UInt32> code = writer.Generate(shaderModule, states);
return Create(device, shaderStages, ShaderLanguage::SpirV, code.data(), code.size() * sizeof(UInt32), {});
}
@@ -88,8 +88,8 @@ namespace Nz
std::vector<ShaderLang::Token> tokens = ShaderLang::Tokenize(std::string_view(static_cast<const char*>(source), sourceSize));
ShaderLang::Parser parser;
ShaderAst::StatementPtr shaderAst = parser.Parse(tokens);
return Create(device, shaderStages, *shaderAst, states);
ShaderAst::ModulePtr shaderModule = parser.Parse(tokens);
return Create(device, shaderStages, *shaderModule, states);
}
case ShaderLanguage::SpirV: