summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar comex2020-08-31 10:22:03 -0400
committerGravatar comex2020-12-05 17:59:02 -0500
commita6e6cd5788dac6dc26101f4162d7704ca5c274e8 (patch)
treea932592033a49a9b883a971ccd95b0a87d8ca9f4 /src/video_core
parentMerge pull request #5133 from lioncash/video-shadow2 (diff)
downloadyuzu-a6e6cd5788dac6dc26101f4162d7704ca5c274e8.tar.gz
yuzu-a6e6cd5788dac6dc26101f4162d7704ca5c274e8.tar.xz
yuzu-a6e6cd5788dac6dc26101f4162d7704ca5c274e8.zip
maxwell_dma: Rename RenderEnable::Mode::FALSE and TRUE to avoid name conflict
On Apple platforms, FALSE and TRUE are defined as macros by <mach/boolean.h>, which is included by various system headers. Note that there appear to be no actual users of the names to fix up.
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/engines/maxwell_dma.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/video_core/engines/maxwell_dma.h b/src/video_core/engines/maxwell_dma.h
index 17bd280c4..3c59eeb13 100644
--- a/src/video_core/engines/maxwell_dma.h
+++ b/src/video_core/engines/maxwell_dma.h
@@ -72,11 +72,13 @@ public:
72 72
73 struct RenderEnable { 73 struct RenderEnable {
74 enum class Mode : u32 { 74 enum class Mode : u32 {
75 FALSE = 0, 75 // Note: This uses Pascal case in order to avoid the identifiers
76 TRUE = 1, 76 // FALSE and TRUE, which are reserved on Darwin.
77 CONDITIONAL = 2, 77 False = 0,
78 RENDER_IF_EQUAL = 3, 78 True = 1,
79 RENDER_IF_NOT_EQUAL = 4, 79 Conditional = 2,
80 RenderIfEqual = 3,
81 RenderIfNotEqual = 4,
80 }; 82 };
81 83
82 PackedGPUVAddr address; 84 PackedGPUVAddr address;