Refactor GUI/Window utils out of gfx library (#1649)

Co-authored-by: Yong He <yhe@nvidia.com>

21 files changed, 24 insertions, 24 deletions

diff --git a/tools/gfx/cuda/render-cuda.cpp b/tools/gfx/cuda/render-cuda.cpp
index cf77e4ef6..f12e8ee89 100644
--- a/tools/gfx/cuda/render-cuda.cpp
+++ b/tools/gfx/cuda/render-cuda.cpp
@@ -4,7 +4,7 @@
 #include "../render.h"
 #include <cuda.h>
 #include <cuda_runtime_api.h>
-#include "../../source/core/slang-std-writers.h"
+#include "core/slang-std-writers.h"
 #include "slang.h"
 #endif
 
diff --git a/tools/gfx/d3d/d3d-util.h b/tools/gfx/d3d/d3d-util.h
index fd7a31d3a..37c277832 100644
--- a/tools/gfx/d3d/d3d-util.h
+++ b/tools/gfx/d3d/d3d-util.h
@@ -3,10 +3,10 @@
 
 #include <stdint.h>
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
-#include "../../slang-com-ptr.h"
-#include "../../source/core/slang-list.h"
+#include "slang-com-ptr.h"
+#include "core/slang-list.h"
 
 #include "../flag-combiner.h"
 
diff --git a/tools/gfx/d3d11/render-d3d11.cpp b/tools/gfx/d3d11/render-d3d11.cpp
index 48cf7770d..5c04eccf1 100644
--- a/tools/gfx/d3d11/render-d3d11.cpp
+++ b/tools/gfx/d3d11/render-d3d11.cpp
@@ -16,7 +16,7 @@
 
 //#include <slang.h>
 
-#include "../../slang-com-ptr.h"
+#include "slang-com-ptr.h"
 #include "../flag-combiner.h"
 
 // We will be rendering with Direct3D 11, so we need to include
diff --git a/tools/gfx/d3d12/circular-resource-heap-d3d12.h b/tools/gfx/d3d12/circular-resource-heap-d3d12.h
index bf9f412cf..7eacf9572 100644
--- a/tools/gfx/d3d12/circular-resource-heap-d3d12.h
+++ b/tools/gfx/d3d12/circular-resource-heap-d3d12.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../slang-com-ptr.h"
-#include "../../source/core/slang-list.h"
-#include "../../source/core/slang-free-list.h"
+#include "slang-com-ptr.h"
+#include "core/slang-list.h"
+#include "core/slang-free-list.h"
 
 #include "resource-d3d12.h"
 
diff --git a/tools/gfx/d3d12/descriptor-heap-d3d12.h b/tools/gfx/d3d12/descriptor-heap-d3d12.h
index a546395d8..642ff59db 100644
--- a/tools/gfx/d3d12/descriptor-heap-d3d12.h
+++ b/tools/gfx/d3d12/descriptor-heap-d3d12.h
@@ -4,8 +4,8 @@
 #include <dxgi.h>
 #include <d3d12.h>
 
-#include "../../slang-com-ptr.h"
-#include "../../source/core/slang-list.h"
+#include "slang-com-ptr.h"
+#include "core/slang-list.h"
 
 namespace gfx {
 
diff --git a/tools/gfx/d3d12/render-d3d12.cpp b/tools/gfx/d3d12/render-d3d12.cpp
index d3f030b88..0376ee304 100644
--- a/tools/gfx/d3d12/render-d3d12.cpp
+++ b/tools/gfx/d3d12/render-d3d12.cpp
@@ -35,7 +35,7 @@ struct ID3D12GraphicsCommandList1 {};
 #   include "../nvapi/nvapi-include.h"
 #endif
 
-#include "../../slang-com-ptr.h"
+#include "slang-com-ptr.h"
 #include "../flag-combiner.h"
 
 #include "resource-d3d12.h"
diff --git a/tools/gfx/d3d12/resource-d3d12.h b/tools/gfx/d3d12/resource-d3d12.h
index 9e3c3262b..7a26854ff 100644
--- a/tools/gfx/d3d12/resource-d3d12.h
+++ b/tools/gfx/d3d12/resource-d3d12.h
@@ -10,7 +10,7 @@
 #include <dxgi1_4.h>
 #include <d3d12.h>
 
-#include "../../slang-com-ptr.h"
+#include "slang-com-ptr.h"
 #include "../d3d/d3d-util.h"
 
 namespace gfx {
diff --git a/tools/gfx/nvapi/nvapi-util.h b/tools/gfx/nvapi/nvapi-util.h
index 704f4ede4..0bcab7d36 100644
--- a/tools/gfx/nvapi/nvapi-util.h
+++ b/tools/gfx/nvapi/nvapi-util.h
@@ -1,8 +1,8 @@
 // nvapi-util.h
 #pragma once
 
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 namespace gfx {
 
diff --git a/tools/gfx/render.h b/tools/gfx/render.h
index fb9e10724..ab9af8afb 100644
--- a/tools/gfx/render.h
+++ b/tools/gfx/render.h
@@ -1,8 +1,6 @@
 // render.h
 #pragma once
 
-#include "window.h"
-
 //#include "shader-input-layout.h"
 
 #include <float.h>
diff --git a/tools/gfx/vulkan/render-vk.cpp b/tools/gfx/vulkan/render-vk.cpp
index 0f6e3cdaa..80393904c 100644
--- a/tools/gfx/vulkan/render-vk.cpp
+++ b/tools/gfx/vulkan/render-vk.cpp
@@ -5,7 +5,7 @@
 #include "../render.h"
 #include "../render-graphics-common.h"
 
-#include "../../source/core/slang-smart-pointer.h"
+#include "core/slang-smart-pointer.h"
 
 #include "vk-api.h"
 #include "vk-util.h"
diff --git a/tools/gfx/vulkan/vk-api.cpp b/tools/gfx/vulkan/vk-api.cpp
index 50f80aa26..9b51b644c 100644
--- a/tools/gfx/vulkan/vk-api.cpp
+++ b/tools/gfx/vulkan/vk-api.cpp
@@ -1,7 +1,7 @@
 // vk-api.cpp
 #include "vk-api.h"
 
-#include "../../source/core/slang-list.h"
+#include "core/slang-list.h"
 
 namespace gfx {
 using namespace Slang;
diff --git a/tools/gfx/vulkan/vk-module.h b/tools/gfx/vulkan/vk-module.h
index 4d18823ca..7ddd5da45 100644
--- a/tools/gfx/vulkan/vk-module.h
+++ b/tools/gfx/vulkan/vk-module.h
@@ -1,9 +1,9 @@
 // vk-module.h
 #pragma once
 
-#include "../../slang.h"
+#include "slang.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 #if SLANG_WINDOWS_FAMILY
 #   define VK_USE_PLATFORM_WIN32_KHR 1
diff --git a/tools/gfx/vulkan/vk-swap-chain.cpp b/tools/gfx/vulkan/vk-swap-chain.cpp
index d9b3a495d..21460ce61 100644
--- a/tools/gfx/vulkan/vk-swap-chain.cpp
+++ b/tools/gfx/vulkan/vk-swap-chain.cpp
@@ -3,7 +3,7 @@
 
 #include "vk-util.h"
 
-#include "../../source/core/slang-list.h"
+#include "core/slang-list.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tools/gfx/vulkan/vk-swap-chain.h b/tools/gfx/vulkan/vk-swap-chain.h
index 9b4dfc2c1..893910ea6 100644
--- a/tools/gfx/vulkan/vk-swap-chain.h
+++ b/tools/gfx/vulkan/vk-swap-chain.h
@@ -6,7 +6,7 @@
 
 #include "../render.h"
 
-#include "../../source/core/slang-list.h"
+#include "core/slang-list.h"
 
 namespace gfx {
 
diff --git a/tools/gfx/gui.cpp b/tools/graphics-app-framework/gui.cpp
index 8208bd606..8208bd606 100644
--- a/tools/gfx/gui.cpp
+++ b/tools/graphics-app-framework/gui.cpp
diff --git a/tools/gfx/gui.h b/tools/graphics-app-framework/gui.h
index cbec5796f..d2c52de3c 100644
--- a/tools/gfx/gui.h
+++ b/tools/graphics-app-framework/gui.h
@@ -1,7 +1,7 @@
 // gui.h
 #pragma once
 
-#include "render.h"
+#include "tools/gfx/render.h"
 #include "vector-math.h"
 #include "window.h"
 
diff --git a/tools/gfx/model.cpp b/tools/graphics-app-framework/model.cpp
index ce176727b..5d3a850e4 100644
--- a/tools/gfx/model.cpp
+++ b/tools/graphics-app-framework/model.cpp
@@ -1,6 +1,8 @@
 // model.cpp
 #include "model.h"
 
+#include "window.h"
+
 #define TINYOBJLOADER_IMPLEMENTATION
 #include "../../external/tinyobjloader/tiny_obj_loader.h"
 
diff --git a/tools/gfx/model.h b/tools/graphics-app-framework/model.h
index 17b16510e..e86940244 100644
--- a/tools/gfx/model.h
+++ b/tools/graphics-app-framework/model.h
@@ -1,7 +1,7 @@
 // model.h
 #pragma once
 
-#include "render.h"
+#include "tools/gfx/render.h"
 #include "vector-math.h"
 
 #include <vector>
diff --git a/tools/gfx/vector-math.h b/tools/graphics-app-framework/vector-math.h
index e35cb46ac..e35cb46ac 100644
--- a/tools/gfx/vector-math.h
+++ b/tools/graphics-app-framework/vector-math.h
diff --git a/tools/gfx/window.h b/tools/graphics-app-framework/window.h
index e6f886f42..e6f886f42 100644
--- a/tools/gfx/window.h
+++ b/tools/graphics-app-framework/window.h
diff --git a/tools/gfx/windows/win-window.cpp b/tools/graphics-app-framework/windows/win-window.cpp
index 45315a27a..45315a27a 100644
--- a/tools/gfx/windows/win-window.cpp
+++ b/tools/graphics-app-framework/windows/win-window.cpp