Fixes for CModelShaders hlsl/metal

AxioDL · Jan 9, 2021 · 5191534 · 5191534
1 parent 4b9bdcc
commit 5191534
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/Shaders/CModelShaders.frag.hlsl b/Shaders/CModelShaders.frag.hlsl
@@ -155,7 +155,7 @@ cbuffer ThermalUniform : register(b2) {
 };
 #endif
 
-#if defined(URDE_THERMAL_COLD)
+#if defined(URDE_THERMAL_COLD) || defined(URDE_THERMAL_STATIC)
 float3 LightingFunc(in VertToFrag vtf) {
   return float3(1.0, 1.0, 1.0);
 }
@@ -279,6 +279,12 @@ float4 PostFunc(in VertToFrag vtf, float4 colorIn) {
 }
 #endif
 
+#if defined(URDE_THERMAL_STATIC)
+float4 PostFunc(in VertToFrag vtf, float4 colorIn) {
+  return colorIn;
+}
+#endif
+
 #if defined(URDE_SOLID)
 float4 PostFunc(in VertToFrag vtf, float4 colorIn) {
   return solidColor;

diff --git a/Shaders/CModelShaders.frag.metal b/Shaders/CModelShaders.frag.metal
@@ -136,7 +136,7 @@ float3 LightingFunc(thread VertToFrag& vtf, constant LightingUniform& lu, textur
 }
 #endif
 
-#if defined(URDE_THERMAL_COLD)
+#if defined(URDE_THERMAL_COLD) || defined(URDE_THERMAL_STATIC)
 struct LightingUniform {};
 float3 LightingFunc(thread VertToFrag& vtf, constant LightingUniform& lu, texture2d<float> extTex0, sampler clampSamp) {
   return float3(1.0, 1.0, 1.0);
@@ -267,6 +267,14 @@ float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu,
 }
 #endif
 
+#if defined(URDE_THERMAL_STATIC)
+float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu,
+                texture2d<float> extTex0, texture2d<float> extTex1, texture2d<float> extTex2,
+                sampler samp, sampler clampSamp, sampler clampEdgeSamp, float4 colorIn) {
+  return colorIn;
+}
+#endif
+
 #if defined(URDE_SOLID)
 float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu,
                 texture2d<float> extTex0, texture2d<float> extTex1, texture2d<float> extTex2,

diff --git a/hecl b/hecl