From cdeea4745487c11334c4f9e964490de4e7cd2a30 Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Wed, 22 Jul 2026 04:07:20 +0100
Subject: [PATCH] Use compiler-portable geometry shader includes

---
 src/GameCult.Geometry/Shaders/GameCult.Geometry.hlsl      | 8 ++++----
 .../GeometryShaderOwnershipTests.cs                       | 6 +++---
 .../Runtime/GameCultGeometryPlanetaryViewer.shader        | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/GameCult.Geometry/Shaders/GameCult.Geometry.hlsl b/src/GameCult.Geometry/Shaders/GameCult.Geometry.hlsl
index fb159077..00623b75 100644
--- a/src/GameCult.Geometry/Shaders/GameCult.Geometry.hlsl
+++ b/src/GameCult.Geometry/Shaders/GameCult.Geometry.hlsl
@@ -1,11 +1,11 @@
 #ifndef GAMECULT_GEOMETRY_HLSL
 #define GAMECULT_GEOMETRY_HLSL
 
-#ifndef GAMECULT_GEOMETRY_CULTMATH_INCLUDE
-#define GAMECULT_GEOMETRY_CULTMATH_INCLUDE "CultMath.hlsl"
+#if defined(GAMECULT_GEOMETRY_UNITY_PACKAGE)
+#include "Packages/org.gamecult.cultmath/shaders/CultMath.hlsl"
+#else
+#include "CultMath/CultMath.hlsl"
 #endif
-
-#include GAMECULT_GEOMETRY_CULTMATH_INCLUDE
 #include "AdvancedErosionFilter.hlsl"
 #include "Planetary.hlsl"
 #include "SphericalErosion.hlsl"
diff --git a/tests/GameCult.Geometry.Tests/GeometryShaderOwnershipTests.cs b/tests/GameCult.Geometry.Tests/GeometryShaderOwnershipTests.cs
index ba5bcf64..e3650f85 100644
--- a/tests/GameCult.Geometry.Tests/GeometryShaderOwnershipTests.cs
+++ b/tests/GameCult.Geometry.Tests/GeometryShaderOwnershipTests.cs
@@ -16,8 +16,8 @@ public sealed class GeometryShaderOwnershipTests
         var spherical = File.ReadAllText(Path.Combine(shaders, "SphericalErosion.hlsl"));
         var refinement = File.ReadAllText(Path.Combine(shaders, "PlanetaryRadialRefinement.hlsl"));
 
-        Assert.That(umbrella, Does.Contain("#define GAMECULT_GEOMETRY_CULTMATH_INCLUDE \"CultMath.hlsl\"")
-            .And.Contain("#include GAMECULT_GEOMETRY_CULTMATH_INCLUDE")
+        Assert.That(umbrella, Does.Contain("#include \"CultMath/CultMath.hlsl\"")
+            .And.Contain("#include \"Packages/org.gamecult.cultmath/shaders/CultMath.hlsl\"")
             .And.Contain("#include \"AdvancedErosionFilter.hlsl\"")
             .And.Contain("#include \"Planetary.hlsl\"")
             .And.Contain("#include \"SphericalErosion.hlsl\"")
@@ -54,7 +54,7 @@ public sealed class GeometryShaderOwnershipTests
             "GameCultGeometryPlanetaryViewer.shader"));
 
         Assert.That(shader, Does.Contain(
-                "#define GAMECULT_GEOMETRY_CULTMATH_INCLUDE \"Packages/org.gamecult.cultmath/shaders/CultMath.hlsl\"")
+                "#define GAMECULT_GEOMETRY_UNITY_PACKAGE 1")
             .And.Contain("#include \"Packages/org.gamecult.geometry/Shaders/GameCult.Geometry.hlsl\"")
             .And.Contain("gamecult_geometry_planetary_field_sample")
             .And.Not.Contain("cultmath_planetary_")
diff --git a/unity/org.gamecult.geometry/Samples~/PlanetaryViewer/Runtime/GameCultGeometryPlanetaryViewer.shader b/unity/org.gamecult.geometry/Samples~/PlanetaryViewer/Runtime/GameCultGeometryPlanetaryViewer.shader
index 850e1dd5..9b4981c0 100644
--- a/unity/org.gamecult.geometry/Samples~/PlanetaryViewer/Runtime/GameCultGeometryPlanetaryViewer.shader
+++ b/unity/org.gamecult.geometry/Samples~/PlanetaryViewer/Runtime/GameCultGeometryPlanetaryViewer.shader
@@ -18,7 +18,7 @@ Shader "GameCult.Geometry/Planetary Field Viewer"
             #pragma vertex vert
             #pragma fragment frag
             #include "UnityCG.cginc"
-            #define GAMECULT_GEOMETRY_CULTMATH_INCLUDE "Packages/org.gamecult.cultmath/shaders/CultMath.hlsl"
+            #define GAMECULT_GEOMETRY_UNITY_PACKAGE 1
             #include "Packages/org.gamecult.geometry/Shaders/GameCult.Geometry.hlsl"
 
             float _Radius;