ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Texturing shouldn't break anymore when changing the 3D core.

This commit is contained in:
luigi__ 2008-12-28 18:53:22 +00:00
parent a78eba5604
commit 49b10c65e3
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
desmume/src/OGLRender.cpp
View File

@ -440,7 +440,10 @@ static char OGLInit(void)
glUniform1i(loc, 1); glUniform1i(loc, 1);
hasTexLoc = glGetUniformLocation(shaderProgram, "hasTexture"); hasTexLoc = glGetUniformLocation(shaderProgram, "hasTexture");
glUniform1i(hasTexLoc, 1);
texBlendLoc = glGetUniformLocation(shaderProgram, "texBlending"); texBlendLoc = glGetUniformLocation(shaderProgram, "texBlending");
glUniform1i(texBlendLoc, 0);
} }
//we want to use alpha destination blending so we can track the last-rendered alpha value //we want to use alpha destination blending so we can track the last-rendered alpha value
@ -464,6 +467,8 @@ static char OGLInit(void)
else else
clearAlpha = 0; clearAlpha = 0;
OGLReset();
ENDGL(); ENDGL();
return 1; return 1;
@ -471,6 +476,9 @@ static char OGLInit(void)
static void OGLClose() static void OGLClose()
{ {
if(!BEGINGL())
return;
if(hasShaders) if(hasShaders)
{ {
glUseProgram(0); glUseProgram(0);
@ -484,6 +492,11 @@ static void OGLClose()
hasShaders = false; hasShaders = false;
} }
glDeleteTextures(MAX_TEXTURE, &oglTempTextureID[0]);
glDeleteTextures(1, &oglToonTableTextureID);
ENDGL();
} }
//zero 9/7/08 - changed *adr= to adr= while changing from c++. was that a bug? //zero 9/7/08 - changed *adr= to adr= while changing from c++. was that a bug?