Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental

src/xenia/ui/d3d12/d3d12_provider.h

@@ -14,21 +14,23 @@
 
 #include "xenia/ui/d3d12/d3d12_api.h"
 #include "xenia/ui/graphics_provider.h"
+
 // chrispy: this is here to prevent clang format from moving d3d12_nvapi above
 // the headers it depends on
 #define HEADERFENCE
 #undef HEADERFENCE
 #include "xenia/gpu/d3d12/d3d12_nvapi.hpp"
-#define XE_UI_D3D12_FINE_GRAINED_DRAW_SCOPES 1
 
 namespace xe {
 namespace ui {
 namespace d3d12 {
+
 enum {
   UPLOAD_RESULT_CREATE_FAILED = 0,
   UPLOAD_RESULT_CREATE_SUCCESS = 1,
   UPLOAD_RESULT_CREATE_CPUVISIBLE = 2
 };
+
 class D3D12Provider : public GraphicsProvider {
  public:
   ~D3D12Provider();