From 59e36be1408d63814fdf930fefce0a639c23d50d Mon Sep 17 00:00:00 2001
From: Vladislav Belov <vladislavbelovdev@gmail.com>
Date: Sun, 10 May 2026 23:57:23 +0200
Subject: [PATCH] Splits shader effects to reuse in material passes

---
 .../mods/mod/shaders/effects/terrain_base.xml | 18 -----
 .../effects/terrain_base_reflections.xml      | 10 +++
 .../effects/terrain_base_wireframe.xml        | 10 +++
 .../mod/shaders/effects/terrain_blend.xml     | 22 ------
 .../effects/terrain_blend_reflections.xml     | 12 +++
 .../effects/terrain_blend_wireframe.xml       | 12 +++
 .../mod/shaders/effects/terrain_decal.xml     | 22 ------
 .../effects/terrain_decal_reflections.xml     | 12 +++
 .../effects/terrain_decal_wireframe.xml       | 12 +++
 .../mod/shaders/effects/terrain_solid.xml     | 10 ---
 .../mod/shaders/effects/terrain_wireframe.xml | 10 +++
 .../mods/public/shaders/effects/model.xml     | 47 ------------
 .../shaders/effects/model_reflections.xml     | 10 +++
 .../effects/model_silhouette_caster.xml       | 12 +++
 .../public/shaders/effects/model_solid.xml    | 10 +++
 .../shaders/effects/model_transparent.xml     | 76 -------------------
 .../effects/model_transparent_reflections.xml | 26 +++++++
 .../model_transparent_silhouette_caster.xml   | 16 ++++
 .../effects/model_transparent_solid.xml       | 13 ++++
 .../effects/model_transparent_wireframe.xml   | 14 ++++
 .../model_transparent_wireframe_solid.xml     | 10 +++
 .../public/shaders/effects/model_water.xml    |  1 -
 .../effects/model_water_shadow_caster.xml     | 15 ++++
 .../shaders/effects/model_waterfall.xml       |  1 -
 .../effects/model_waterfall_shadow_caster.xml | 12 +++
 .../shaders/effects/model_wireframe.xml       | 10 +++
 .../shaders/effects/model_wireframe_solid.xml | 10 +++
 27 files changed, 236 insertions(+), 197 deletions(-)
 create mode 100644 binaries/data/mods/mod/shaders/effects/terrain_base_reflections.xml
 create mode 100644 binaries/data/mods/mod/shaders/effects/terrain_base_wireframe.xml
 create mode 100644 binaries/data/mods/mod/shaders/effects/terrain_blend_reflections.xml
 create mode 100644 binaries/data/mods/mod/shaders/effects/terrain_blend_wireframe.xml
 create mode 100644 binaries/data/mods/mod/shaders/effects/terrain_decal_reflections.xml
 create mode 100644 binaries/data/mods/mod/shaders/effects/terrain_decal_wireframe.xml
 create mode 100644 binaries/data/mods/mod/shaders/effects/terrain_wireframe.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_reflections.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_silhouette_caster.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_solid.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_transparent_reflections.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_transparent_silhouette_caster.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_transparent_solid.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_transparent_wireframe.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_transparent_wireframe_solid.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_water_shadow_caster.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_waterfall_shadow_caster.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_wireframe.xml
 create mode 100644 binaries/data/mods/public/shaders/effects/model_wireframe_solid.xml

diff --git a/binaries/data/mods/mod/shaders/effects/terrain_base.xml b/binaries/data/mods/mod/shaders/effects/terrain_base.xml
index 387ef9d87c..9e9a7d66e2 100644
--- a/binaries/data/mods/mod/shaders/effects/terrain_base.xml
+++ b/binaries/data/mods/mod/shaders/effects/terrain_base.xml
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="terrain_base">
-			<cull mode="FRONT"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="terrain_base">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
 	<technique>
 		<require shaders="glsl"/>
 		<require shaders="spirv"/>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_base_reflections.xml b/binaries/data/mods/mod/shaders/effects/terrain_base_reflections.xml
new file mode 100644
index 0000000000..4d22039f2e
--- /dev/null
+++ b/binaries/data/mods/mod/shaders/effects/terrain_base_reflections.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="terrain_base">
+			<cull mode="FRONT"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_base_wireframe.xml b/binaries/data/mods/mod/shaders/effects/terrain_base_wireframe.xml
new file mode 100644
index 0000000000..9132758797
--- /dev/null
+++ b/binaries/data/mods/mod/shaders/effects/terrain_base_wireframe.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="terrain_base">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_blend.xml b/binaries/data/mods/mod/shaders/effects/terrain_blend.xml
index 04ec60e336..39ab47a193 100644
--- a/binaries/data/mods/mod/shaders/effects/terrain_blend.xml
+++ b/binaries/data/mods/mod/shaders/effects/terrain_blend.xml
@@ -1,27 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="terrain_blend">
-			<depth mask="false"/>
-			<cull mode="FRONT"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="terrain_blend">
-			<depth mask="false"/>
-			<polygon mode="LINE"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
 	<technique>
 		<require shaders="glsl"/>
 		<require shaders="spirv"/>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_blend_reflections.xml b/binaries/data/mods/mod/shaders/effects/terrain_blend_reflections.xml
new file mode 100644
index 0000000000..90c2d82dd7
--- /dev/null
+++ b/binaries/data/mods/mod/shaders/effects/terrain_blend_reflections.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="terrain_blend">
+			<depth mask="false"/>
+			<cull mode="FRONT"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_blend_wireframe.xml b/binaries/data/mods/mod/shaders/effects/terrain_blend_wireframe.xml
new file mode 100644
index 0000000000..9b12ef7bc1
--- /dev/null
+++ b/binaries/data/mods/mod/shaders/effects/terrain_blend_wireframe.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="terrain_blend">
+			<depth mask="false"/>
+			<polygon mode="LINE"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_decal.xml b/binaries/data/mods/mod/shaders/effects/terrain_decal.xml
index f3d4a46da9..c3b46363bf 100644
--- a/binaries/data/mods/mod/shaders/effects/terrain_decal.xml
+++ b/binaries/data/mods/mod/shaders/effects/terrain_decal.xml
@@ -1,27 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="terrain_decal">
-			<depth mask="false"/>
-			<cull mode="FRONT"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="terrain_decal">
-			<depth mask="false"/>
-			<polygon mode="LINE"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-		</pass>
-	</technique>
-
 	<technique>
 		<require shaders="glsl"/>
 		<require shaders="spirv"/>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_decal_reflections.xml b/binaries/data/mods/mod/shaders/effects/terrain_decal_reflections.xml
new file mode 100644
index 0000000000..31538e612c
--- /dev/null
+++ b/binaries/data/mods/mod/shaders/effects/terrain_decal_reflections.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="terrain_decal">
+			<depth mask="false"/>
+			<cull mode="FRONT"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_decal_wireframe.xml b/binaries/data/mods/mod/shaders/effects/terrain_decal_wireframe.xml
new file mode 100644
index 0000000000..4f3a3a0e1e
--- /dev/null
+++ b/binaries/data/mods/mod/shaders/effects/terrain_decal_wireframe.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="terrain_decal">
+			<depth mask="false"/>
+			<polygon mode="LINE"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_solid.xml b/binaries/data/mods/mod/shaders/effects/terrain_solid.xml
index d80d36602c..46db3b8a0d 100644
--- a/binaries/data/mods/mod/shaders/effects/terrain_solid.xml
+++ b/binaries/data/mods/mod/shaders/effects/terrain_solid.xml
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-	<technique>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<require context="MODE_WIREFRAME"/>
-		<pass shader="dummy">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
 	<technique>
 		<require shaders="glsl"/>
 		<require shaders="spirv"/>
 		<pass shader="dummy"/>
 	</technique>
-
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/terrain_wireframe.xml b/binaries/data/mods/mod/shaders/effects/terrain_wireframe.xml
new file mode 100644
index 0000000000..c8c8fcea2a
--- /dev/null
+++ b/binaries/data/mods/mod/shaders/effects/terrain_wireframe.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="dummy">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model.xml b/binaries/data/mods/public/shaders/effects/model.xml
index ea165d9cd9..25fa157b21 100644
--- a/binaries/data/mods/public/shaders/effects/model.xml
+++ b/binaries/data/mods/public/shaders/effects/model.xml
@@ -1,52 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="model_common">
-			<cull mode="FRONT"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_SHADOWCAST || MODE_SILHOUETTEOCCLUDER"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="model_solid">
-			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_WIREFRAME"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="model_common">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_WIREFRAME_SOLID"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="model_solid_player">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_SILHOUETTEDISPLAY"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="model_solid_player">
-			<depth func="gequal"/>
-			<stencil test="TRUE" compare="notequal" reference="1" mask_read="4294967295" pass="REPLACE"/>
-			<blend src="constant_alpha" dst="one_minus_constant_alpha" constant="0 0 0 191"/>
-		</pass>
-	</technique>
-
 	<technique>
 		<require shaders="glsl"/>
 		<require shaders="spirv"/>
diff --git a/binaries/data/mods/public/shaders/effects/model_reflections.xml b/binaries/data/mods/public/shaders/effects/model_reflections.xml
new file mode 100644
index 0000000000..67be7b688c
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_reflections.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_common">
+			<cull mode="FRONT"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_silhouette_caster.xml b/binaries/data/mods/public/shaders/effects/model_silhouette_caster.xml
new file mode 100644
index 0000000000..1c16c81e7a
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_silhouette_caster.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_solid_player">
+			<depth func="gequal"/>
+			<stencil test="TRUE" compare="notequal" reference="1" mask_read="4294967295" pass="REPLACE"/>
+			<blend src="constant_alpha" dst="one_minus_constant_alpha" constant="0 0 0 191"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_solid.xml b/binaries/data/mods/public/shaders/effects/model_solid.xml
new file mode 100644
index 0000000000..4e3fb0e355
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_solid.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_solid">
+			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_transparent.xml b/binaries/data/mods/public/shaders/effects/model_transparent.xml
index f45708d00b..6409ccc34f 100644
--- a/binaries/data/mods/public/shaders/effects/model_transparent.xml
+++ b/binaries/data/mods/public/shaders/effects/model_transparent.xml
@@ -1,81 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
-	<technique>
-		<require context="MODE_SHADOWCAST || MODE_SILHOUETTEOCCLUDER"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="model_solid_tex">
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.4"/>
-			<!-- Disable face-culling for two-sided models -->
-			<cull mode="NONE"/>
-			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
-		</pass>
-	</technique>
-
-	<!--
-		CRenderer::RenderSilhouettes skips alpha-blended models for
-		MODE_SILHOUETTEDISPLAY, so do a dummy non-blended behaviour here to
-		make it obviously buggy if CRenderer is changed to render these models.
-	-->
-	<technique>
-		<require context="MODE_SILHOUETTEDISPLAY"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="model_solid_player">
-			<depth func="gequal"/>
-			<stencil test="TRUE" compare="notequal" reference="1" mask_read="4294967295" pass="REPLACE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_WIREFRAME_SOLID"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="model_solid_player">
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="MODE_WIREFRAME"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-			<depth func="less" mask="false"/>
-			<cull mode="NONE"/>
-			<polygon mode="LINE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
-		<require context="ALPHABLEND_PASS_OPAQUE"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.6375"/>
-			<cull mode="NONE"/>
-		</pass>
-	</technique>
-
-	<technique>
-		<require context="PASS_REFLECTIONS"/>
-		<require context="ALPHABLEND_PASS_BLEND"/>
-		<require shaders="glsl"/>
-		<require shaders="spirv"/>
-		<pass shader="model_common">
-			<define name="USE_TRANSPARENT" value="1"/>
-			<define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
-			<blend src="src_alpha" dst="one_minus_src_alpha"/>
-			<depth func="less" mask="false"/>
-			<cull mode="NONE"/>
-		</pass>
-	</technique>
-
 	<technique>
 		<require context="ALPHABLEND_PASS_OPAQUE"/>
 		<require shaders="glsl"/>
diff --git a/binaries/data/mods/public/shaders/effects/model_transparent_reflections.xml b/binaries/data/mods/public/shaders/effects/model_transparent_reflections.xml
new file mode 100644
index 0000000000..fe7466976a
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_transparent_reflections.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require context="ALPHABLEND_PASS_OPAQUE"/>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_common">
+			<define name="USE_TRANSPARENT" value="1"/>
+			<define name="REQUIRE_ALPHA_GEQUAL" value="0.6375"/>
+			<cull mode="NONE"/>
+		</pass>
+	</technique>
+
+	<technique>
+		<require context="ALPHABLEND_PASS_BLEND"/>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_common">
+			<define name="USE_TRANSPARENT" value="1"/>
+			<define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+			<depth func="less" mask="false"/>
+			<cull mode="NONE"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_transparent_silhouette_caster.xml b/binaries/data/mods/public/shaders/effects/model_transparent_silhouette_caster.xml
new file mode 100644
index 0000000000..5d36c60e6c
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_transparent_silhouette_caster.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<!--
+		CRenderer::RenderSilhouettes skips alpha-blended models for
+		MODE_SILHOUETTEDISPLAY, so do a dummy non-blended behaviour here to
+		make it obviously buggy if CRenderer is changed to render these models.
+	-->
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_solid_player">
+			<depth func="gequal"/>
+			<stencil test="TRUE" compare="notequal" reference="1" mask_read="4294967295" pass="REPLACE"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_transparent_solid.xml b/binaries/data/mods/public/shaders/effects/model_transparent_solid.xml
new file mode 100644
index 0000000000..b264b62942
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_transparent_solid.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_solid_tex">
+			<define name="REQUIRE_ALPHA_GEQUAL" value="0.4"/>
+			<!-- Disable face-culling for two-sided models -->
+			<cull mode="NONE"/>
+			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_transparent_wireframe.xml b/binaries/data/mods/public/shaders/effects/model_transparent_wireframe.xml
new file mode 100644
index 0000000000..0c77347881
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_transparent_wireframe.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_common">
+			<define name="USE_TRANSPARENT" value="1"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+			<depth func="less" mask="false"/>
+			<cull mode="NONE"/>
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_transparent_wireframe_solid.xml b/binaries/data/mods/public/shaders/effects/model_transparent_wireframe_solid.xml
new file mode 100644
index 0000000000..3e4950eaff
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_transparent_wireframe_solid.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_solid_player">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_water.xml b/binaries/data/mods/public/shaders/effects/model_water.xml
index d01f32848d..fad00bf196 100644
--- a/binaries/data/mods/public/shaders/effects/model_water.xml
+++ b/binaries/data/mods/public/shaders/effects/model_water.xml
@@ -8,7 +8,6 @@
             <define name="USE_TRANSPARENT" value="1"/>
             <define name="USE_SPECULAR" value="1"/>
             <define name="USE_NORMAL_MAP" value="1"/>
-            <define name="USE_INSTANCING" value="1"/>
             <define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
             <blend src="src_alpha" dst="one_minus_src_alpha"/>
             <depth func="less" mask="true"/>
diff --git a/binaries/data/mods/public/shaders/effects/model_water_shadow_caster.xml b/binaries/data/mods/public/shaders/effects/model_water_shadow_caster.xml
new file mode 100644
index 0000000000..e7447ad666
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_water_shadow_caster.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+    <technique>
+        <require shaders="glsl"/>
+        <require shaders="spirv"/>
+        <pass shader="model_water">
+            <define name="USE_TRANSPARENT" value="1"/>
+            <define name="USE_SPECULAR" value="1"/>
+            <define name="USE_NORMAL_MAP" value="1"/>
+            <define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
+            <blend src="src_alpha" dst="one_minus_src_alpha"/>
+            <depth func="less" mask="true"/>
+        </pass>
+    </technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_waterfall.xml b/binaries/data/mods/public/shaders/effects/model_waterfall.xml
index 0991ad20e5..a2bbb110c6 100644
--- a/binaries/data/mods/public/shaders/effects/model_waterfall.xml
+++ b/binaries/data/mods/public/shaders/effects/model_waterfall.xml
@@ -6,7 +6,6 @@
         <sort_by_distance/>
         <pass shader="model_waterfall">
             <define name="USE_TRANSPARENT" value="1"/>
-            <define name="USE_INSTANCING" value="1"/>
             <blend src="src_alpha" dst="one_minus_src_alpha"/>
             <depth func="lequal" mask="true"/>
         </pass>
diff --git a/binaries/data/mods/public/shaders/effects/model_waterfall_shadow_caster.xml b/binaries/data/mods/public/shaders/effects/model_waterfall_shadow_caster.xml
new file mode 100644
index 0000000000..7a1e6013b7
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_waterfall_shadow_caster.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+    <technique>
+        <require shaders="glsl"/>
+        <require shaders="spirv"/>
+        <pass shader="model_waterfall">
+            <define name="USE_TRANSPARENT" value="1"/>
+            <blend src="src_alpha" dst="one_minus_src_alpha"/>
+            <depth func="lequal" mask="true"/>
+        </pass>
+    </technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_wireframe.xml b/binaries/data/mods/public/shaders/effects/model_wireframe.xml
new file mode 100644
index 0000000000..133bda9cde
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_wireframe.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_common">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+</effect>
diff --git a/binaries/data/mods/public/shaders/effects/model_wireframe_solid.xml b/binaries/data/mods/public/shaders/effects/model_wireframe_solid.xml
new file mode 100644
index 0000000000..3e4950eaff
--- /dev/null
+++ b/binaries/data/mods/public/shaders/effects/model_wireframe_solid.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<require shaders="spirv"/>
+		<pass shader="model_solid_player">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+</effect>