From 1d08198d2218d7ee9f71177f54582cd5c339c8c7 Mon Sep 17 00:00:00 2001
From: combolek <4743344+combolek@users.noreply.github.com>
Date: Fri, 24 Jul 2026 20:54:12 -0700
Subject: [PATCH] mashadercompiler: Add support for UNC paths

MS DXC on Windows (at least IDxcUtils::BuildArguments) does not support forward slashes in UNC paths. This change feeds it native format with backslashes.

This makes it possible to build Linux and Windows binaries from a single source on a network share.
---
 .../mashadercompiler/src/shader_compiler.cpp         | 12 +++++++++---
 .../mashadercompiler/src/shader_compiler.hpp         |  4 ++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/betterRenderer/mashadercompiler/src/shader_compiler.cpp b/betterRenderer/mashadercompiler/src/shader_compiler.cpp
index 42cc96e5..20b3b0c3 100644
--- a/betterRenderer/mashadercompiler/src/shader_compiler.cpp
+++ b/betterRenderer/mashadercompiler/src/shader_compiler.cpp
@@ -9,6 +9,8 @@ int MaShaderCompiler::Run() {
   ParseOptions();
   Init();
   m_shader_path = m_project_path.parent_path();
+  m_shader_path.make_preferred();
+
   YAML::Node src = YAML::LoadFile((m_project_path).generic_string());
 
   create_directories(m_output_path);
@@ -47,6 +49,7 @@ void MaShaderCompiler::Init() {
   const char *shader_path = getenv("shader_path");
   if (shader_path) {
     m_shader_path = shader_path;
+    m_shader_path.make_preferred();
     std::cout << "shader path: " << m_shader_path.generic_string() << std::endl;
   } else {
     m_shader_path = "";
@@ -62,6 +65,9 @@ YAML::Binary MaShaderCompiler::CompileShaderToBlob(
     std::vector<std::tuple<std::wstring, std::wstring>> defines,
     std::string target, ShaderPlatform platform) {
   file_name.replace_extension(".hlsl");
+  // Convert to native format since the name comes from the project
+  // file with forward slashes
+  file_name.make_preferred();
   static std::unordered_map<std::string, std::wstring> targets{
       {"compute", L"cs_6_0"}, {"vertex", L"vs_6_0"},   {"hull", L"hs_6_0"},
       {"domain", L"ds_6_0"},  {"geometry", L"gs_6_0"}, {"pixel", L"ps_6_0"}};
@@ -74,7 +80,7 @@ YAML::Binary MaShaderCompiler::CompileShaderToBlob(
   }
 
   RefCountPtr<IDxcBlobEncoding> source_blob;
-  if (FAILED(m_dxc_utils->LoadFile(file_name.generic_wstring().c_str(), nullptr,
+  if (FAILED(m_dxc_utils->LoadFile(file_name.wstring().c_str(), nullptr,
                                    &source_blob))) {
     return {};
   }
@@ -84,8 +90,8 @@ YAML::Binary MaShaderCompiler::CompileShaderToBlob(
   Source.Encoding = DXC_CP_ACP;
 
   std::vector<std::wstring> include_paths{
-      m_shader_path.generic_wstring(),
-      file_name.parent_path().generic_wstring()};
+      m_shader_path.wstring(),
+      file_name.parent_path().wstring()};
 
   std::vector<const wchar_t *> args;
 
diff --git a/betterRenderer/mashadercompiler/src/shader_compiler.hpp b/betterRenderer/mashadercompiler/src/shader_compiler.hpp
index 45f00976..f2d8ed49 100644
--- a/betterRenderer/mashadercompiler/src/shader_compiler.hpp
+++ b/betterRenderer/mashadercompiler/src/shader_compiler.hpp
@@ -26,6 +26,10 @@ class MaShaderCompiler {
   std::filesystem::path m_output_path;
 
  private:
+  // Stored in the native format, since DXC does not accept forward
+  // slashes in UNC paths. Use wstring() to retrieve it in native
+  // format or generic_wstring() to get the canonical forward slash
+  // format.
   std::filesystem::path m_shader_path;
   bool m_generate_debug = false;
   void ParseOptions();