From 04230f7e035439fa2fbaa6779352bb4efb2918f1 Mon Sep 17 00:00:00 2001
From: vladislavbelov <vladislavbelov@wildfiregames.com>
Date: Sat, 29 Apr 2023 20:36:37 +0000
Subject: [PATCH] Adds SPIR-V to effect XML files.

Differential Revision: https://code.wildfiregames.com/D4986
This was SVN commit r27624.
---
 .../mods/mod/shaders/effects/canvas2d.xml     |  8 +-
 .../data/mods/mod/shaders/effects/cas.xml     |  6 ++
 .../data/mods/mod/shaders/effects/fxaa.xml    |  6 ++
 .../mods/public/shaders/effects/bloom.xml     |  7 +-
 .../public/shaders/effects/debug_line.xml     |  5 ++
 .../public/shaders/effects/debug_overlay.xml  |  9 +++
 .../mods/public/shaders/effects/dummy.xml     |  4 +
 .../shaders/effects/foreground_overlay.xml    |  5 ++
 .../public/shaders/effects/los_interp.xml     |  4 +
 .../mods/public/shaders/effects/minimap.xml   |  7 ++
 .../public/shaders/effects/minimap_los.xml    |  9 +++
 .../mods/public/shaders/effects/model.xml     | 47 +++++++++++
 .../shaders/effects/model_transparent.xml     | 81 +++++++++++++++++++
 .../public/shaders/effects/model_water.xml    | 13 +++
 .../shaders/effects/model_waterfall.xml       | 10 +++
 .../public/shaders/effects/overlay_line.xml   |  4 +
 .../public/shaders/effects/overlay_solid.xml  |  4 +
 .../mods/public/shaders/effects/particle.xml  |  7 ++
 .../public/shaders/effects/particle_add.xml   |  8 ++
 .../shaders/effects/particle_multiply.xml     |  8 ++
 .../shaders/effects/particle_overlay.xml      |  8 ++
 .../public/shaders/effects/particle_solid.xml | 15 ++++
 .../shaders/effects/particle_subtract.xml     |  8 ++
 .../public/shaders/effects/postproc/DOF.xml   | 10 +++
 .../public/shaders/effects/postproc/hdr.xml   |  7 ++
 .../public/shaders/effects/sky_simple.xml     |  7 ++
 .../mods/public/shaders/effects/solid.xml     |  5 ++
 .../public/shaders/effects/terrain_base.xml   | 21 +++++
 .../public/shaders/effects/terrain_blend.xml  | 28 +++++++
 .../public/shaders/effects/terrain_decal.xml  | 28 +++++++
 .../public/shaders/effects/terrain_solid.xml  | 24 ++++++
 .../public/shaders/effects/water_high.xml     |  8 ++
 .../public/shaders/effects/water_simple.xml   | 16 ++++
 .../public/shaders/effects/water_waves.xml    |  8 ++
 34 files changed, 443 insertions(+), 2 deletions(-)

diff --git a/binaries/data/mods/mod/shaders/effects/canvas2d.xml b/binaries/data/mods/mod/shaders/effects/canvas2d.xml
index 5589ff8c64..2882d8e0b2 100644
--- a/binaries/data/mods/mod/shaders/effects/canvas2d.xml
+++ b/binaries/data/mods/mod/shaders/effects/canvas2d.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require shaders="arb"/>
 		<pass shader="arb/canvas2d">
@@ -17,4 +16,11 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/canvas2d">
+			<depth test="FALSE" mask="false"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/cas.xml b/binaries/data/mods/mod/shaders/effects/cas.xml
index 798ebb4809..ae2c75c685 100644
--- a/binaries/data/mods/mod/shaders/effects/cas.xml
+++ b/binaries/data/mods/mod/shaders/effects/cas.xml
@@ -6,4 +6,10 @@
 			<depth test="FALSE" mask="false"/>
 		</pass>
 	</technique>
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/cas">
+			<depth test="FALSE" mask="false"/>
+		</pass>
+	</technique>
 </effect>
diff --git a/binaries/data/mods/mod/shaders/effects/fxaa.xml b/binaries/data/mods/mod/shaders/effects/fxaa.xml
index 84ec599bb8..6e66b0755d 100644
--- a/binaries/data/mods/mod/shaders/effects/fxaa.xml
+++ b/binaries/data/mods/mod/shaders/effects/fxaa.xml
@@ -6,4 +6,10 @@
 			<depth test="FALSE" mask="false"/>
 		</pass>
 	</technique>
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/fxaa">
+			<depth test="FALSE" mask="false"/>
+		</pass>
+	</technique>
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/bloom.xml b/binaries/data/mods/public/shaders/effects/bloom.xml
index 57cf89b150..8e6775ee66 100644
--- a/binaries/data/mods/public/shaders/effects/bloom.xml
+++ b/binaries/data/mods/public/shaders/effects/bloom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
-
 	<technique>
 		<require shaders="glsl"/>
 		<pass shader="glsl/bloom">
@@ -8,4 +7,10 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/bloom">
+			<depth test="FALSE" mask="false"/>
+		</pass>
+	</technique>
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/debug_line.xml b/binaries/data/mods/public/shaders/effects/debug_line.xml
index 8c1bb3ed42..8249d2b268 100644
--- a/binaries/data/mods/public/shaders/effects/debug_line.xml
+++ b/binaries/data/mods/public/shaders/effects/debug_line.xml
@@ -11,4 +11,9 @@
         <pass shader="glsl/debug_overlay"/>
     </technique>
 
+    <technique>
+        <require shaders="spirv"/>
+        <pass shader="spirv/debug_overlay"/>
+    </technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/debug_overlay.xml b/binaries/data/mods/public/shaders/effects/debug_overlay.xml
index 42a8501fed..11f5ab8fea 100644
--- a/binaries/data/mods/public/shaders/effects/debug_overlay.xml
+++ b/binaries/data/mods/public/shaders/effects/debug_overlay.xml
@@ -19,4 +19,13 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<define name="DEBUG_TEXTURED" value="1"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/debug_overlay">
+			<depth test="FALSE" mask="false"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/dummy.xml b/binaries/data/mods/public/shaders/effects/dummy.xml
index f0abcbcbea..cc0ae3bc74 100644
--- a/binaries/data/mods/public/shaders/effects/dummy.xml
+++ b/binaries/data/mods/public/shaders/effects/dummy.xml
@@ -8,4 +8,8 @@
 		<require shaders="glsl"/>
 		<pass shader="glsl/dummy"/>
 	</technique>
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/dummy"/>
+	</technique>
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/foreground_overlay.xml b/binaries/data/mods/public/shaders/effects/foreground_overlay.xml
index 190538f222..ef830fd12f 100644
--- a/binaries/data/mods/public/shaders/effects/foreground_overlay.xml
+++ b/binaries/data/mods/public/shaders/effects/foreground_overlay.xml
@@ -11,4 +11,9 @@
 	<pass shader="glsl/foreground_overlay"/>
     </technique>
 
+    <technique>
+        <require shaders="spirv"/>
+	<pass shader="spirv/foreground_overlay"/>
+    </technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/los_interp.xml b/binaries/data/mods/public/shaders/effects/los_interp.xml
index be9d9ec620..a108d8653d 100644
--- a/binaries/data/mods/public/shaders/effects/los_interp.xml
+++ b/binaries/data/mods/public/shaders/effects/los_interp.xml
@@ -8,4 +8,8 @@
         <require shaders="glsl"/>
         <pass shader="glsl/los_interp"/>
     </technique>
+    <technique>
+        <require shaders="spirv"/>
+        <pass shader="spirv/los_interp"/>
+    </technique>
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/minimap.xml b/binaries/data/mods/public/shaders/effects/minimap.xml
index 1f62b12eae..b28983d03e 100644
--- a/binaries/data/mods/public/shaders/effects/minimap.xml
+++ b/binaries/data/mods/public/shaders/effects/minimap.xml
@@ -15,4 +15,11 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/minimap">
+			<depth test="FALSE" mask="false"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/minimap_los.xml b/binaries/data/mods/public/shaders/effects/minimap_los.xml
index 2eb9d416d0..a7297b77db 100644
--- a/binaries/data/mods/public/shaders/effects/minimap_los.xml
+++ b/binaries/data/mods/public/shaders/effects/minimap_los.xml
@@ -19,4 +19,13 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<define name="MINIMAP_LOS" value="1"/>
+		<pass shader="spirv/minimap">
+			<depth test="FALSE" mask="false"/>
+			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="TRUE"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/model.xml b/binaries/data/mods/public/shaders/effects/model.xml
index 6d4dc59e5c..bf19b5501a 100644
--- a/binaries/data/mods/public/shaders/effects/model.xml
+++ b/binaries/data/mods/public/shaders/effects/model.xml
@@ -17,6 +17,14 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="PASS_REFLECTIONS"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/model_common">
+			<cull mode="FRONT"/>
+		</pass>
+	</technique>
+
 	<technique>
 		<require context="MODE_SHADOWCAST || MODE_SILHOUETTEOCCLUDER"/>
 		<require shaders="arb"/>
@@ -33,6 +41,14 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="MODE_SHADOWCAST || MODE_SILHOUETTEOCCLUDER"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/model_solid">
+			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require context="MODE_WIREFRAME"/>
@@ -50,6 +66,14 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="MODE_WIREFRAME"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/model_common">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require context="MODE_WIREFRAME_SOLID"/>
@@ -67,6 +91,14 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="MODE_WIREFRAME_SOLID"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/model_solid_player">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require context="MODE_SILHOUETTEDISPLAY"/>
@@ -88,6 +120,16 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="MODE_SILHOUETTEDISPLAY"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/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="arb"/>
@@ -99,4 +141,9 @@
 		<pass shader="glsl/model_common"/>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/model_common"/>
+	</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 fb12120283..ca64db71a9 100644
--- a/binaries/data/mods/public/shaders/effects/model_transparent.xml
+++ b/binaries/data/mods/public/shaders/effects/model_transparent.xml
@@ -23,6 +23,17 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="MODE_SHADOWCAST || MODE_SILHOUETTEOCCLUDER"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/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
@@ -46,6 +57,15 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="MODE_SILHOUETTEDISPLAY"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/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"/>
@@ -63,6 +83,14 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="MODE_WIREFRAME_SOLID"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/model_solid_player">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require context="MODE_WIREFRAME"/>
@@ -86,6 +114,17 @@
 			<polygon mode="LINE"/>
 		</pass>
 	</technique>
+	<technique>
+		<require context="MODE_WIREFRAME"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/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>
@@ -108,6 +147,16 @@
 			<cull mode="NONE"/>
 		</pass>
 	</technique>
+	<technique>
+		<require context="PASS_REFLECTIONS"/>
+		<require context="ALPHABLEND_PASS_OPAQUE"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/model_common">
+			<define name="USE_TRANSPARENT" value="1"/>
+			<define name="REQUIRE_ALPHA_GEQUAL" value="0.6375"/>
+			<cull mode="NONE"/>
+		</pass>
+	</technique>
 
 
 	<technique>
@@ -134,6 +183,18 @@
 			<cull mode="NONE"/>
 		</pass>
 	</technique>
+	<technique>
+		<require context="PASS_REFLECTIONS"/>
+		<require context="ALPHABLEND_PASS_BLEND"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/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>
@@ -154,6 +215,15 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="ALPHABLEND_PASS_OPAQUE"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/model_common">
+			<define name="USE_TRANSPARENT" value="1"/>
+			<define name="REQUIRE_ALPHA_GEQUAL" value="0.6375"/>
+		</pass>
+	</technique>
+
 
 
 	<technique>
@@ -178,4 +248,15 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="ALPHABLEND_PASS_BLEND"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/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"/>
+		</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 5a212dfacc..bde7683e7b 100644
--- a/binaries/data/mods/public/shaders/effects/model_water.xml
+++ b/binaries/data/mods/public/shaders/effects/model_water.xml
@@ -13,6 +13,19 @@
             <depth func="less" mask="true"/>
         </pass>
     </technique>
+    <technique>
+        <require shaders="spirv"/>
+        <sort_by_distance/>
+        <pass shader="spirv/model_water">
+            <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"/>
+        </pass>
+    </technique>
     <technique>
         <require shaders="arb"/>
     </technique>
diff --git a/binaries/data/mods/public/shaders/effects/model_waterfall.xml b/binaries/data/mods/public/shaders/effects/model_waterfall.xml
index 3d0c25e4f0..bcc527dccb 100644
--- a/binaries/data/mods/public/shaders/effects/model_waterfall.xml
+++ b/binaries/data/mods/public/shaders/effects/model_waterfall.xml
@@ -10,6 +10,16 @@
             <depth func="lequal" mask="true"/>
         </pass>
     </technique>
+    <technique>
+        <require shaders="spirv"/>
+        <sort_by_distance/>
+        <pass shader="spirv/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>
+    </technique>
     <technique>
         <require shaders="arb"/>
     </technique>
diff --git a/binaries/data/mods/public/shaders/effects/overlay_line.xml b/binaries/data/mods/public/shaders/effects/overlay_line.xml
index 56f27e1b1a..41afe79b47 100644
--- a/binaries/data/mods/public/shaders/effects/overlay_line.xml
+++ b/binaries/data/mods/public/shaders/effects/overlay_line.xml
@@ -8,4 +8,8 @@
         <require shaders="glsl"/>
         <pass shader="glsl/overlayline"/>
     </technique>
+    <technique>
+        <require shaders="spirv"/>
+        <pass shader="spirv/overlayline"/>
+    </technique>
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/overlay_solid.xml b/binaries/data/mods/public/shaders/effects/overlay_solid.xml
index 1f0394fbc7..57758e1b25 100644
--- a/binaries/data/mods/public/shaders/effects/overlay_solid.xml
+++ b/binaries/data/mods/public/shaders/effects/overlay_solid.xml
@@ -8,4 +8,8 @@
         <require shaders="glsl"/>
         <pass shader="glsl/overlay_solid"/>
     </technique>
+    <technique>
+        <require shaders="spirv"/>
+        <pass shader="spirv/overlay_solid"/>
+    </technique>
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/particle.xml b/binaries/data/mods/public/shaders/effects/particle.xml
index 857e7d174a..511d89ab66 100644
--- a/binaries/data/mods/public/shaders/effects/particle.xml
+++ b/binaries/data/mods/public/shaders/effects/particle.xml
@@ -15,4 +15,11 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/particle">
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/particle_add.xml b/binaries/data/mods/public/shaders/effects/particle_add.xml
index 9675f3bb2d..2f8fcb7c4c 100644
--- a/binaries/data/mods/public/shaders/effects/particle_add.xml
+++ b/binaries/data/mods/public/shaders/effects/particle_add.xml
@@ -17,4 +17,12 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/particle">
+			<blend src="src_alpha" dst="one"/>
+			<depth mask="false"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/particle_multiply.xml b/binaries/data/mods/public/shaders/effects/particle_multiply.xml
index a53e08a329..1bb616ab8e 100644
--- a/binaries/data/mods/public/shaders/effects/particle_multiply.xml
+++ b/binaries/data/mods/public/shaders/effects/particle_multiply.xml
@@ -17,4 +17,12 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/particle">
+			<blend src="zero" dst="one_minus_src_color"/>
+			<depth mask="false"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/particle_overlay.xml b/binaries/data/mods/public/shaders/effects/particle_overlay.xml
index 3eaaffb5d3..bd8c5b6804 100644
--- a/binaries/data/mods/public/shaders/effects/particle_overlay.xml
+++ b/binaries/data/mods/public/shaders/effects/particle_overlay.xml
@@ -17,4 +17,12 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/particle">
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+			<depth mask="false"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/particle_solid.xml b/binaries/data/mods/public/shaders/effects/particle_solid.xml
index 0a79e92fab..27593b54e3 100644
--- a/binaries/data/mods/public/shaders/effects/particle_solid.xml
+++ b/binaries/data/mods/public/shaders/effects/particle_solid.xml
@@ -17,6 +17,14 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<require context="MODE_WIREFRAME"/>
+		<pass shader="spirv/particle_solid">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require shaders="arb"/>
@@ -32,4 +40,11 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/particle_solid">
+			<depth mask="false"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/particle_subtract.xml b/binaries/data/mods/public/shaders/effects/particle_subtract.xml
index 519d34f253..5752f660db 100644
--- a/binaries/data/mods/public/shaders/effects/particle_subtract.xml
+++ b/binaries/data/mods/public/shaders/effects/particle_subtract.xml
@@ -17,4 +17,12 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/particle">
+			<blend src="src_alpha" dst="one" op="REVERSE_SUBTRACT"/>
+			<depth mask="false"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/postproc/DOF.xml b/binaries/data/mods/public/shaders/effects/postproc/DOF.xml
index 5de6fed399..de6a183326 100644
--- a/binaries/data/mods/public/shaders/effects/postproc/DOF.xml
+++ b/binaries/data/mods/public/shaders/effects/postproc/DOF.xml
@@ -10,4 +10,14 @@
 			<depth test="FALSE" mask="false"/>
 		</pass>
 	</technique>
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/dof">
+			<define name="BLUR_FOV" value="3"/>
+			<depth test="FALSE" mask="false"/>
+		</pass>
+		<pass shader="spirv/hdr">
+			<depth test="FALSE" mask="false"/>
+		</pass>
+	</technique>
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/postproc/hdr.xml b/binaries/data/mods/public/shaders/effects/postproc/hdr.xml
index 96893dde63..e1f5a2f0fb 100644
--- a/binaries/data/mods/public/shaders/effects/postproc/hdr.xml
+++ b/binaries/data/mods/public/shaders/effects/postproc/hdr.xml
@@ -8,4 +8,11 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/hdr">
+			<depth test="FALSE" mask="false"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/sky_simple.xml b/binaries/data/mods/public/shaders/effects/sky_simple.xml
index d02d81f9b1..3d69ac6ea4 100644
--- a/binaries/data/mods/public/shaders/effects/sky_simple.xml
+++ b/binaries/data/mods/public/shaders/effects/sky_simple.xml
@@ -15,4 +15,11 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/sky">
+			<depth mask="false"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/solid.xml b/binaries/data/mods/public/shaders/effects/solid.xml
index 6a99b45b21..93e02d26d7 100644
--- a/binaries/data/mods/public/shaders/effects/solid.xml
+++ b/binaries/data/mods/public/shaders/effects/solid.xml
@@ -11,4 +11,9 @@
         <pass shader="glsl/solid"/>
     </technique>
 
+    <technique>
+        <require shaders="spirv"/>
+        <pass shader="spirv/solid"/>
+    </technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/terrain_base.xml b/binaries/data/mods/public/shaders/effects/terrain_base.xml
index 68e5005d8b..72052c2c69 100644
--- a/binaries/data/mods/public/shaders/effects/terrain_base.xml
+++ b/binaries/data/mods/public/shaders/effects/terrain_base.xml
@@ -17,6 +17,14 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="PASS_REFLECTIONS"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/terrain_base">
+			<cull mode="FRONT"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require shaders="arb"/>
@@ -34,6 +42,14 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<require context="MODE_WIREFRAME"/>
+		<pass shader="spirv/terrain_base">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require shaders="arb"/>
@@ -45,4 +61,9 @@
 		<pass shader="glsl/terrain_base"/>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/terrain_base"/>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/terrain_blend.xml b/binaries/data/mods/public/shaders/effects/terrain_blend.xml
index 3ca646775f..1a61aa47e4 100644
--- a/binaries/data/mods/public/shaders/effects/terrain_blend.xml
+++ b/binaries/data/mods/public/shaders/effects/terrain_blend.xml
@@ -21,6 +21,16 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="PASS_REFLECTIONS"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/terrain_blend">
+			<depth mask="false"/>
+			<cull mode="FRONT"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require shaders="arb"/>
@@ -42,6 +52,16 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<require context="MODE_WIREFRAME"/>
+		<pass shader="spirv/terrain_blend">
+			<depth mask="false"/>
+			<polygon mode="LINE"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require shaders="arb"/>
@@ -59,4 +79,12 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/terrain_blend">
+			<depth mask="false"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/terrain_decal.xml b/binaries/data/mods/public/shaders/effects/terrain_decal.xml
index 93fa5f3878..1e45204c58 100644
--- a/binaries/data/mods/public/shaders/effects/terrain_decal.xml
+++ b/binaries/data/mods/public/shaders/effects/terrain_decal.xml
@@ -21,6 +21,16 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require context="PASS_REFLECTIONS"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/terrain_decal">
+			<depth mask="false"/>
+			<cull mode="FRONT"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require shaders="arb"/>
@@ -42,6 +52,16 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<require context="MODE_WIREFRAME"/>
+		<pass shader="spirv/terrain_decal">
+			<depth mask="false"/>
+			<polygon mode="LINE"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require shaders="arb"/>
@@ -59,4 +79,12 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/terrain_decal">
+			<depth mask="false"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/terrain_solid.xml b/binaries/data/mods/public/shaders/effects/terrain_solid.xml
index 9ff43c12ec..864dfa2907 100644
--- a/binaries/data/mods/public/shaders/effects/terrain_solid.xml
+++ b/binaries/data/mods/public/shaders/effects/terrain_solid.xml
@@ -23,6 +23,19 @@
 			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
 		</pass>
 	</technique>
+	<technique>
+		<require context="PASS_SHADOWS || MODE_SILHOUETTEOCCLUDER"/>
+		<require shaders="spirv"/>
+		<pass shader="spirv/dummy">
+			<!--
+				To prevent units displaying silhouettes when parts of their model
+				protrude into the ground, only occlude with the back faces of the
+				terrain (so silhouettes will still display when behind hills).
+			-->
+			<cull mode="FRONT"/>
+			<color mask_red="FALSE" mask_green="FALSE" mask_blue="FALSE" mask_alpha="FALSE"/>
+		</pass>
+	</technique>
 
 	<technique>
 		<require shaders="arb"/>
@@ -38,6 +51,13 @@
 			<polygon mode="LINE"/>
 		</pass>
 	</technique>
+	<technique>
+		<require shaders="spirv"/>
+		<require context="MODE_WIREFRAME"/>
+		<pass shader="spirv/dummy">
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
 
 	<technique>
 		<require shaders="arb"/>
@@ -47,5 +67,9 @@
 		<require shaders="glsl"/>
 		<pass shader="glsl/dummy"/>
 	</technique>
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/dummy"/>
+	</technique>
 
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/water_high.xml b/binaries/data/mods/public/shaders/effects/water_high.xml
index adb3e03cf3..ca00c729d0 100644
--- a/binaries/data/mods/public/shaders/effects/water_high.xml
+++ b/binaries/data/mods/public/shaders/effects/water_high.xml
@@ -7,4 +7,12 @@
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 		</pass>
 	</technique>
+
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/water_high">
+			<depth test="TRUE"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/water_simple.xml b/binaries/data/mods/public/shaders/effects/water_simple.xml
index 89091ee2f0..7debcb31a7 100644
--- a/binaries/data/mods/public/shaders/effects/water_simple.xml
+++ b/binaries/data/mods/public/shaders/effects/water_simple.xml
@@ -19,6 +19,15 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<require context="MODE_WIREFRAME"/>
+		<pass shader="spirv/water_simple">
+			<depth test="TRUE"/>
+			<polygon mode="LINE"/>
+		</pass>
+	</technique>
+
 
 	<technique>
 		<require shaders="arb"/>
@@ -34,4 +43,11 @@
 		</pass>
 	</technique>
 
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/water_simple">
+			<depth test="TRUE"/>
+		</pass>
+	</technique>
+
 </effect>
diff --git a/binaries/data/mods/public/shaders/effects/water_waves.xml b/binaries/data/mods/public/shaders/effects/water_waves.xml
index 8cea786580..a23e27cd83 100644
--- a/binaries/data/mods/public/shaders/effects/water_waves.xml
+++ b/binaries/data/mods/public/shaders/effects/water_waves.xml
@@ -7,4 +7,12 @@
 			<blend src="src_alpha" dst="one_minus_src_alpha"/>
 		</pass>
 	</technique>
+
+	<technique>
+		<require shaders="spirv"/>
+		<pass shader="spirv/waves">
+			<depth test="TRUE" func="always"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
 </effect>