Merge pull request #3639 from raven02/patch-11

Use GEComparison for getDepthTestFunction()
This commit is contained in:
Henrik Rydgård 2013-09-05 00:17:32 -07:00
commit ca14f364d9
2 changed files with 2 additions and 2 deletions

View File

@ -283,7 +283,7 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
// Depth Test
if (gstate.isDepthTestEnabled()) {
glstate.depthTest.enable();
glstate.depthFunc.set(ztests[gstate.getDepthTestFunc()]);
glstate.depthFunc.set(ztests[gstate.getDepthTestFunction()]);
glstate.depthWrite.set(gstate.isDepthWriteEnabled() ? GL_TRUE : GL_FALSE);
} else
glstate.depthTest.disable();

View File

@ -250,7 +250,7 @@ struct GPUgstate
// Depth Test
bool isDepthTestEnabled() const { return zTestEnable & 1; }
bool isDepthWriteEnabled() const { return !(zmsk & 1); }
int getDepthTestFunc() const { return ztestfunc & 0x7; }
GEComparison getDepthTestFunction() const { return static_cast<GEComparison>(ztestfunc & 0x7); }
u16 getDepthRangeMin() const { return minz & 0xFFFF; }
u16 getDepthRangeMax() const { return maxz & 0xFFFF; }