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

Fixed (?) potential bug with Shader::SendTexture 

Former-commit-id: bd59f728396589aec5a420d675cf290019c0c042
This commit is contained in:
Lynix 2013-06-24 00:31:57 +02:00
parent e78db0feca
commit 050f9c2eb7
2 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Nazara/Renderer/GLSLShader.cpp
View File

@ -396,7 +396,7 @@ bool NzGLSLShader::SendTexture(int location, const NzTexture* texture, nzUInt8*
*textureUnit = slot.unit; *textureUnit = slot.unit;
} }
else else
m_textures.erase(it); // On supprime le slot slot.enabled = false;
} }
else if (textureUnit) else if (textureUnit)
*textureUnit = slot.unit; *textureUnit = slot.unit;
@ -412,44 +412,20 @@ bool NzGLSLShader::SendTexture(int location, const NzTexture* texture, nzUInt8*
} }
// À partir d'ici nous savons qu'il y a au moins un identifiant de texture libre // À partir d'ici nous savons qu'il y a au moins un identifiant de texture libre
nzUInt8 unit;
if (unitUsed == 0)
// Pas d'unité utilisée, la tâche est simple
unit = 0;
else
{
auto it2 = m_textures.rbegin(); // Itérateur vers la fin de la map
unit = it2->second.unit;
if (unit == maxUnits-1)
{
// Il y a une place libre, mais pas à la fin
for (; it2 != m_textures.rend(); ++it2)
{
if (unit - it2->second.unit > 1) // Si l'espace entre les indices est supérieur à 1, alors il y a une place libre
{
unit--;
break;
}
}
}
else
// Il y a une place libre à la fin
unit++;
}
TextureSlot slot; TextureSlot slot;
slot.enabled = texture->IsValid(); slot.enabled = texture->IsValid();
slot.unit = unit; slot.unit = unitUsed+1;
slot.texture = texture; slot.texture = texture;
if (slot.enabled) if (slot.enabled)
{ {
if (glProgramUniform1i) if (glProgramUniform1i)
glProgramUniform1i(m_program, location, unit); glProgramUniform1i(m_program, location, slot.unit);
else else
{ {
NzOpenGL::BindProgram(m_program); NzOpenGL::BindProgram(m_program);
glUniform1i(location, unit); glUniform1i(location, slot.unit);
} }
} }
@ -457,7 +433,7 @@ bool NzGLSLShader::SendTexture(int location, const NzTexture* texture, nzUInt8*
texture->AddResourceListener(this, location); texture->AddResourceListener(this, location);
if (textureUnit) if (textureUnit)
*textureUnit = unit; *textureUnit = slot.unit;
} }
return true; return true;

2
src/Nazara/Renderer/GLSLShader.hpp
View File

@ -70,7 +70,7 @@ class NzGLSLShader : public NzAbstractShader, NzResourceListener
}; };
mutable std::unordered_map<NzString, GLint> m_idCache; mutable std::unordered_map<NzString, GLint> m_idCache;
std::map<GLint, TextureSlot> m_textures; ///FIXME: unordered_map std::map<GLint, TextureSlot> m_textures;
GLuint m_program; GLuint m_program;
GLuint m_shaders[nzShaderType_Max+1]; GLuint m_shaders[nzShaderType_Max+1];
NzShader* m_parent; NzShader* m_parent;