From 8520f780ead8bb39c71406f604cc5effa9b63392 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Sat, 1 Jan 2022 19:40:02 -0800 Subject: [PATCH] ClipDisable: Replace cpoly with copy --- Source/Core/VideoCommon/XFMemory.h | 9 ++++++--- Source/Core/VideoCommon/XFStructs.cpp | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/XFMemory.h b/Source/Core/VideoCommon/XFMemory.h index 71d38cb8bd..4d72fd5520 100644 --- a/Source/Core/VideoCommon/XFMemory.h +++ b/Source/Core/VideoCommon/XFMemory.h @@ -278,7 +278,10 @@ union ClipDisable { BitField<0, 1, bool, u32> disable_clipping_detection; BitField<1, 1, bool, u32> disable_trivial_rejection; - BitField<2, 1, bool, u32> disable_cpoly_clipping_acceleration; + // Also known as "disable cpoly clipping acceleration". "cpoly" appears in patents US6639595B1 + // and US6700586B1, as well as JP4975159B2, but JP4846120B2 gives "copy clipping acceleration". + // Since "cpoly" doesn't have any obvious meaning, "copy" is being used here. + BitField<2, 1, bool, u32> disable_copy_clipping_acceleration; u32 hex; }; template <> @@ -291,10 +294,10 @@ struct fmt::formatter return fmt::format_to(ctx.out(), "Disable clipping detection: {}\n" "Disable trivial rejection: {}\n" - "Disable cpoly clipping acceleration: {}", + "Disable copy clipping acceleration: {}", cd.disable_clipping_detection ? "Yes" : "No", cd.disable_trivial_rejection ? "Yes" : "No", - cd.disable_cpoly_clipping_acceleration ? "Yes" : "No"); + cd.disable_copy_clipping_acceleration ? "Yes" : "No"); } }; diff --git a/Source/Core/VideoCommon/XFStructs.cpp b/Source/Core/VideoCommon/XFStructs.cpp index 1d6811f92a..f0787378bb 100644 --- a/Source/Core/VideoCommon/XFStructs.cpp +++ b/Source/Core/VideoCommon/XFStructs.cpp @@ -47,7 +47,7 @@ static void XFRegWritten(u32 address, u32 value) DolphinAnalytics::Instance().ReportGameQuirk(GameQuirk::SETS_XF_CLIPDISABLE_BIT_0); if (setting.disable_trivial_rejection) DolphinAnalytics::Instance().ReportGameQuirk(GameQuirk::SETS_XF_CLIPDISABLE_BIT_1); - if (setting.disable_cpoly_clipping_acceleration) + if (setting.disable_copy_clipping_acceleration) DolphinAnalytics::Instance().ReportGameQuirk(GameQuirk::SETS_XF_CLIPDISABLE_BIT_2); break; }