diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Shader.inl b/include/Nazara/OpenGLRenderer/Wrapper/Shader.inl index fe062149f..f73421706 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/Shader.inl +++ b/include/Nazara/OpenGLRenderer/Wrapper/Shader.inl @@ -68,12 +68,12 @@ namespace Nz::GL context.glSpecializeShaderARB(m_objectId, pEntryPoint, numSpecializationConstants, pConstantIndex, pConstantValue); } - inline GLuint Shader::CreateHelper(OpenGLDevice& device, const Context& context, GLenum shaderStage) + inline GLuint Shader::CreateHelper(OpenGLDevice& /*device*/, const Context& context, GLenum shaderStage) { return context.glCreateShader(shaderStage); } - inline void Shader::DestroyHelper(OpenGLDevice& device, const Context& context, GLuint objectId) + inline void Shader::DestroyHelper(OpenGLDevice& /*device*/, const Context& context, GLuint objectId) { context.glDeleteShader(objectId); } diff --git a/src/Nazara/OpenGLRenderer/OpenGLRenderImage.cpp b/src/Nazara/OpenGLRenderer/OpenGLRenderImage.cpp index 34946874b..39c2be6dd 100644 --- a/src/Nazara/OpenGLRenderer/OpenGLRenderImage.cpp +++ b/src/Nazara/OpenGLRenderer/OpenGLRenderImage.cpp @@ -17,7 +17,7 @@ namespace Nz { } - void OpenGLRenderImage::Execute(const std::function& callback, QueueTypeFlags queueTypeFlags) + void OpenGLRenderImage::Execute(const std::function& callback, QueueTypeFlags /*queueTypeFlags*/) { OpenGLCommandBuffer commandBuffer; OpenGLCommandBufferBuilder builder(commandBuffer); diff --git a/src/ShaderNode/Widgets/InputEditor.cpp b/src/ShaderNode/Widgets/InputEditor.cpp index f281c327a..7898c3c27 100644 --- a/src/ShaderNode/Widgets/InputEditor.cpp +++ b/src/ShaderNode/Widgets/InputEditor.cpp @@ -50,6 +50,7 @@ void InputEditor::OnEditInput(int inputIndex) const auto& input = m_shaderGraph.GetInput(inputIndex); InputInfo info; + info.locationIndex = input.locationIndex; info.name = input.name; info.type = input.type; info.role = input.role; diff --git a/src/ShaderNode/Widgets/OutputEditor.cpp b/src/ShaderNode/Widgets/OutputEditor.cpp index 868168c8a..40b8eea49 100644 --- a/src/ShaderNode/Widgets/OutputEditor.cpp +++ b/src/ShaderNode/Widgets/OutputEditor.cpp @@ -47,11 +47,12 @@ void OutputEditor::OnAddOutput() void OutputEditor::OnEditOutput(int inputIndex) { - const auto& input = m_shaderGraph.GetOutput(inputIndex); + const auto& output = m_shaderGraph.GetOutput(inputIndex); OutputInfo info; - info.name = input.name; - info.type = input.type; + info.locationIndex = output.locationIndex; + info.name = output.name; + info.type = output.type; OutputEditDialog* dialog = new OutputEditDialog(std::move(info), this); dialog->setAttribute(Qt::WA_DeleteOnClose, true); @@ -67,9 +68,7 @@ void OutputEditor::OnEditOutput(int inputIndex) void OutputEditor::OnOutputSelectionUpdate(int inputIndex) { if (inputIndex >= 0) - { m_currentOutputIndex = inputIndex; - } else m_currentOutputIndex.reset(); }