Merge pull request #5141 from comex/xx-true-false
maxwell_dma: Rename RenderEnable::Mode::FALSE and TRUE to avoid name conflict
This commit is contained in:
		
						commit
						88959b0047
					
				@ -72,11 +72,13 @@ public:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    struct RenderEnable {
 | 
					    struct RenderEnable {
 | 
				
			||||||
        enum class Mode : u32 {
 | 
					        enum class Mode : u32 {
 | 
				
			||||||
            FALSE = 0,
 | 
					            // Note: This uses Pascal case in order to avoid the identifiers
 | 
				
			||||||
            TRUE = 1,
 | 
					            // FALSE and TRUE, which are reserved on Darwin.
 | 
				
			||||||
            CONDITIONAL = 2,
 | 
					            False = 0,
 | 
				
			||||||
            RENDER_IF_EQUAL = 3,
 | 
					            True = 1,
 | 
				
			||||||
            RENDER_IF_NOT_EQUAL = 4,
 | 
					            Conditional = 2,
 | 
				
			||||||
 | 
					            RenderIfEqual = 3,
 | 
				
			||||||
 | 
					            RenderIfNotEqual = 4,
 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        PackedGPUVAddr address;
 | 
					        PackedGPUVAddr address;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user