Starting to remove some macros.

src/xenia/gpu/command_processor.cc

@@ -9,6 +9,8 @@
 
 #include <xenia/gpu/command_processor.h>
 
+#include <algorithm>
+
 #include <xenia/gpu/gpu-private.h>
 #include <xenia/gpu/graphics_driver.h>
 #include <xenia/gpu/graphics_system.h>
@@ -79,8 +81,9 @@ void CommandProcessor::EnableReadPointerWriteBack(uint32_t ptr,
 }
 
 void CommandProcessor::UpdateWritePointer(uint32_t value) {
-  write_ptr_max_index_  = MAX(write_ptr_max_index_, value);
-  write_ptr_index_      = value;
+  write_ptr_max_index_ =
+      std::max(static_cast<uint32_t>(write_ptr_max_index_), value);
+  write_ptr_index_ = value;
   SetEvent(write_ptr_index_event_);
 }
 

src/xenia/gpu/d3d11/d3d11_profiler_display.cc

@@ -9,6 +9,8 @@
 
 #include <xenia/gpu/d3d11/d3d11_profiler_display.h>
 
+#include <algorithm>
+
 #include <xenia/gpu/gpu-private.h>
 #include <xenia/gpu/d3d11/d3d11_window.h>
 
@@ -548,8 +550,8 @@ void D3D11ProfilerDisplay::DrawBox(
     uint32_t r = 0xFF & (color >> 16);
     uint32_t g = 0xFF & (color >> 8);
     uint32_t b = 0xFF & color;
-    uint32_t max_c = MAX(MAX(MAX(r, g), b), 30u);
-    uint32_t min_c = MIN(MIN(MIN(r, g), b), 180u);
+    uint32_t max_c = std::max(std::max(std::max(r, g), b), 30u);
+    uint32_t min_c = std::min(std::min(std::min(r, g), b), 180u);
     uint32_t r0 = 0xFF & ((r + max_c)/2);
     uint32_t g0 = 0xFF & ((g + max_c)/2);
     uint32_t b0 = 0xFF & ((b + max_c)/2);

src/xenia/gpu/d3d11/d3d11_shader_translator.cc

@@ -9,6 +9,8 @@
 
 #include <xenia/gpu/d3d11/d3d11_shader_translator.h>
 
+#include <algorithm>
+
 #include <xenia/gpu/gpu-private.h>
 #include <xenia/gpu/d3d11/d3d11_geometry_shader.h>
 #include <xenia/gpu/d3d11/d3d11_resource_cache.h>
@@ -282,7 +284,7 @@ int D3D11ShaderTranslator::TranslatePixelShader(
 
   // Add temporary registers.
   uint32_t temp_regs = program_cntl.vs_regs + program_cntl.ps_regs;
-  for (uint32_t n = 0; n <= MAX(15, temp_regs); n++) {
+  for (uint32_t n = 0; n <= std::max(15u, temp_regs); n++) {
     append(
       "  float4 r%d = c[%d];\n", n, n + 256);
   }