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

Function order

This commit is contained in:
Jérôme Leclercq 2021-01-27 18:53:02 +01:00
parent b9151d8a7a
commit 41c921bcf6
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Graphics/Material.hpp
View File

@ -93,10 +93,10 @@ namespace Nz
inline void SetFaceFilling(FaceFilling filling); inline void SetFaceFilling(FaceFilling filling);
inline void SetLineWidth(float lineWidth); inline void SetLineWidth(float lineWidth);
inline void SetPointSize(float pointSize); inline void SetPointSize(float pointSize);
inline void SetUniformBuffer(std::size_t bufferIndex, std::shared_ptr<AbstractBuffer> uniformBuffer);
inline void SetSrcBlend(BlendFunc func); inline void SetSrcBlend(BlendFunc func);
inline void SetTexture(std::size_t textureIndex, std::shared_ptr<Texture> texture); inline void SetTexture(std::size_t textureIndex, std::shared_ptr<Texture> texture);
inline void SetTextureSampler(std::size_t textureIndex, TextureSamplerInfo samplerInfo); inline void SetTextureSampler(std::size_t textureIndex, TextureSamplerInfo samplerInfo);
inline void SetUniformBuffer(std::size_t bufferIndex, std::shared_ptr<AbstractBuffer> uniformBuffer);
void UpdateShaderBinding(ShaderBinding& shaderBinding) const; void UpdateShaderBinding(ShaderBinding& shaderBinding) const;

42
include/Nazara/Graphics/Material.inl
View File

@ -674,15 +674,20 @@ namespace Nz
InvalidatePipeline(); InvalidatePipeline();
} }
inline void Material::SetUniformBuffer(std::size_t bufferIndex, std::shared_ptr<AbstractBuffer> 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"); m_pipelineInfo.srcBlend = func;
if (m_uniformBuffers[bufferIndex].buffer != uniformBuffer)
{ InvalidatePipeline();
m_uniformBuffers[bufferIndex].buffer = std::move(uniformBuffer);
m_uniformBuffers[bufferIndex].dataInvalidated = true;
InvalidateShaderBinding();
}
} }
inline void Material::SetTexture(std::size_t textureIndex, std::shared_ptr<Texture> texture) inline void Material::SetTexture(std::size_t textureIndex, std::shared_ptr<Texture> texture)
@ -705,20 +710,15 @@ namespace Nz
} }
} }
/*! inline void Material::SetUniformBuffer(std::size_t bufferIndex, std::shared_ptr<AbstractBuffer> 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)
{ {
m_pipelineInfo.srcBlend = func; NazaraAssert(bufferIndex < m_uniformBuffers.size(), "Invalid shared uniform buffer index");
if (m_uniformBuffers[bufferIndex].buffer != uniformBuffer)
InvalidatePipeline(); {
m_uniformBuffers[bufferIndex].buffer = std::move(uniformBuffer);
m_uniformBuffers[bufferIndex].dataInvalidated = true;
InvalidateShaderBinding();
}
} }
inline void Material::InvalidatePipeline() inline void Material::InvalidatePipeline()