summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcomex <comexk@gmail.com>2020-08-31 10:22:03 -0400
committercomex <comexk@gmail.com>2020-12-05 17:59:02 -0500
commita6e6cd5788dac6dc26101f4162d7704ca5c274e8 (patch)
treea932592033a49a9b883a971ccd95b0a87d8ca9f4 /src
parentf2f346e1104106eb9323f0e141e0e67312c29849 (diff)
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')
-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:
struct RenderEnable {
enum class Mode : u32 {
- FALSE = 0,
- TRUE = 1,
- CONDITIONAL = 2,
- RENDER_IF_EQUAL = 3,
- RENDER_IF_NOT_EQUAL = 4,
+ // Note: This uses Pascal case in order to avoid the identifiers
+ // FALSE and TRUE, which are reserved on Darwin.
+ False = 0,
+ True = 1,
+ Conditional = 2,
+ RenderIfEqual = 3,
+ RenderIfNotEqual = 4,
};
PackedGPUVAddr address;