piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

OGL: Fall back to the old dual-source blending behaviour.

Browse Source
This commit is contained in:
Jules Blok
2016-10-29 17:24:10 +02:00
parent 41563c55cd
commit ce9f717045
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/VideoCommon/PixelShaderGen.cpp
View File

@ -507,7 +507,9 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data*
if (ApiType == APIType::OpenGL || ApiType == APIType::Vulkan)
{
if (g_ActiveConfig.backend_info.bSupportsDualSourceBlend)
if (g_ActiveConfig.backend_info.bSupportsDualSourceBlend &&
(!DriverDetails::HasBug(DriverDetails::BUG_BROKEN_DUAL_SOURCE_BLENDING) ||
uid_data->dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND))
{
if (DriverDetails::HasBug(DriverDetails::BUG_BROKEN_FRAGMENT_SHADER_INDEX_DECORATION))
{
@ -523,6 +525,7 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data*
else
{
out.Write("FRAGMENT_OUTPUT_LOCATION(0) out vec4 ocol0;\n");
out.Write("vec4 ocol1;\n"); // Consume the output we don't use
}
if (uid_data->per_pixel_depth)
@ -1207,8 +1210,7 @@ static void WriteAlphaTest(ShaderCode& out, const pixel_shader_uid_data* uid_dat
out.Write(")) {\n");
out.Write("\t\tocol0 = float4(0.0, 0.0, 0.0, 0.0);\n");
if (g_ActiveConfig.backend_info.bSupportsDualSourceBlend)
out.Write("\t\tocol1 = float4(0.0, 0.0, 0.0, 0.0);\n");
out.Write("\t\tocol1 = float4(0.0, 0.0, 0.0, 0.0);\n");
if (per_pixel_depth)
{
out.Write("\t\tdepth = %s;\n",
@ -1304,8 +1306,7 @@ static void WriteColor(ShaderCode& out, const pixel_shader_uid_data* uid_data)
if (uid_data->dstAlphaMode == DSTALPHA_NONE)
{
out.Write("\tocol0.a = float(prev.a >> 2) / 63.0;\n");
if (g_ActiveConfig.backend_info.bSupportsDualSourceBlend)
out.Write("\tocol1.a = float(prev.a) / 255.0;\n");
out.Write("\tocol1.a = float(prev.a) / 255.0;\n");
}
else
{
@ -1313,12 +1314,9 @@ static void WriteColor(ShaderCode& out, const pixel_shader_uid_data* uid_data)
out.Write("\tocol0.a = float(" I_ALPHA ".a >> 2) / 63.0;\n");
// Use dual-source color blending to perform dst alpha in a single pass
if (g_ActiveConfig.backend_info.bSupportsDualSourceBlend)
{
if (uid_data->dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
out.Write("\tocol1.a = float(prev.a) / 255.0;\n");
else
out.Write("\tocol1.a = float(" I_ALPHA ".a) / 255.0;\n");
}
if (uid_data->dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
out.Write("\tocol1.a = float(prev.a) / 255.0;\n");
else
out.Write("\tocol1.a = float(" I_ALPHA ".a) / 255.0;\n");
}
}