Enable logic op emulation in-shader #15960
Conversation
|
How about Dirt 2? |
|
DiRT 2 is also fixed with this @Panderner |
| GEBlendSrcFactor replaceBlendFuncA = (GEBlendSrcFactor)id.Bits(FS_BIT_BLENDFUNC_A, 4); | ||
| GEBlendDstFactor replaceBlendFuncB = (GEBlendDstFactor)id.Bits(FS_BIT_BLENDFUNC_B, 4); | ||
| GEBlendMode replaceBlendEq = (GEBlendMode)id.Bits(FS_BIT_BLENDEQ, 3); | ||
| StencilValueType replaceAlphaWithStencilType = (StencilValueType)id.Bits(FS_BIT_REPLACE_ALPHA_WITH_STENCIL_TYPE, 4); |
There was a problem hiding this comment.
It's a shame this isn't 3 bits. I think we could use the uniform more or merge STENCIL_VALUE_INVERT + STENCIL_VALUE_ONE for the purposes of the shader id. If it had one less value it could fit in 3 bits... well anyway, not related to this change really.
-[Unknown]
There was a problem hiding this comment.
Yeah, but we still aren't running out of frag id bits, so I'm inclined to just do that when we need to :) As you say unrelated anyway.
…k for packUnorm4x8.
|
I was curious if the blocky effects in the water are really correct here. I double checked the framedump against a PSP, which more or less matches.
Looking at the frame dump, it's because of a 4444 texture at 0x040d4000 (245/825.) This is rendered to between 2/825 (mainly 107/825) and 132/825 as 5551, but then 565 at 135/825 to fill alpha. It ends up with this patchy texture:
I guess it's maybe right (what can you do with a 1 bit stencil buffer...), but do we know if that's really how the game looked on a PSP? -[Unknown] |
|
Yes, I ran it on my real PSP when debugging the effect, and it does look exactly like that. I chose that spot because it's one of very few places, if not the only place, in the game where you can get close enough to the water to see the square texels, mostly you just drive some distance from it, past it at high speed and it looks like a really advanced reflection effect that shouldn't normally be possible on the PSP. Don't think anything is wrong here. |
There was a problem with the combination of shader bitmasking and logic ops - even if some bits were masked away through shader trickery, since we used hardware logic ops where available, they would apply to all bits, not just the masked ones. This fixes that by moving logic operations into the shader in that case.
Requires integer ops in fragment shader, so will not work on old OpenGL ES devices or DX9. Also doesn't yet work in D3D11, but I'll fix that in a followup (need to force on logic-op-in-shader in some additional cases, as there are no native logic ops in D3D11).
Fixes #11928 (water effects in Outrun)
Fixes #13012 (water effects in DiRT 2)
Neither is fully fixed though, some precision or logic issue still causes us to miss some pixels, it's close though:Scratch that, it's actually perfect at 1x resolution (or with "lower resolution for effects", which I guess we'll need to enforce here):
2x res with texture upscaling:
GE dump: outrun water.zip