MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Refactor: rename InitGLSLCombiner and DestroyGLSLCombiner

Browse Source 
to InitShaderCombiner and DestroyShaderCombiner().
This commit is contained in:
Sergey Lipskiy 2014-09-02 22:07:25 +07:00
parent 0f176dcc4c
commit b537b985ab
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Combiner.cpp
View File

@ -104,13 +104,13 @@ static DWORD64 ACEncodeD[] =
void CombinerInfo::init()
{
InitGLSLCombiner();
InitShaderCombiner();
m_pCurrent = NULL;
}
void CombinerInfo::destroy()
{
DestroyGLSLCombiner();
DestroyShaderCombiner();
m_pCurrent = NULL;
for (Combiners::iterator cur = m_combiners.begin(); cur != m_combiners.end(); ++cur)
delete cur->second;

4
GLSLCombiner.cpp
View File

@ -151,7 +151,7 @@ void DestroyShadowMapShader()
}
#endif // GLES2
void InitGLSLCombiner()
void InitShaderCombiner()
{
glActiveTexture(GL_TEXTURE0);
glEnable(GL_TEXTURE_2D);
@ -197,7 +197,7 @@ void InitGLSLCombiner()
#endif
}
void DestroyGLSLCombiner() {
void DestroyShaderCombiner() {
glBindFramebuffer(GL_FRAMEBUFFER, 0);
#ifndef GLES2

4
GLSLCombiner.h
View File

@ -104,7 +104,7 @@ private:
int m_nInputs;
};
void InitGLSLCombiner();
void DestroyGLSLCombiner();
void InitShaderCombiner();
void DestroyShaderCombiner();
#endif //GLSL_COMBINER_H