diff --git a/include/Nazara/Graphics/Material.hpp b/include/Nazara/Graphics/Material.hpp index 3e2d24ce1..7cfb01008 100644 --- a/include/Nazara/Graphics/Material.hpp +++ b/include/Nazara/Graphics/Material.hpp @@ -93,10 +93,10 @@ namespace Nz inline void SetFaceFilling(FaceFilling filling); inline void SetLineWidth(float lineWidth); inline void SetPointSize(float pointSize); - inline void SetUniformBuffer(std::size_t bufferIndex, std::shared_ptr uniformBuffer); inline void SetSrcBlend(BlendFunc func); inline void SetTexture(std::size_t textureIndex, std::shared_ptr texture); inline void SetTextureSampler(std::size_t textureIndex, TextureSamplerInfo samplerInfo); + inline void SetUniformBuffer(std::size_t bufferIndex, std::shared_ptr uniformBuffer); void UpdateShaderBinding(ShaderBinding& shaderBinding) const; diff --git a/include/Nazara/Graphics/Material.inl b/include/Nazara/Graphics/Material.inl index ddf82a7ce..3f7f2d85a 100644 --- a/include/Nazara/Graphics/Material.inl +++ b/include/Nazara/Graphics/Material.inl @@ -674,15 +674,20 @@ namespace Nz InvalidatePipeline(); } - inline void Material::SetUniformBuffer(std::size_t bufferIndex, std::shared_ptr uniformBuffer) + /*! + * \brief Sets the src in blend + * + * \param func Function for src blending + * + * \remark Invalidates the pipeline + * + * \see GetSrcBlend + */ + inline void Material::SetSrcBlend(BlendFunc func) { - NazaraAssert(bufferIndex < m_uniformBuffers.size(), "Invalid shared uniform buffer index"); - if (m_uniformBuffers[bufferIndex].buffer != uniformBuffer) - { - m_uniformBuffers[bufferIndex].buffer = std::move(uniformBuffer); - m_uniformBuffers[bufferIndex].dataInvalidated = true; - InvalidateShaderBinding(); - } + m_pipelineInfo.srcBlend = func; + + InvalidatePipeline(); } inline void Material::SetTexture(std::size_t textureIndex, std::shared_ptr texture) @@ -705,20 +710,15 @@ namespace Nz } } - /*! - * \brief Sets the src in blend - * - * \param func Function for src blending - * - * \remark Invalidates the pipeline - * - * \see GetSrcBlend - */ - inline void Material::SetSrcBlend(BlendFunc func) + inline void Material::SetUniformBuffer(std::size_t bufferIndex, std::shared_ptr uniformBuffer) { - m_pipelineInfo.srcBlend = func; - - InvalidatePipeline(); + NazaraAssert(bufferIndex < m_uniformBuffers.size(), "Invalid shared uniform buffer index"); + if (m_uniformBuffers[bufferIndex].buffer != uniformBuffer) + { + m_uniformBuffers[bufferIndex].buffer = std::move(uniformBuffer); + m_uniformBuffers[bufferIndex].dataInvalidated = true; + InvalidateShaderBinding(); + } } inline void Material::InvalidatePipeline()