ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GLSL: fix transparency issues on dual source blend. fix issue 6104

This commit is contained in:
degasus 2013-03-17 00:36:13 +01:00
parent 9a404ca6d4
commit 4a929f85b6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/VideoCommon/Src/BPStructs.cpp
View File

@ -213,7 +213,7 @@ void BPWritten(const BPCmd& bp)
if (bp.changes & 4) if (bp.changes & 4)
SetDitherMode(); SetDitherMode();
// Set Blending Mode // Set Blending Mode
if (bp.changes & 0xFE1) if (bp.changes & 0xFF1)
SetBlendMode(); SetBlendMode();
// Set Color Mask // Set Color Mask
if (bp.changes & 0x18) if (bp.changes & 0x18)
@ -458,11 +458,11 @@ void BPWritten(const BPCmd& bp)
break; break;
case BPMEM_ZCOMPARE: // Set the Z-Compare and EFB pixel format case BPMEM_ZCOMPARE: // Set the Z-Compare and EFB pixel format
g_renderer->SetColorMask(); // alpha writing needs to be disabled if the new pixel format doesn't have an alpha channel
g_renderer->SetBlendMode(true);
OnPixelFormatChange(); OnPixelFormatChange();
if(bp.changes & 3) if(bp.changes & 7) {
SetBlendMode(); // dual source could be activated by changing to PIXELFMT_RGBA6_Z24 SetBlendMode(); // dual source could be activated by changing to PIXELFMT_RGBA6_Z24
g_renderer->SetColorMask(); // alpha writing needs to be disabled if the new pixel format doesn't have an alpha channel
}
break; break;
case BPMEM_MIPMAP_STRIDE: // MipMap Stride Channel case BPMEM_MIPMAP_STRIDE: // MipMap Stride Channel

8
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -882,13 +882,13 @@ void Renderer::ReinterpretPixelData(unsigned int convtype)
void Renderer::SetBlendMode(bool forceUpdate) void Renderer::SetBlendMode(bool forceUpdate)
{ {
bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate
&& bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
bool useDualSource = useDstAlpha && g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
// Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel // Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel
// Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1. // Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1.
bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && target_has_alpha;
bool useDualSource = useDstAlpha && g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
const GLenum glSrcFactors[8] = const GLenum glSrcFactors[8] =
{ {
GL_ZERO, GL_ZERO,