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

OpenGL Renderer: 

- Fix enable texture setting.
This commit is contained in:
rogerman 2012-12-05 08:22:28 +00:00
parent e6615d640d
commit e8072e0eb0
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
desmume/src/OGLRender.cpp
View File

@ -782,8 +782,11 @@ static void BeginRenderPoly()
{
xglPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
}
setTexture(textureFormat, texturePalette);
if (gfx3d.renderState.enableTexturing)
{
setTexture(textureFormat, texturePalette);
}
if(isTranslucent)
enableDepthWrite = alphaDepthWrite;
@ -879,9 +882,29 @@ static void InstallPolygonAttrib(u32 val)
static void Control()
{
if(gfx3d.renderState.enableTexturing) glEnable (GL_TEXTURE_2D);
else glDisable (GL_TEXTURE_2D);
if (gfx3d.renderState.enableTexturing)
{
if (hasShaders)
{
glUniform1i(hasTexLoc, 1);
}
else
{
glEnable(GL_TEXTURE_2D);
}
}
else
{
if (hasShaders)
{
glUniform1i(hasTexLoc, 0);
}
else
{
glDisable(GL_TEXTURE_2D);
}
}
if(gfx3d.renderState.enableAlphaTest)
// FIXME: alpha test should pass gfx3d.alphaTestRef==poly->getAlpha
glAlphaFunc (GL_GREATER, gfx3d.renderState.alphaTestRef/31.f);