mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes Handle from ShaderProgram to use more high-level objects.

Browse Source 
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D4403
This was SVN commit r26138.
This commit is contained in:
vladislavbelov
2021-12-29 07:07:08 +00:00
parent b9e4c14083
commit 92cf0c784c
6 changed files with 28 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ShaderProgram.cpp
+19 -34
View File
@@ -165,35 +165,25 @@ public:
return Binding((int)fPair.second, index);
}
void BindTexture(texture_id_t id, Handle tex) override
{
frag_index_pair_t fPair = GetUniformFragmentIndex(id);
int index = fPair.first;
if (index != -1)
{
GLuint h;
ogl_tex_get_texture_id(tex, &h);
glActiveTextureARB(GL_TEXTURE0+index);
glBindTexture(fPair.second, h);
}
}
void BindTexture(texture_id_t id, GLuint tex) override
{
frag_index_pair_t fPair = GetUniformFragmentIndex(id);
int index = fPair.first;
if (index != -1)
{
glActiveTextureARB(GL_TEXTURE0+index);
glActiveTextureARB(GL_TEXTURE0 + index);
glBindTexture(fPair.second, tex);
}
}
void BindTexture(Binding id, Handle tex) override
void BindTexture(Binding id, GLuint tex) override
{
int index = id.second;
if (index != -1)
ogl_tex_bind(tex, index);
{
glActiveTextureARB(GL_TEXTURE0 + index);
glBindTexture(id.first, tex);
}
}
Binding GetUniformBinding(uniform_id_t id) override
@@ -537,18 +527,6 @@ public:
return Binding((int)it->second.first, it->second.second);
}
void BindTexture(texture_id_t id, Handle tex) override
{
std::map<CStrIntern, std::pair<GLenum, int> >::iterator it = m_Samplers.find(CStrIntern(id));
if (it == m_Samplers.end())
return;
GLuint h;
ogl_tex_get_texture_id(tex, &h);
glActiveTextureARB(GL_TEXTURE0 + it->second.second);
glBindTexture(it->second.first, h);
}
void BindTexture(texture_id_t id, GLuint tex) override
{
std::map<CStrIntern, std::pair<GLenum, int> >::iterator it = m_Samplers.find(CStrIntern(id));
@@ -559,15 +537,13 @@ public:
glBindTexture(it->second.first, tex);
}
void BindTexture(Binding id, Handle tex) override
void BindTexture(Binding id, GLuint tex) override
{
if (id.second == -1)
return;
GLuint h;
ogl_tex_get_texture_id(tex, &h);
glActiveTextureARB(GL_TEXTURE0 + id.second);
glBindTexture(id.first, h);
glBindTexture(id.first, tex);
}
Binding GetUniformBinding(uniform_id_t id) override
@@ -743,9 +719,18 @@ int CShaderProgram::GetStreamFlags() const
return m_StreamFlags;
}
void CShaderProgram::BindTexture(texture_id_t id, CTexturePtr tex)
void CShaderProgram::BindTexture(texture_id_t id, const CTexturePtr& tex)
{
BindTexture(id, tex->GetHandle());
GLuint h;
ogl_tex_get_texture_id(tex->GetHandle(), &h);
BindTexture(id, h);
}
void CShaderProgram::BindTexture(Binding id, const CTexturePtr& tex)
{
GLuint h;
ogl_tex_get_texture_id(tex->GetHandle(), &h);
BindTexture(id, h);
}
void CShaderProgram::Uniform(Binding id, int v)