Macintosh-SW
/
MacGLide
mirror of https://github.com/jenshemprich/MacGLide.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed alpha test state change inconsistencies

This commit is contained in:
Jens Hemprich 2007-08-26 20:05:31 +00:00
parent 4e9d33a345
commit 4c30564e19
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MacGLide/OpenGLide/Framebuffer.cpp
View File

File diff suppressed because one or more lines are too long

23
MacGLide/OpenGLide/GLRenderUpdateState.cpp
View File

@ -87,15 +87,23 @@ inline void SetChromaKeyAndAlphaState_update()
}
else
{
const GLenum alphaTestFunction = GL_NEVER + Glide.State.AlphaTestFunction;
const GLfloat alphaTestReferenceValue = Glide.State.AlphaReferenceValue * D1OVER255;
if (Glide.State.AlphaTestFunction != GR_CMP_ALWAYS)
{
glEnable(GL_ALPHA_TEST);
#ifndef OPTIMISE_OPENGL_STATE_CHANGES
// Restore previous values
OpenGL.AlphaTestFunction = GL_NEVER + Glide.State.AlphaTestFunction;
OpenGL.AlphaReferenceValue = Glide.State.AlphaReferenceValue * D1OVER255;
#ifdef OPTIMISE_OPENGL_STATE_CHANGES
if (alphaTestFunction != OpenGL.AlphaTestFunction
|| alphaTestReferenceValue != OpenGL.AlphaReferenceValue)
{
#endif
glAlphaFunc(OpenGL.AlphaTestFunction, OpenGL.AlphaReferenceValue);
// Restore previous values
OpenGL.AlphaTestFunction = alphaTestFunction;
OpenGL.AlphaReferenceValue = alphaTestReferenceValue;
glAlphaFunc(alphaTestFunction, alphaTestReferenceValue);
#ifdef OPTIMISE_OPENGL_STATE_CHANGES
}
#endif
glEnable(GL_ALPHA_TEST);
}
else
{
@ -184,7 +192,7 @@ void RenderUpdateState()
else
{
#ifdef OPENGL_DEBUG
GlideMsg( "Calls to grChromakeyMode() didn't change ChromaKeyAndAlphaState\n");
GlideMsg("Calls to grChromakeyMode() didn't change ChromaKeyAndAlphaState\n");
#endif
}
@ -908,6 +916,7 @@ void RenderUpdateState()
if (s_bUpdateAlphaCombineState)
{
s_bUpdateAlphaCombineState = false;
// Alpha is completely ignored in simple coloralpha render mode
}
}
}