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

Graphics/RenderTechnique: Add uniform invalidation

Browse Source 
Former-commit-id: 8f03073408a03854533d9911eb1a0605ebbb8767
This commit is contained in:
Lynix
2015-06-07 18:25:35 +02:00
parent 358fab7115
commit 0f4cf3c910
6 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nazara/Graphics/DeferredGeometryPass.cpp
View File

@@ -240,12 +240,20 @@ const NzDeferredGeometryPass::ShaderUniforms* NzDeferredGeometryPass::GetShaderU
if (it == m_shaderUniforms.end())
{
ShaderUniforms uniforms;
uniforms.shaderReleaseSlot.Connect(shader->OnShaderRelease, this, OnShaderInvalidated);
uniforms.shaderUniformInvalidatedSlot.Connect(shader->OnShaderUniformInvalidated, this, OnShaderInvalidated);
uniforms.eyePosition = shader->GetUniformLocation("EyePosition");
uniforms.sceneAmbient = shader->GetUniformLocation("SceneAmbient");
uniforms.textureOverlay = shader->GetUniformLocation("TextureOverlay");
it = m_shaderUniforms.emplace(shader, uniforms).first;
it = m_shaderUniforms.emplace(shader, std::move(uniforms)).first;
}
return &it->second;
}
void NzDeferredGeometryPass::OnShaderInvalidated(const NzShader* shader) const
{
m_shaderUniforms.erase(shader);
}

12
src/Nazara/Graphics/ForwardRenderTechnique.cpp
View File

@@ -21,8 +21,6 @@
#include <memory>
#include <Nazara/Graphics/Debug.hpp>
///TODO: Surveiller les shaders et supprimer les données uniformes en cas de changement (recompilation/destruction)
namespace
{
struct BillboardPoint
@@ -738,6 +736,9 @@ const NzForwardRenderTechnique::ShaderUniforms* NzForwardRenderTechnique::GetSha
if (it == m_shaderUniforms.end())
{
ShaderUniforms uniforms;
uniforms.shaderReleaseSlot.Connect(shader->OnShaderRelease, this, OnShaderInvalidated);
uniforms.shaderUniformInvalidatedSlot.Connect(shader->OnShaderUniformInvalidated, this, OnShaderInvalidated);
uniforms.eyePosition = shader->GetUniformLocation("EyePosition");
uniforms.sceneAmbient = shader->GetUniformLocation("SceneAmbient");
uniforms.textureOverlay = shader->GetUniformLocation("TextureOverlay");
@@ -760,12 +761,17 @@ const NzForwardRenderTechnique::ShaderUniforms* NzForwardRenderTechnique::GetSha
else
uniforms.hasLightUniforms = false;
it = m_shaderUniforms.emplace(shader, uniforms).first;
it = m_shaderUniforms.emplace(shader, std::move(uniforms)).first;
}
return &it->second;
}
void NzForwardRenderTechnique::OnShaderInvalidated(const NzShader* shader) const
{
m_shaderUniforms.erase(shader);
}
NzIndexBuffer NzForwardRenderTechnique::s_quadIndexBuffer;
NzVertexBuffer NzForwardRenderTechnique::s_quadVertexBuffer;
NzVertexDeclaration NzForwardRenderTechnique::s_billboardInstanceDeclaration;

4
src/Nazara/Renderer/Shader.cpp
View File

@@ -18,6 +18,8 @@ m_program(0)
NzShader::~NzShader()
{
OnShaderRelease(this);
Destroy();
}
@@ -779,6 +781,8 @@ bool NzShader::PostLinkage()
#undef CacheUniform
OnShaderUniformInvalidated(this);
return true;
}
else