From 940ef4ad7afe35b66b6421e3eaab7c253d691574 Mon Sep 17 00:00:00 2001
From: Triang3l <triang3l@yandex.ru>
Date: Thu, 8 Aug 2019 22:11:51 +0300
Subject: [PATCH] [UI/GPU] Fix include order

---
 src/xenia/ui/d3d12/d3d12_context.h           | 4 +---
 src/xenia/ui/d3d12/d3d12_immediate_drawer.cc | 1 +
 src/xenia/ui/d3d12/d3d12_immediate_drawer.h  | 3 ++-
 src/xenia/ui/d3d12/pools.cc                  | 1 +
 src/xenia/ui/d3d12/pools.h                   | 5 ++++-
 src/xenia/ui/vk/vulkan_context.h             | 3 +--
 src/xenia/ui/vk/vulkan_immediate_drawer.cc   | 2 ++
 src/xenia/ui/vk/vulkan_immediate_drawer.h    | 3 ++-
 src/xenia/ui/vk/vulkan_provider.cc           | 1 +
 9 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/xenia/ui/d3d12/d3d12_context.h b/src/xenia/ui/d3d12/d3d12_context.h
index 8217e4861..a72ff35fd 100644
--- a/src/xenia/ui/d3d12/d3d12_context.h
+++ b/src/xenia/ui/d3d12/d3d12_context.h
@@ -14,7 +14,7 @@
 
 #include "xenia/ui/d3d12/command_list.h"
 #include "xenia/ui/d3d12/cpu_fence.h"
-#include "xenia/ui/d3d12/d3d12_api.h"
+#include "xenia/ui/d3d12/d3d12_immediate_drawer.h"
 #include "xenia/ui/d3d12/d3d12_provider.h"
 #include "xenia/ui/graphics_context.h"
 
@@ -24,8 +24,6 @@ namespace xe {
 namespace ui {
 namespace d3d12 {
 
-class D3D12ImmediateDrawer;
-
 class D3D12Context : public GraphicsContext {
  public:
   ~D3D12Context() override;
diff --git a/src/xenia/ui/d3d12/d3d12_immediate_drawer.cc b/src/xenia/ui/d3d12/d3d12_immediate_drawer.cc
index 1ba4c293a..ccaffd1c2 100644
--- a/src/xenia/ui/d3d12/d3d12_immediate_drawer.cc
+++ b/src/xenia/ui/d3d12/d3d12_immediate_drawer.cc
@@ -14,6 +14,7 @@
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
+#include "xenia/ui/d3d12/d3d12_context.h"
 #include "xenia/ui/d3d12/d3d12_util.h"
 
 namespace xe {
diff --git a/src/xenia/ui/d3d12/d3d12_immediate_drawer.h b/src/xenia/ui/d3d12/d3d12_immediate_drawer.h
index bc5de5bd7..67bcc4fec 100644
--- a/src/xenia/ui/d3d12/d3d12_immediate_drawer.h
+++ b/src/xenia/ui/d3d12/d3d12_immediate_drawer.h
@@ -16,7 +16,6 @@
 
 #include "xenia/ui/d3d12/command_list.h"
 #include "xenia/ui/d3d12/d3d12_api.h"
-#include "xenia/ui/d3d12/d3d12_context.h"
 #include "xenia/ui/d3d12/pools.h"
 #include "xenia/ui/immediate_drawer.h"
 
@@ -24,6 +23,8 @@ namespace xe {
 namespace ui {
 namespace d3d12 {
 
+class D3D12Context;
+
 class D3D12ImmediateDrawer : public ImmediateDrawer {
  public:
   D3D12ImmediateDrawer(D3D12Context* graphics_context);
diff --git a/src/xenia/ui/d3d12/pools.cc b/src/xenia/ui/d3d12/pools.cc
index 8c94f3ee8..436d2ed68 100644
--- a/src/xenia/ui/d3d12/pools.cc
+++ b/src/xenia/ui/d3d12/pools.cc
@@ -13,6 +13,7 @@
 
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"
+#include "xenia/ui/d3d12/d3d12_context.h"
 #include "xenia/ui/d3d12/d3d12_util.h"
 
 namespace xe {
diff --git a/src/xenia/ui/d3d12/pools.h b/src/xenia/ui/d3d12/pools.h
index de40cbedd..5b1a00c3d 100644
--- a/src/xenia/ui/d3d12/pools.h
+++ b/src/xenia/ui/d3d12/pools.h
@@ -10,13 +10,16 @@
 #ifndef XENIA_UI_D3D12_POOLS_H_
 #define XENIA_UI_D3D12_POOLS_H_
 
+#include <cstdint>
+
 #include "xenia/ui/d3d12/d3d12_api.h"
-#include "xenia/ui/d3d12/d3d12_context.h"
 
 namespace xe {
 namespace ui {
 namespace d3d12 {
 
+class D3D12Context;
+
 class UploadBufferPool {
  public:
   UploadBufferPool(D3D12Context* context, uint32_t page_size);
diff --git a/src/xenia/ui/vk/vulkan_context.h b/src/xenia/ui/vk/vulkan_context.h
index a58e6b057..1c396c176 100644
--- a/src/xenia/ui/vk/vulkan_context.h
+++ b/src/xenia/ui/vk/vulkan_context.h
@@ -13,6 +13,7 @@
 #include <memory>
 
 #include "xenia/ui/graphics_context.h"
+#include "xenia/ui/vk/vulkan_immediate_drawer.h"
 #include "xenia/ui/vk/vulkan_provider.h"
 
 #define FINE_GRAINED_DRAW_SCOPES 1
@@ -21,8 +22,6 @@ namespace xe {
 namespace ui {
 namespace vk {
 
-class VulkanImmediateDrawer;
-
 class VulkanContext : public GraphicsContext {
  public:
   ~VulkanContext() override;
diff --git a/src/xenia/ui/vk/vulkan_immediate_drawer.cc b/src/xenia/ui/vk/vulkan_immediate_drawer.cc
index 6dd99ec6c..15cd80e84 100644
--- a/src/xenia/ui/vk/vulkan_immediate_drawer.cc
+++ b/src/xenia/ui/vk/vulkan_immediate_drawer.cc
@@ -9,6 +9,8 @@
 
 #include "xenia/ui/vk/vulkan_immediate_drawer.h"
 
+#include "xenia/ui/vk/vulkan_context.h"
+
 namespace xe {
 namespace ui {
 namespace vk {
diff --git a/src/xenia/ui/vk/vulkan_immediate_drawer.h b/src/xenia/ui/vk/vulkan_immediate_drawer.h
index 6230e9511..c42f6a7ba 100644
--- a/src/xenia/ui/vk/vulkan_immediate_drawer.h
+++ b/src/xenia/ui/vk/vulkan_immediate_drawer.h
@@ -13,12 +13,13 @@
 #include <memory>
 
 #include "xenia/ui/immediate_drawer.h"
-#include "xenia/ui/vk/vulkan_context.h"
 
 namespace xe {
 namespace ui {
 namespace vk {
 
+class VulkanContext;
+
 class VulkanImmediateDrawer : public ImmediateDrawer {
  public:
   VulkanImmediateDrawer(VulkanContext* graphics_context);
diff --git a/src/xenia/ui/vk/vulkan_provider.cc b/src/xenia/ui/vk/vulkan_provider.cc
index aa829437b..da5ac48a3 100644
--- a/src/xenia/ui/vk/vulkan_provider.cc
+++ b/src/xenia/ui/vk/vulkan_provider.cc
@@ -13,6 +13,7 @@
 
 #include "xenia/base/cvar.h"
 #include "xenia/base/logging.h"
+#include "xenia/base/platform.h"
 #include "xenia/ui/vk/vulkan_context.h"
 #include "xenia/ui/vk/vulkan_util.h"