From b0dfb5b927cf929dc43a2a7b3b3da3122f6365bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?furby=E2=84=A2?= <devs@wabi.foundation>
Date: Sun, 29 Dec 2024 01:33:28 -0700
Subject: [PATCH] Fix shaders resources paths.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: furby™ <devs@wabi.foundation>
---
 Package.swift                                                   | 2 ++
 Sources/UsdHydra/{Resources => }/shaders/empty.glslfx           | 0
 Sources/UsdHydra/{Resources => }/shaders/shaderDefs.usda        | 0
 .../{Resources => }/shaders/UsdPrimvarReader_float.osl          | 0
 .../{Resources => }/shaders/UsdPrimvarReader_float2.osl         | 0
 .../{Resources => }/shaders/UsdPrimvarReader_float3.osl         | 0
 Sources/UsdShaders/{Resources => }/shaders/UsdUVTexture.osl     | 0
 .../UsdShaders/{Resources => }/shaders/previewSurface.glslfx    | 0
 Sources/UsdShaders/{Resources => }/shaders/primvarReader.glslfx | 0
 Sources/UsdShaders/{Resources => }/shaders/shaderDefs.usda      | 0
 Sources/UsdShaders/{Resources => }/shaders/transform2d.glslfx   | 0
 Sources/UsdShaders/{Resources => }/shaders/uvTexture.glslfx     | 0
 12 files changed, 2 insertions(+)
 rename Sources/UsdHydra/{Resources => }/shaders/empty.glslfx (100%)
 rename Sources/UsdHydra/{Resources => }/shaders/shaderDefs.usda (100%)
 rename Sources/UsdShaders/{Resources => }/shaders/UsdPrimvarReader_float.osl (100%)
 rename Sources/UsdShaders/{Resources => }/shaders/UsdPrimvarReader_float2.osl (100%)
 rename Sources/UsdShaders/{Resources => }/shaders/UsdPrimvarReader_float3.osl (100%)
 rename Sources/UsdShaders/{Resources => }/shaders/UsdUVTexture.osl (100%)
 rename Sources/UsdShaders/{Resources => }/shaders/previewSurface.glslfx (100%)
 rename Sources/UsdShaders/{Resources => }/shaders/primvarReader.glslfx (100%)
 rename Sources/UsdShaders/{Resources => }/shaders/shaderDefs.usda (100%)
 rename Sources/UsdShaders/{Resources => }/shaders/transform2d.glslfx (100%)
 rename Sources/UsdShaders/{Resources => }/shaders/uvTexture.glslfx (100%)

diff --git a/Package.swift b/Package.swift
index 087ca94f4c..e98fdbeab4 100644
--- a/Package.swift
+++ b/Package.swift
@@ -746,6 +746,7 @@ let package = Package(
         .target(name: "UsdShade"),
       ],
       resources: [
+        .copy("shaders"),
         .process("Resources")
       ],
       cxxSettings: [
@@ -800,6 +801,7 @@ let package = Package(
         .target(name: "UsdShade"),
       ],
       resources: [
+        .copy("shaders"),
         .process("Resources")
       ],
       cxxSettings: [
diff --git a/Sources/UsdHydra/Resources/shaders/empty.glslfx b/Sources/UsdHydra/shaders/empty.glslfx
similarity index 100%
rename from Sources/UsdHydra/Resources/shaders/empty.glslfx
rename to Sources/UsdHydra/shaders/empty.glslfx
diff --git a/Sources/UsdHydra/Resources/shaders/shaderDefs.usda b/Sources/UsdHydra/shaders/shaderDefs.usda
similarity index 100%
rename from Sources/UsdHydra/Resources/shaders/shaderDefs.usda
rename to Sources/UsdHydra/shaders/shaderDefs.usda
diff --git a/Sources/UsdShaders/Resources/shaders/UsdPrimvarReader_float.osl b/Sources/UsdShaders/shaders/UsdPrimvarReader_float.osl
similarity index 100%
rename from Sources/UsdShaders/Resources/shaders/UsdPrimvarReader_float.osl
rename to Sources/UsdShaders/shaders/UsdPrimvarReader_float.osl
diff --git a/Sources/UsdShaders/Resources/shaders/UsdPrimvarReader_float2.osl b/Sources/UsdShaders/shaders/UsdPrimvarReader_float2.osl
similarity index 100%
rename from Sources/UsdShaders/Resources/shaders/UsdPrimvarReader_float2.osl
rename to Sources/UsdShaders/shaders/UsdPrimvarReader_float2.osl
diff --git a/Sources/UsdShaders/Resources/shaders/UsdPrimvarReader_float3.osl b/Sources/UsdShaders/shaders/UsdPrimvarReader_float3.osl
similarity index 100%
rename from Sources/UsdShaders/Resources/shaders/UsdPrimvarReader_float3.osl
rename to Sources/UsdShaders/shaders/UsdPrimvarReader_float3.osl
diff --git a/Sources/UsdShaders/Resources/shaders/UsdUVTexture.osl b/Sources/UsdShaders/shaders/UsdUVTexture.osl
similarity index 100%
rename from Sources/UsdShaders/Resources/shaders/UsdUVTexture.osl
rename to Sources/UsdShaders/shaders/UsdUVTexture.osl
diff --git a/Sources/UsdShaders/Resources/shaders/previewSurface.glslfx b/Sources/UsdShaders/shaders/previewSurface.glslfx
similarity index 100%
rename from Sources/UsdShaders/Resources/shaders/previewSurface.glslfx
rename to Sources/UsdShaders/shaders/previewSurface.glslfx
diff --git a/Sources/UsdShaders/Resources/shaders/primvarReader.glslfx b/Sources/UsdShaders/shaders/primvarReader.glslfx
similarity index 100%
rename from Sources/UsdShaders/Resources/shaders/primvarReader.glslfx
rename to Sources/UsdShaders/shaders/primvarReader.glslfx
diff --git a/Sources/UsdShaders/Resources/shaders/shaderDefs.usda b/Sources/UsdShaders/shaders/shaderDefs.usda
similarity index 100%
rename from Sources/UsdShaders/Resources/shaders/shaderDefs.usda
rename to Sources/UsdShaders/shaders/shaderDefs.usda
diff --git a/Sources/UsdShaders/Resources/shaders/transform2d.glslfx b/Sources/UsdShaders/shaders/transform2d.glslfx
similarity index 100%
rename from Sources/UsdShaders/Resources/shaders/transform2d.glslfx
rename to Sources/UsdShaders/shaders/transform2d.glslfx
diff --git a/Sources/UsdShaders/Resources/shaders/uvTexture.glslfx b/Sources/UsdShaders/shaders/uvTexture.glslfx
similarity index 100%
rename from Sources/UsdShaders/Resources/shaders/uvTexture.glslfx
rename to Sources/UsdShaders/shaders/uvTexture.glslfx