Merge branch 'master' into vulkan

2020-10-04 21:54:32 +03:00
parent c02534e5cf 75bf2d3c7d
commit 1fd0d48066
10 changed files with 91 additions and 85 deletions
--- a/src/xenia/ui/d3d12/d3d12_context.h
+++ b/src/xenia/ui/d3d12/d3d12_context.h
@@ -16,8 +16,6 @@
 #include "xenia/ui/d3d12/d3d12_provider.h"
 #include "xenia/ui/graphics_context.h"

-#define FINE_GRAINED_DRAW_SCOPES 1
-
 namespace xe {
 namespace ui {
 namespace d3d12 {
--- a/src/xenia/ui/d3d12/d3d12_provider.h
+++ b/src/xenia/ui/d3d12/d3d12_provider.h
@@ -15,6 +15,8 @@
 #include "xenia/ui/d3d12/d3d12_api.h"
 #include "xenia/ui/graphics_provider.h"

+#define XE_UI_D3D12_FINE_GRAINED_DRAW_SCOPES 1
+
 namespace xe {
 namespace ui {
 namespace d3d12 {