mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-07 00:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10488 from JosJuice/logic-ops-logic

Browse source 
PixelShaderGen: Check uid_data for use_shader_logic_op
This commit is contained in:
JMC47 2022-02-28 12:12:52 -05:00 • committed by GitHub
commit 56a98532e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/VideoCommon/PixelShaderGen.cpp
View file

@ -944,9 +944,9 @@ ShaderCode GeneratePixelShaderCode(APIType api_type, const ShaderHostConfig& hos
(!DriverDetails::HasBug(DriverDetails::BUG_BROKEN_DUAL_SOURCE_BLENDING) || (!DriverDetails::HasBug(DriverDetails::BUG_BROKEN_DUAL_SOURCE_BLENDING) ||
uid_data->useDstAlpha); uid_data->useDstAlpha);
const bool use_shader_blend = const bool use_shader_blend =
!use_dual_source && (uid_data->useDstAlpha && host_config.backend_shader_framebuffer_fetch); !use_dual_source && uid_data->useDstAlpha && host_config.backend_shader_framebuffer_fetch;
const bool use_shader_logic_op = const bool use_shader_logic_op = !host_config.backend_logic_op && uid_data->logic_op_enable &&
!host_config.backend_logic_op && host_config.backend_shader_framebuffer_fetch; host_config.backend_shader_framebuffer_fetch;
if (api_type == APIType::OpenGL || api_type == APIType::Vulkan) if (api_type == APIType::OpenGL || api_type == APIType::Vulkan)
{ {
@ -1949,8 +1949,6 @@ static void WriteFog(ShaderCode& out, const pixel_shader_uid_data* uid_data)
static void WriteLogicOp(ShaderCode& out, const pixel_shader_uid_data* uid_data) static void WriteLogicOp(ShaderCode& out, const pixel_shader_uid_data* uid_data)
{ {
if (uid_data->logic_op_enable)
{
static constexpr std::array<const char*, 16> logic_op_mode{ static constexpr std::array<const char*, 16> logic_op_mode{
"int4(0, 0, 0, 0)", // CLEAR "int4(0, 0, 0, 0)", // CLEAR
"prev & fb_value", // AND "prev & fb_value", // AND
@ -1972,7 +1970,6 @@ static void WriteLogicOp(ShaderCode& out, const pixel_shader_uid_data* uid_data)
out.Write("\tint4 fb_value = iround(initial_ocol0 * 255.0);\n"); out.Write("\tint4 fb_value = iround(initial_ocol0 * 255.0);\n");
out.Write("\tprev = {};\n", logic_op_mode[uid_data->logic_op_mode]); out.Write("\tprev = {};\n", logic_op_mode[uid_data->logic_op_mode]);
}
} }
static void WriteColor(ShaderCode& out, APIType api_type, const pixel_shader_uid_data* uid_data, static void WriteColor(ShaderCode& out, APIType api_type, const pixel_shader_uid_data* uid_data,