31 files changed, 121 insertions, 84 deletions
diff --git a/tools/gfx/d3d-util.cpp b/tools/gfx/d3d/d3d-util.cpp
index 3f25ff46c..3f25ff46c 100644
--- a/tools/gfx/d3d-util.cpp
+++ b/tools/gfx/d3d/d3d-util.cpp
diff --git a/tools/gfx/d3d-util.h b/tools/gfx/d3d/d3d-util.h
index 6bcee054c..fd7a31d3a 100644
--- a/tools/gfx/d3d-util.h
+++ b/tools/gfx/d3d/d3d-util.h
@@ -8,9 +8,9 @@
 #include "../../slang-com-ptr.h"
 #include "../../source/core/slang-list.h"
 
-#include "flag-combiner.h"
+#include "../flag-combiner.h"
 
-#include "render.h"
+#include "../render.h"
 
 #include <D3Dcommon.h>
 #include <DXGIFormat.h>
diff --git a/tools/gfx/render-d3d11.cpp b/tools/gfx/d3d11/render-d3d11.cpp
index 5911d6e9c..cf2ae75e2 100644
--- a/tools/gfx/render-d3d11.cpp
+++ b/tools/gfx/d3d11/render-d3d11.cpp
@@ -5,17 +5,17 @@
 #include "render-d3d11.h"
 
 //WORKING: #include "options.h"
-#include "render.h"
-#include "d3d-util.h"
+#include "../render.h"
+#include "../d3d/d3d-util.h"
 
-#include "surface.h"
+#include "../surface.h"
 
 // In order to use the Slang API, we need to include its header
 
 //#include <slang.h>
 
 #include "../../slang-com-ptr.h"
-#include "flag-combiner.h"
+#include "../flag-combiner.h"
 
 // We will be rendering with Direct3D 11, so we need to include
 // the Windows and D3D11 headers
diff --git a/tools/gfx/render-d3d11.h b/tools/gfx/d3d11/render-d3d11.h
index 9e671d541..9e671d541 100644
--- a/tools/gfx/render-d3d11.h
+++ b/tools/gfx/d3d11/render-d3d11.h
diff --git a/tools/gfx/circular-resource-heap-d3d12.cpp b/tools/gfx/d3d12/circular-resource-heap-d3d12.cpp
index 685dd364f..685dd364f 100644
--- a/tools/gfx/circular-resource-heap-d3d12.cpp
+++ b/tools/gfx/d3d12/circular-resource-heap-d3d12.cpp
diff --git a/tools/gfx/circular-resource-heap-d3d12.h b/tools/gfx/d3d12/circular-resource-heap-d3d12.h
index bf9f412cf..bf9f412cf 100644
--- a/tools/gfx/circular-resource-heap-d3d12.h
+++ b/tools/gfx/d3d12/circular-resource-heap-d3d12.h
diff --git a/tools/gfx/descriptor-heap-d3d12.cpp b/tools/gfx/d3d12/descriptor-heap-d3d12.cpp
index 382fc3219..382fc3219 100644
--- a/tools/gfx/descriptor-heap-d3d12.cpp
+++ b/tools/gfx/d3d12/descriptor-heap-d3d12.cpp
diff --git a/tools/gfx/descriptor-heap-d3d12.h b/tools/gfx/d3d12/descriptor-heap-d3d12.h
index a546395d8..a546395d8 100644
--- a/tools/gfx/descriptor-heap-d3d12.h
+++ b/tools/gfx/d3d12/descriptor-heap-d3d12.h
diff --git a/tools/gfx/render-d3d12.cpp b/tools/gfx/d3d12/render-d3d12.cpp
index e3ce7161a..ad7b898f5 100644
--- a/tools/gfx/render-d3d12.cpp
+++ b/tools/gfx/d3d12/render-d3d12.cpp
@@ -4,9 +4,9 @@
 #include "render-d3d12.h"
 
 //WORKING:#include "options.h"
-#include "render.h"
+#include "../render.h"
 
-#include "surface.h"
+#include "../surface.h"
 
 // In order to use the Slang API, we need to include its header
 
@@ -26,13 +26,13 @@
 #include <d3dcompiler.h>
 
 #include "../../slang-com-ptr.h"
-#include "flag-combiner.h"
+#include "../flag-combiner.h"
 
 #include "resource-d3d12.h"
 #include "descriptor-heap-d3d12.h"
 #include "circular-resource-heap-d3d12.h"
 
-#include "d3d-util.h"
+#include "../d3d/d3d-util.h"
 
 // We will use the C standard library just for printing error messages.
 #include <stdio.h>
diff --git a/tools/gfx/render-d3d12.h b/tools/gfx/d3d12/render-d3d12.h
index b8a3104c0..b8a3104c0 100644
--- a/tools/gfx/render-d3d12.h
+++ b/tools/gfx/d3d12/render-d3d12.h
diff --git a/tools/gfx/resource-d3d12.cpp b/tools/gfx/d3d12/resource-d3d12.cpp
index 27de868b6..27de868b6 100644
--- a/tools/gfx/resource-d3d12.cpp
+++ b/tools/gfx/d3d12/resource-d3d12.cpp
diff --git a/tools/gfx/resource-d3d12.h b/tools/gfx/d3d12/resource-d3d12.h
index 1764adf9d..9e3c3262b 100644
--- a/tools/gfx/resource-d3d12.h
+++ b/tools/gfx/d3d12/resource-d3d12.h
@@ -1,4 +1,4 @@
-// resource-d3d12.h
+// resource-d3d12.h
 #pragma once
 
 #define WIN32_LEAN_AND_MEAN
@@ -11,7 +11,7 @@
 #include <d3d12.h>
 
 #include "../../slang-com-ptr.h"
-#include "d3d-util.h"
+#include "../d3d/d3d-util.h"
 
 namespace gfx {
 
diff --git a/tools/gfx/gfx.vcxproj b/tools/gfx/gfx.vcxproj
index 059a99618..d4b1885a8 100644
--- a/tools/gfx/gfx.vcxproj
+++ b/tools/gfx/gfx.vcxproj
@@ -171,47 +171,47 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="circular-resource-heap-d3d12.h" />
-    <ClInclude Include="d3d-util.h" />
-    <ClInclude Include="descriptor-heap-d3d12.h" />
+    <ClInclude Include="d3d\d3d-util.h" />
+    <ClInclude Include="d3d11\render-d3d11.h" />
+    <ClInclude Include="d3d12\circular-resource-heap-d3d12.h" />
+    <ClInclude Include="d3d12\descriptor-heap-d3d12.h" />
+    <ClInclude Include="d3d12\render-d3d12.h" />
+    <ClInclude Include="d3d12\resource-d3d12.h" />
     <ClInclude Include="flag-combiner.h" />
     <ClInclude Include="gui.h" />
     <ClInclude Include="model.h" />
-    <ClInclude Include="render-d3d11.h" />
-    <ClInclude Include="render-d3d12.h" />
-    <ClInclude Include="render-gl.h" />
-    <ClInclude Include="render-vk.h" />
+    <ClInclude Include="open-gl\render-gl.h" />
     <ClInclude Include="render.h" />
-    <ClInclude Include="resource-d3d12.h" />
     <ClInclude Include="surface.h" />
     <ClInclude Include="vector-math.h" />
-    <ClInclude Include="vk-api.h" />
-    <ClInclude Include="vk-device-queue.h" />
-    <ClInclude Include="vk-module.h" />
-    <ClInclude Include="vk-swap-chain.h" />
-    <ClInclude Include="vk-util.h" />
+    <ClInclude Include="vulkan\render-vk.h" />
+    <ClInclude Include="vulkan\vk-api.h" />
+    <ClInclude Include="vulkan\vk-device-queue.h" />
+    <ClInclude Include="vulkan\vk-module.h" />
+    <ClInclude Include="vulkan\vk-swap-chain.h" />
+    <ClInclude Include="vulkan\vk-util.h" />
     <ClInclude Include="window.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="circular-resource-heap-d3d12.cpp" />
-    <ClCompile Include="d3d-util.cpp" />
-    <ClCompile Include="descriptor-heap-d3d12.cpp" />
+    <ClCompile Include="d3d\d3d-util.cpp" />
+    <ClCompile Include="d3d11\render-d3d11.cpp" />
+    <ClCompile Include="d3d12\circular-resource-heap-d3d12.cpp" />
+    <ClCompile Include="d3d12\descriptor-heap-d3d12.cpp" />
+    <ClCompile Include="d3d12\render-d3d12.cpp" />
+    <ClCompile Include="d3d12\resource-d3d12.cpp" />
     <ClCompile Include="flag-combiner.cpp" />
     <ClCompile Include="gui.cpp" />
     <ClCompile Include="model.cpp" />
-    <ClCompile Include="render-d3d11.cpp" />
-    <ClCompile Include="render-d3d12.cpp" />
-    <ClCompile Include="render-gl.cpp" />
-    <ClCompile Include="render-vk.cpp" />
+    <ClCompile Include="open-gl\render-gl.cpp" />
     <ClCompile Include="render.cpp" />
-    <ClCompile Include="resource-d3d12.cpp" />
     <ClCompile Include="surface.cpp" />
-    <ClCompile Include="vk-api.cpp" />
-    <ClCompile Include="vk-device-queue.cpp" />
-    <ClCompile Include="vk-module.cpp" />
-    <ClCompile Include="vk-swap-chain.cpp" />
-    <ClCompile Include="vk-util.cpp" />
-    <ClCompile Include="window.cpp" />
+    <ClCompile Include="vulkan\render-vk.cpp" />
+    <ClCompile Include="vulkan\vk-api.cpp" />
+    <ClCompile Include="vulkan\vk-device-queue.cpp" />
+    <ClCompile Include="vulkan\vk-module.cpp" />
+    <ClCompile Include="vulkan\vk-swap-chain.cpp" />
+    <ClCompile Include="vulkan\vk-util.cpp" />
+    <ClCompile Include="windows\win-window.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/tools/gfx/gfx.vcxproj.filters b/tools/gfx/gfx.vcxproj.filters
index 95b5f31d2..1c27e4f24 100644
--- a/tools/gfx/gfx.vcxproj.filters
+++ b/tools/gfx/gfx.vcxproj.filters
@@ -9,61 +9,61 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="circular-resource-heap-d3d12.h">
+    <ClInclude Include="d3d\d3d-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="d3d-util.h">
+    <ClInclude Include="d3d11\render-d3d11.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="descriptor-heap-d3d12.h">
+    <ClInclude Include="d3d12\circular-resource-heap-d3d12.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="flag-combiner.h">
+    <ClInclude Include="d3d12\descriptor-heap-d3d12.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="gui.h">
+    <ClInclude Include="d3d12\render-d3d12.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="model.h">
+    <ClInclude Include="d3d12\resource-d3d12.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="render-d3d11.h">
+    <ClInclude Include="flag-combiner.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="render-d3d12.h">
+    <ClInclude Include="gui.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="render-gl.h">
+    <ClInclude Include="model.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="render-vk.h">
+    <ClInclude Include="open-gl\render-gl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="render.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource-d3d12.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="surface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="vector-math.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="vk-api.h">
+    <ClInclude Include="vulkan\render-vk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vulkan\vk-api.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="vk-device-queue.h">
+    <ClInclude Include="vulkan\vk-device-queue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="vk-module.h">
+    <ClInclude Include="vulkan\vk-module.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="vk-swap-chain.h">
+    <ClInclude Include="vulkan\vk-swap-chain.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="vk-util.h">
+    <ClInclude Include="vulkan\vk-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="window.h">
@@ -71,61 +71,61 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="circular-resource-heap-d3d12.cpp">
+    <ClCompile Include="d3d\d3d-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="d3d-util.cpp">
+    <ClCompile Include="d3d11\render-d3d11.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="descriptor-heap-d3d12.cpp">
+    <ClCompile Include="d3d12\circular-resource-heap-d3d12.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="flag-combiner.cpp">
+    <ClCompile Include="d3d12\descriptor-heap-d3d12.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gui.cpp">
+    <ClCompile Include="d3d12\render-d3d12.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="model.cpp">
+    <ClCompile Include="d3d12\resource-d3d12.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="render-d3d11.cpp">
+    <ClCompile Include="flag-combiner.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="render-d3d12.cpp">
+    <ClCompile Include="gui.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="render-gl.cpp">
+    <ClCompile Include="model.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="render-vk.cpp">
+    <ClCompile Include="open-gl\render-gl.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="render.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="resource-d3d12.cpp">
+    <ClCompile Include="surface.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="surface.cpp">
+    <ClCompile Include="vulkan\render-vk.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vk-api.cpp">
+    <ClCompile Include="vulkan\vk-api.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vk-device-queue.cpp">
+    <ClCompile Include="vulkan\vk-device-queue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vk-module.cpp">
+    <ClCompile Include="vulkan\vk-module.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vk-swap-chain.cpp">
+    <ClCompile Include="vulkan\vk-swap-chain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vk-util.cpp">
+    <ClCompile Include="vulkan\vk-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="window.cpp">
+    <ClCompile Include="windows\win-window.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/tools/gfx/render-gl.cpp b/tools/gfx/open-gl/render-gl.cpp
index 975b4e140..91c31b71d 100644
--- a/tools/gfx/render-gl.cpp
+++ b/tools/gfx/open-gl/render-gl.cpp
@@ -2,7 +2,7 @@
 #include "render-gl.h"
 
 //WORKING:#include "options.h"
-#include "render.h"
+#include "../render.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -10,7 +10,7 @@
 #include "core/slang-secure-crt.h"
 #include "external/stb/stb_image_write.h"
 
-#include "surface.h"
+#include "../surface.h"
 
 // TODO(tfoley): eventually we should be able to run these
 // tests on non-Windows targets to confirm that cross-compilation
diff --git a/tools/gfx/render-gl.h b/tools/gfx/open-gl/render-gl.h
index 055031d38..055031d38 100644
--- a/tools/gfx/render-gl.h
+++ b/tools/gfx/open-gl/render-gl.h
diff --git a/tools/gfx/render.cpp b/tools/gfx/render.cpp
index 44bb4fb04..785343927 100644
--- a/tools/gfx/render.cpp
+++ b/tools/gfx/render.cpp
@@ -3,6 +3,11 @@
 
 #include "../../source/core/slang-math.h"
 
+#include "d3d11/render-d3d11.h"
+#include "d3d12/render-d3d12.h"
+#include "open-gl/render-gl.h"
+#include "vulkan/render-vk.h"
+
 namespace gfx {
 using namespace Slang;
 
@@ -404,4 +409,32 @@ ProjectionStyle RendererUtil::getProjectionStyle(RendererType type)
     }
 }
 
+/* static */ RendererUtil::CreateFunc RendererUtil::getCreateFunc(RendererType type)
+{
+    switch (type)
+    {
+#if SLANG_WINDOWS_FAMILY
+        case RendererType::DirectX11:
+        {
+            return &createD3D11Renderer;
+        }
+        case RendererType::DirectX12:
+        {
+            return &createD3D12Renderer;
+        }
+        case RendererType::OpenGl:
+        {
+            return &createGLRenderer;
+        }
+        case RendererType::Vulkan:
+        {
+            return &createVKRenderer;
+        }
+#endif
+
+        default: return nullptr;
+    }
+}
+
+
 } // renderer_test
diff --git a/tools/gfx/render.h b/tools/gfx/render.h
index 4a8458e96..42cf5fe60 100644
--- a/tools/gfx/render.h
+++ b/tools/gfx/render.h
@@ -972,6 +972,8 @@ inline void Renderer::setVertexBuffer(UInt slot, BufferResource* buffer, UInt st
 /// Functions that are around Renderer and it's types
 struct RendererUtil
 {
+    typedef Renderer* (*CreateFunc)();
+
         /// Gets the size in bytes of a Format type. Returns 0 if a size is not defined/invalid
     SLANG_FORCE_INLINE static size_t getFormatSize(Format format) { return s_formatSize[int(format)]; }
         /// Given a renderer type, gets a projection style
@@ -986,6 +988,9 @@ struct RendererUtil
         /// Get as text
     static Slang::UnownedStringSlice toText(RendererType type);
 
+        /// Given a type returns a function that can construct it, or nullptr if there isn't one
+    static CreateFunc getCreateFunc(RendererType type);
+
     private:
     static void compileTimeAsserts();
     static const uint8_t s_formatSize[]; // Maps Format::XXX to a size in bytes;
diff --git a/tools/gfx/render-vk.cpp b/tools/gfx/vulkan/render-vk.cpp
index 77b593565..2221187ed 100644
--- a/tools/gfx/render-vk.cpp
+++ b/tools/gfx/vulkan/render-vk.cpp
@@ -2,7 +2,7 @@
 #include "render-vk.h"
 
 //WORKING:#include "options.h"
-#include "render.h"
+#include "../render.h"
 
 #include "../../source/core/slang-smart-pointer.h"
 
@@ -11,7 +11,7 @@
 #include "vk-device-queue.h"
 #include "vk-swap-chain.h"
 
-#include "surface.h"
+#include "../surface.h"
 
 // Vulkan has a different coordinate system to ogl
 // http://anki3d.org/vulkan-coordinate-system/
diff --git a/tools/gfx/render-vk.h b/tools/gfx/vulkan/render-vk.h
index 14a8e403a..14a8e403a 100644
--- a/tools/gfx/render-vk.h
+++ b/tools/gfx/vulkan/render-vk.h
diff --git a/tools/gfx/vk-api.cpp b/tools/gfx/vulkan/vk-api.cpp
index 50f80aa26..50f80aa26 100644
--- a/tools/gfx/vk-api.cpp
+++ b/tools/gfx/vulkan/vk-api.cpp
diff --git a/tools/gfx/vk-api.h b/tools/gfx/vulkan/vk-api.h
index 001f44d19..001f44d19 100644
--- a/tools/gfx/vk-api.h
+++ b/tools/gfx/vulkan/vk-api.h
diff --git a/tools/gfx/vk-device-queue.cpp b/tools/gfx/vulkan/vk-device-queue.cpp
index 10a3d0e3b..10a3d0e3b 100644
--- a/tools/gfx/vk-device-queue.cpp
+++ b/tools/gfx/vulkan/vk-device-queue.cpp
diff --git a/tools/gfx/vk-device-queue.h b/tools/gfx/vulkan/vk-device-queue.h
index d57483ec0..d57483ec0 100644
--- a/tools/gfx/vk-device-queue.h
+++ b/tools/gfx/vulkan/vk-device-queue.h
diff --git a/tools/gfx/vk-module.cpp b/tools/gfx/vulkan/vk-module.cpp
index 4e92a3d2c..4e92a3d2c 100644
--- a/tools/gfx/vk-module.cpp
+++ b/tools/gfx/vulkan/vk-module.cpp
diff --git a/tools/gfx/vk-module.h b/tools/gfx/vulkan/vk-module.h
index 4d18823ca..4d18823ca 100644
--- a/tools/gfx/vk-module.h
+++ b/tools/gfx/vulkan/vk-module.h
diff --git a/tools/gfx/vk-swap-chain.cpp b/tools/gfx/vulkan/vk-swap-chain.cpp
index 5cf2e96ae..5cf2e96ae 100644
--- a/tools/gfx/vk-swap-chain.cpp
+++ b/tools/gfx/vulkan/vk-swap-chain.cpp
diff --git a/tools/gfx/vk-swap-chain.h b/tools/gfx/vulkan/vk-swap-chain.h
index f8ad98a83..57d1173b8 100644
--- a/tools/gfx/vk-swap-chain.h
+++ b/tools/gfx/vulkan/vk-swap-chain.h
@@ -4,7 +4,7 @@
 #include "vk-api.h"
 #include "vk-device-queue.h"
 
-#include "render.h"
+#include "../render.h"
 
 #include "../../source/core/slang-list.h"
 
diff --git a/tools/gfx/vk-util.cpp b/tools/gfx/vulkan/vk-util.cpp
index e8940d1b2..e8940d1b2 100644
--- a/tools/gfx/vk-util.cpp
+++ b/tools/gfx/vulkan/vk-util.cpp
diff --git a/tools/gfx/vk-util.h b/tools/gfx/vulkan/vk-util.h
index edba3a7d2..c8194789d 100644
--- a/tools/gfx/vk-util.h
+++ b/tools/gfx/vulkan/vk-util.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "vk-api.h"
-#include "render.h"
+#include "../render.h"
 
 // Macros to make testing vulkan return codes simpler
 
diff --git a/tools/gfx/window.cpp b/tools/gfx/windows/win-window.cpp
index 02a083ef2..45315a27a 100644
--- a/tools/gfx/window.cpp
+++ b/tools/gfx/windows/win-window.cpp
@@ -1,5 +1,5 @@
-// window.cpp
-#include "window.h"
+// win-window.cpp
+#include "../window.h"
 
 #include <stdio.h>
 
@@ -12,7 +12,6 @@
 
 #include <stdint.h>
 
-
 #if _WIN32
 #include <Windows.h>
 #include <Windowsx.h>