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

27
desmume/src/OGLRender.cpp
View File

@ -783,7 +783,10 @@ static void BeginRenderPoly()
xglPolygonMode (GL_FRONT_AND_BACK, GL_LINE); xglPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
} }
if (gfx3d.renderState.enableTexturing)
{
setTexture(textureFormat, texturePalette); setTexture(textureFormat, texturePalette);
}
if(isTranslucent) if(isTranslucent)
enableDepthWrite = alphaDepthWrite; enableDepthWrite = alphaDepthWrite;
@ -879,8 +882,28 @@ static void InstallPolygonAttrib(u32 val)
static void Control() static void Control()
{ {
if(gfx3d.renderState.enableTexturing) glEnable (GL_TEXTURE_2D); if (gfx3d.renderState.enableTexturing)
else glDisable (GL_TEXTURE_2D); {
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) if(gfx3d.renderState.enableAlphaTest)
// FIXME: alpha test should pass gfx3d.alphaTestRef==poly->getAlpha // FIXME: alpha test should pass gfx3d.alphaTestRef==poly->getAlpha