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

Minor fixes

This commit is contained in:
Lynix 2020-06-18 20:04:25 +02:00
parent 691de5b5c4
commit 74acf440fc
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/OpenGLRenderer/Wrapper/Shader.inl
View File

@ -68,12 +68,12 @@ namespace Nz::GL
context.glSpecializeShaderARB(m_objectId, pEntryPoint, numSpecializationConstants, pConstantIndex, pConstantValue); 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); 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); context.glDeleteShader(objectId);
} }

2
src/Nazara/OpenGLRenderer/OpenGLRenderImage.cpp
View File

@ -17,7 +17,7 @@ namespace Nz
{ {
} }
void OpenGLRenderImage::Execute(const std::function<void(CommandBufferBuilder& builder)>& callback, QueueTypeFlags queueTypeFlags) void OpenGLRenderImage::Execute(const std::function<void(CommandBufferBuilder& builder)>& callback, QueueTypeFlags /*queueTypeFlags*/)
{ {
OpenGLCommandBuffer commandBuffer; OpenGLCommandBuffer commandBuffer;
OpenGLCommandBufferBuilder builder(commandBuffer); OpenGLCommandBufferBuilder builder(commandBuffer);

1
src/ShaderNode/Widgets/InputEditor.cpp
View File

@ -50,6 +50,7 @@ void InputEditor::OnEditInput(int inputIndex)
const auto& input = m_shaderGraph.GetInput(inputIndex); const auto& input = m_shaderGraph.GetInput(inputIndex);
InputInfo info; InputInfo info;
info.locationIndex = input.locationIndex;
info.name = input.name; info.name = input.name;
info.type = input.type; info.type = input.type;
info.role = input.role; info.role = input.role;

9
src/ShaderNode/Widgets/OutputEditor.cpp
View File

@ -47,11 +47,12 @@ void OutputEditor::OnAddOutput()
void OutputEditor::OnEditOutput(int inputIndex) void OutputEditor::OnEditOutput(int inputIndex)
{ {
const auto& input = m_shaderGraph.GetOutput(inputIndex); const auto& output = m_shaderGraph.GetOutput(inputIndex);
OutputInfo info; OutputInfo info;
info.name = input.name; info.locationIndex = output.locationIndex;
info.type = input.type; info.name = output.name;
info.type = output.type;
OutputEditDialog* dialog = new OutputEditDialog(std::move(info), this); OutputEditDialog* dialog = new OutputEditDialog(std::move(info), this);
dialog->setAttribute(Qt::WA_DeleteOnClose, true); dialog->setAttribute(Qt::WA_DeleteOnClose, true);
@ -67,9 +68,7 @@ void OutputEditor::OnEditOutput(int inputIndex)
void OutputEditor::OnOutputSelectionUpdate(int inputIndex) void OutputEditor::OnOutputSelectionUpdate(int inputIndex)
{ {
if (inputIndex >= 0) if (inputIndex >= 0)
{
m_currentOutputIndex = inputIndex; m_currentOutputIndex = inputIndex;
}
else else
m_currentOutputIndex.reset(); m_currentOutputIndex.reset();
} }