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

OpenGLRenderer: Fix explicit texture/block binding (fixes GLSL ES 3.0 support)

Browse Source
This commit is contained in:
SirLynix
2022-08-12 23:01:58 +02:00
parent c4a3b3f18a
commit 099528758c
6 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Nazara/OpenGLRenderer/OpenGLRenderPipeline.cpp
View File

@@ -34,11 +34,12 @@ namespace Nz
activeContext->UpdateStates(m_pipelineInfo, false);
nzsl::ShaderStageTypeFlags stageFlags;
std::vector<OpenGLShaderModule::ExplicitBinding> explicitBindings;
for (const auto& shaderModulePtr : m_pipelineInfo.shaderModules)
{
OpenGLShaderModule& shaderModule = static_cast<OpenGLShaderModule&>(*shaderModulePtr);
stageFlags |= shaderModule.Attach(m_program, pipelineLayout.GetBindingMapping());
stageFlags |= shaderModule.Attach(m_program, pipelineLayout.GetBindingMapping(), &explicitBindings);
}
// OpenGL ES programs must have both vertex and fragment shaders or a compute shader or a mesh and fragment shader.
@@ -53,7 +54,7 @@ namespace Nz
dummyModule.rootNode->statements.push_back(nzsl::ShaderBuilder::DeclareFunction(stage, "main", {}, {}));
OpenGLShaderModule shaderModule(device, stage, dummyModule);
stageFlags |= shaderModule.Attach(m_program, pipelineLayout.GetBindingMapping());
stageFlags |= shaderModule.Attach(m_program, pipelineLayout.GetBindingMapping(), &explicitBindings);
}
};
@@ -70,6 +71,26 @@ namespace Nz
m_flipYUniformLocation = m_program.GetUniformLocation(nzsl::GlslWriter::GetFlipYUniformName().data());
if (m_flipYUniformLocation != -1)
m_program.Uniform(m_flipYUniformLocation, 1.f);
for (const auto& explicitBinding : explicitBindings)
{
if (explicitBinding.isBlock)
{
GLuint blockIndex = m_program.GetUniformBlockIndex(explicitBinding.name);
if (blockIndex == GL_INVALID_INDEX)
continue;
m_program.UniformBlockBinding(blockIndex, explicitBinding.binding);
}
else
{
int location = m_program.GetUniformLocation(explicitBinding.name);
if (location == -1)
continue;
m_program.Uniform(location, static_cast<int>(explicitBinding.binding)); //< FIXME: Use SafeCast
}
}
}
void OpenGLRenderPipeline::Apply(const GL::Context& context, bool flipViewport) const

23
src/Nazara/OpenGLRenderer/OpenGLShaderModule.cpp
View File

@@ -83,7 +83,7 @@ namespace Nz
}
}
nzsl::ShaderStageTypeFlags OpenGLShaderModule::Attach(GL::Program& program, const nzsl::GlslWriter::BindingMapping& bindingMapping) const
nzsl::ShaderStageTypeFlags OpenGLShaderModule::Attach(GL::Program& program, const nzsl::GlslWriter::BindingMapping& bindingMapping, std::vector<ExplicitBinding>* explicitBindings) const
{
const auto& context = m_device.GetReferenceContext();
const auto& contextParams = context.GetParams();
@@ -120,13 +120,24 @@ namespace Nz
nzsl::GlslWriter::Output output = writer.Generate(shaderEntry.stage, *arg.ast, bindingMapping, m_states);
shader.SetSource(output.code.data(), GLint(output.code.size()));
for (const auto& [name, bindingPoint] : output.explicitUniformBlockBinding)
if (explicitBindings)
{
GLuint blockIndex = program.GetUniformBlockIndex(name);
if (blockIndex == GL_INVALID_INDEX)
continue;
explicitBindings->reserve(explicitBindings->size() + output.explicitTextureBinding.size() + output.explicitUniformBlockBinding.size());
for (const auto& [name, bindingPoint] : output.explicitTextureBinding)
{
auto& explicitBinding = explicitBindings->emplace_back();
explicitBinding.name = name;
explicitBinding.binding = bindingPoint;
explicitBinding.isBlock = false;
}
program.UniformBlockBinding(blockIndex, bindingPoint);
for (const auto& [name, bindingPoint] : output.explicitUniformBlockBinding)
{
auto& explicitBinding = explicitBindings->emplace_back();
explicitBinding.name = name;
explicitBinding.binding = bindingPoint;
explicitBinding.isBlock = true;
}
}
}
else