From 7aafcfaae96def0753f9028ffbd47295955185dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Tue, 10 Aug 2021 10:35:59 +0200 Subject: [PATCH] Minor stuff --- include/Nazara/Graphics/BasicMaterial.hpp | 1 + src/Nazara/Graphics/BasicMaterial.cpp | 2 +- src/Nazara/Graphics/MaterialPipeline.cpp | 3 ++- .../Shaders/{basicmaterial.nzsl => basic_material.nzsl} | 0 src/Nazara/Graphics/UberShader.cpp | 2 +- src/Nazara/OpenGLRenderer/OpenGLShaderModule.cpp | 2 +- src/Nazara/OpenGLRenderer/Wrapper/Context.cpp | 2 +- src/Nazara/VulkanRenderer/VulkanRenderPipeline.cpp | 2 +- 8 files changed, 8 insertions(+), 6 deletions(-) rename src/Nazara/Graphics/Resources/Shaders/{basicmaterial.nzsl => basic_material.nzsl} (100%) diff --git a/include/Nazara/Graphics/BasicMaterial.hpp b/include/Nazara/Graphics/BasicMaterial.hpp index 7fd0640ff..4e2d27022 100644 --- a/include/Nazara/Graphics/BasicMaterial.hpp +++ b/include/Nazara/Graphics/BasicMaterial.hpp @@ -20,6 +20,7 @@ namespace Nz struct UniformOffsets; BasicMaterial(MaterialPass& material); + ~BasicMaterial() = default; inline void EnableAlphaTest(bool alphaTest); diff --git a/src/Nazara/Graphics/BasicMaterial.cpp b/src/Nazara/Graphics/BasicMaterial.cpp index 96547a221..4702c03a9 100644 --- a/src/Nazara/Graphics/BasicMaterial.cpp +++ b/src/Nazara/Graphics/BasicMaterial.cpp @@ -22,7 +22,7 @@ namespace Nz namespace { const UInt8 r_shader[] = { - #include + #include }; } diff --git a/src/Nazara/Graphics/MaterialPipeline.cpp b/src/Nazara/Graphics/MaterialPipeline.cpp index 86f822a1a..c2a1899dd 100644 --- a/src/Nazara/Graphics/MaterialPipeline.cpp +++ b/src/Nazara/Graphics/MaterialPipeline.cpp @@ -44,7 +44,7 @@ namespace Nz } RenderPipelineInfo renderPipelineInfo; - static_cast(renderPipelineInfo).operator=(m_pipelineInfo); // Not my proudest line + static_cast(renderPipelineInfo).operator=(m_pipelineInfo); // Not the line I4m the most proud of renderPipelineInfo.pipelineLayout = m_pipelineInfo.settings->GetRenderPipelineLayout(); @@ -58,6 +58,7 @@ namespace Nz return m_renderPipelines.emplace_back(Graphics::Instance()->GetRenderDevice()->InstantiateRenderPipeline(std::move(renderPipelineInfo))); } + /*! * \brief Returns a reference to a MaterialPipeline built with MaterialPipelineInfo * diff --git a/src/Nazara/Graphics/Resources/Shaders/basicmaterial.nzsl b/src/Nazara/Graphics/Resources/Shaders/basic_material.nzsl similarity index 100% rename from src/Nazara/Graphics/Resources/Shaders/basicmaterial.nzsl rename to src/Nazara/Graphics/Resources/Shaders/basic_material.nzsl diff --git a/src/Nazara/Graphics/UberShader.cpp b/src/Nazara/Graphics/UberShader.cpp index 3bb91f92b..74826806f 100644 --- a/src/Nazara/Graphics/UberShader.cpp +++ b/src/Nazara/Graphics/UberShader.cpp @@ -40,7 +40,7 @@ namespace Nz ShaderAst::AstReflect reflect; reflect.Reflect(*m_shaderAst, callbacks); - if (m_shaderStages & shaderStages != m_shaderStages) + if (m_shaderStages & supportedStageType != m_shaderStages) throw std::runtime_error("shader doesn't support all required shader stages"); if (optionCount >= 64) diff --git a/src/Nazara/OpenGLRenderer/OpenGLShaderModule.cpp b/src/Nazara/OpenGLRenderer/OpenGLShaderModule.cpp index 27aa72b3d..a2243fe0d 100644 --- a/src/Nazara/OpenGLRenderer/OpenGLShaderModule.cpp +++ b/src/Nazara/OpenGLRenderer/OpenGLShaderModule.cpp @@ -128,7 +128,7 @@ namespace Nz CheckCompilationStatus(shader); program.AttachShader(shader.GetObjectId()); - // Shader can be deleted now (it won't be deleted by the driver until program gets deleted) + // Shader object can be safely released now (it won't be deleted by the driver until program gets deleted) stageFlags |= shaderEntry.stage; } diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp b/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp index 5ff8b7d6f..c68f756d8 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp @@ -679,7 +679,7 @@ namespace Nz::GL bool Context::SetCurrentContext(const Context* context) { - const Context*& currentContext = s_currentContext; //< Pay TLS cost only once + const Context*& currentContext = s_currentContext; //< Pay TLS cost once if (currentContext == context) return true; diff --git a/src/Nazara/VulkanRenderer/VulkanRenderPipeline.cpp b/src/Nazara/VulkanRenderer/VulkanRenderPipeline.cpp index 0f538ffac..c40d22838 100644 --- a/src/Nazara/VulkanRenderer/VulkanRenderPipeline.cpp +++ b/src/Nazara/VulkanRenderer/VulkanRenderPipeline.cpp @@ -192,7 +192,7 @@ namespace Nz { assert(stagePtr); - Nz::VulkanShaderModule& vulkanModule = *static_cast(stagePtr.get()); + VulkanShaderModule& vulkanModule = static_cast(*stagePtr); for (auto& stage : vulkanModule.GetStages()) { VkPipelineShaderStageCreateInfo& createInfo = shaderStageCreateInfos.emplace_back();