mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 03:14:34 +01:00
Merge pull request #2781 from raven02/patch-5
Consolidate culling test into non-clear mode
This commit is contained in:
commit
891b7174da
1 file changed
+10
-6
@@ -123,12 +123,6 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
|
||||
gstate_c.textureChanged = false;
|
||||
}
|
||||
|
||||
// Set cull
|
||||
bool wantCull = !gstate.isModeClear() && !gstate.isModeThrough() && prim != GE_PRIM_RECTANGLES && gstate.isCullEnabled();
|
||||
glstate.cullFace.set(wantCull);
|
||||
if (wantCull)
|
||||
glstate.cullFaceMode.set(cullingMode[gstate.getCullMode()]);
|
||||
|
||||
// TODO: The top bit of the alpha channel should be written to the stencil bit somehow. This appears to require very expensive multipass rendering :( Alternatively, one could do a
|
||||
// single fullscreen pass that converts alpha to stencil (or 2 passes, to set both the 0 and 1 values) very easily.
|
||||
|
||||
@@ -216,6 +210,9 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
|
||||
// Set ColorMask/Stencil/Depth
|
||||
if (gstate.isModeClear()) {
|
||||
|
||||
// Set Cull
|
||||
glstate.cullFace.set(GL_FALSE);
|
||||
|
||||
// Depth Test
|
||||
bool depthMask = (gstate.clearmode >> 10) & 1;
|
||||
if (gstate.isDepthTestEnabled()) {
|
||||
@@ -243,6 +240,13 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
// Set cull
|
||||
bool wantCull = !gstate.isModeThrough() && prim != GE_PRIM_RECTANGLES && gstate.isCullEnabled();
|
||||
glstate.cullFace.set(wantCull);
|
||||
if (wantCull)
|
||||
glstate.cullFaceMode.set(cullingMode[gstate.getCullMode()]);
|
||||
|
||||
|
||||
// Depth Test
|
||||
if (gstate.isDepthTestEnabled()) {
|
||||
|
||||
Reference in new issue
Block a user