Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Where possible, rewrite 5551 stencil ops too.

Browse Source 
We can in most cases fix INVERT, and also INCR so INVERT works when we
can't fix it.

Fixes #8422.
This commit is contained in:
Unknown W. Brackets 2016-01-19 23:15:57 -08:00
parent dedcc149d8
commit 02bf70a2d0
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
GPU/Common/GPUStateUtils.cpp
View File

@ -1147,18 +1147,10 @@ void ConvertBlendState(GenericBlendState &blendState, bool allowShaderBlend) {
}
static void ConvertStencilFunc5551(GenericStencilFuncState &state) {
// Decrement always zeros, so let's rewrite those to be safe (even if it's not 1.)
if (state.sFail == GE_STENCILOP_DECR)
state.sFail = GE_STENCILOP_ZERO;
if (state.zFail == GE_STENCILOP_DECR)
state.zFail = GE_STENCILOP_ZERO;
if (state.zPass == GE_STENCILOP_DECR)
state.zPass = GE_STENCILOP_ZERO;
state.writeMask = state.writeMask >= 0x80 ? 0xff : 0x00;
// Flaws:
// - INVERT should convert 1, 5, 0xFF to 0. Currently it won't.
// - INVERT should convert 1, 5, 0xFF to 0. Currently it won't always.
// - INCR twice shouldn't change the value.
// - REPLACE should write 0 for 0x00 - 0x7F, and non-zero for 0x80 - 0xFF.
// - Write mask may need double checking, but likely only the top bit matters.
@ -1258,6 +1250,29 @@ static void ConvertStencilFunc5551(GenericStencilFuncState &state) {
}
break;
}
auto rewriteOps = [&](GEStencilOp from, GEStencilOp to) {
if (state.sFail == from)
state.sFail = to;
if (state.zFail == from)
state.zFail = to;
if (state.zPass == from)
state.zPass = to;
};
// Decrement always zeros, so let's rewrite those to be safe (even if it's not 1.)
rewriteOps(GE_STENCILOP_DECR, GE_STENCILOP_ZERO);
if (state.testFunc == GE_COMP_NOTEQUAL && state.testRef == 0 && state.testMask != 0) {
// If it's != 0 (as optimized above), then we can rewrite INVERT to ZERO.
// With 1 bit of stencil, INVERT != 0 can only make it 0.
rewriteOps(GE_STENCILOP_INVERT, GE_STENCILOP_ZERO);
}
if (state.testFunc == GE_COMP_EQUAL && state.testRef == 0 && state.testMask != 0) {
// If it's == 0 (as optimized above), then we can rewrite INCR to INVERT.
// Otherwise we get 1, which we mostly handle, but won't INVERT correctly.
rewriteOps(GE_STENCILOP_INCR, GE_STENCILOP_INVERT);
}
}
void ConvertStencilFuncState(GenericStencilFuncState &state) {