From d1ab9811100ab738c6d4270957671597edb2ab23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Garc=C3=ADa=20Li=C3=B1=C3=A1n?=
<fernandogarcialinan@gmail.com>
Date: Wed, 30 Oct 2019 20:12:55 +0100
Subject: [PATCH] Compositor: Fixed render order of child effects
---
Compositor/Effects/agriculture.eff | 2 +-
Compositor/Effects/airfield.eff | 2 +-
Compositor/Effects/bowwave.eff | 6 +++---
Compositor/Effects/building.eff | 10 +++++-----
Compositor/Effects/chute.eff | 2 +-
Compositor/Effects/cityLM.eff | 2 +-
Compositor/Effects/cliffs.eff | 2 +-
Compositor/Effects/crop.eff | 2 +-
Compositor/Effects/dirt-runway.eff | 2 +-
Compositor/Effects/flutter.eff | 4 ++--
Compositor/Effects/forest.eff | 2 +-
Compositor/Effects/glacier.eff | 2 +-
Compositor/Effects/glass.eff | 4 ++--
Compositor/Effects/grass.eff | 2 +-
Compositor/Effects/herbtundra.eff | 2 +-
Compositor/Effects/hud.eff | 4 ++--
Compositor/Effects/landmass.eff | 4 ++--
Compositor/Effects/lfeat.eff | 2 +-
Compositor/Effects/model-combined-transparent.eff | 2 +-
Compositor/Effects/model-combined.eff | 4 ++--
Compositor/Effects/model-interior-display.eff | 2 +-
Compositor/Effects/model-interior.eff | 4 ++--
Compositor/Effects/model-wingflex-organic.eff | 4 ++--
Compositor/Effects/road.eff | 2 +-
Compositor/Effects/rock.eff | 2 +-
Compositor/Effects/runway.eff | 4 ++--
Compositor/Effects/schemes.xml | 8 --------
Compositor/Effects/space-combined.eff | 4 ++--
Compositor/Effects/space.eff | 2 +-
Compositor/Effects/terrain-overlay.eff | 2 +-
Compositor/Effects/transition.eff | 2 +-
Compositor/Effects/urban.eff | 8 ++++----
Compositor/Effects/water-inland.eff | 6 +++---
Compositor/Effects/water.eff | 8 ++++----
34 files changed, 56 insertions(+), 64 deletions(-)
delete mode 100644 Compositor/Effects/schemes.xml
diff --git a/Compositor/Effects/agriculture.eff b/Compositor/Effects/agriculture.eff
index 2f7397cd5..f3dd04b60 100644
--- a/Compositor/Effects/agriculture.eff
+++ b/Compositor/Effects/agriculture.eff
@@ -278,7 +278,7 @@
</parameters>
<!-- put techniques at a "high" index to allow derived effects to
insert their own techniques first. -->
- <technique n="19">
+ <technique n="16">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/airfield.eff b/Compositor/Effects/airfield.eff
index 7c5b91796..576f98e63 100644
--- a/Compositor/Effects/airfield.eff
+++ b/Compositor/Effects/airfield.eff
@@ -37,7 +37,7 @@
<overlay_bias>0.0</overlay_bias>
<overlay_alpha>1.0</overlay_alpha>
</parameters>
- <technique n="19">
+ <technique n="16">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/bowwave.eff b/Compositor/Effects/bowwave.eff
index 7d94697a9..86a0b49e0 100644
--- a/Compositor/Effects/bowwave.eff
+++ b/Compositor/Effects/bowwave.eff
@@ -154,7 +154,7 @@
</sea_b>
<!-- END fog include -->
</parameters>
- <technique n="8">
+ <technique n="6">
<!-- FIXME: this technique number overlaps the one in model-default -->
<predicate>
<and>
@@ -219,7 +219,7 @@
</uniform>
</pass>
</technique>
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
@@ -616,7 +616,7 @@
<!-- END fog include -->
</pass>
</technique>
- <technique n="19">
+ <technique n="18">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/building.eff b/Compositor/Effects/building.eff
index c2d84da28..9853b7b8f 100644
--- a/Compositor/Effects/building.eff
+++ b/Compositor/Effects/building.eff
@@ -146,7 +146,7 @@
</parameters>
<!-- Atmospheric scattering technique with model shader-->
<!-- Atmospheric scattering technique -->
- <technique n="7">
+ <technique n="4">
<pass>
<lighting>true</lighting>
<material>
@@ -338,7 +338,7 @@
</uniform>
</pass>
</technique>
- <technique n="8">
+ <technique n="5">
<pass>
<material>
<active>true</active>
@@ -401,7 +401,7 @@
</program>
</pass>
</technique>
- <technique n="9">
+ <technique n="6">
<pass>
<material>
<active>true</active>
@@ -464,7 +464,7 @@
</program>
</pass>
</technique>
- <technique n="18">
+ <technique n="16">
<scheme>als-lighting</scheme>
<predicate>
<and>
@@ -578,7 +578,7 @@
</program>
</pass>
</technique>
- <technique n="19">
+ <technique n="17">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/chute.eff b/Compositor/Effects/chute.eff
index 6a212fd05..a3e6480d6 100644
--- a/Compositor/Effects/chute.eff
+++ b/Compositor/Effects/chute.eff
@@ -9,7 +9,7 @@
<chute_bend>0.0</chute_bend>
<!-- END fog include -->
</parameters>
- <technique n="19">
+ <technique n="18">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/cityLM.eff b/Compositor/Effects/cityLM.eff
index c99727cbd..7ed569c00 100644
--- a/Compositor/Effects/cityLM.eff
+++ b/Compositor/Effects/cityLM.eff
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<PropertyList>
<name>Effects/cityLM</name>
- <inherits-from>/Effects/model-combined-deferred</inherits-from>
+ <inherits-from>Effects/model-combined-deferred</inherits-from>
<parameters>
<!-- Light Map -->
<lightmap-enabled type="int">1</lightmap-enabled>
diff --git a/Compositor/Effects/cliffs.eff b/Compositor/Effects/cliffs.eff
index ed80c5aa0..f890f5265 100644
--- a/Compositor/Effects/cliffs.eff
+++ b/Compositor/Effects/cliffs.eff
@@ -35,7 +35,7 @@
<grain-fade-power type="float">1.3</grain-fade-power>
<rock_strata>0</rock_strata>-->
</parameters>
- <technique n="19">
+ <technique n="16">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/crop.eff b/Compositor/Effects/crop.eff
index 09d98a22f..9a351f308 100644
--- a/Compositor/Effects/crop.eff
+++ b/Compositor/Effects/crop.eff
@@ -22,7 +22,7 @@
<use>/environment/snow-level-m</use>
</snow-level>
</parameters>
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
diff --git a/Compositor/Effects/dirt-runway.eff b/Compositor/Effects/dirt-runway.eff
index 97da83a2e..099c2c679 100644
--- a/Compositor/Effects/dirt-runway.eff
+++ b/Compositor/Effects/dirt-runway.eff
@@ -42,7 +42,7 @@
<size_grain>30.0</size_grain>
<grain_strength>1.0</grain_strength>
</parameters>
- <technique n="19">
+ <technique n="15">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/flutter.eff b/Compositor/Effects/flutter.eff
index 67818a784..3a5e2d0ea 100644
--- a/Compositor/Effects/flutter.eff
+++ b/Compositor/Effects/flutter.eff
@@ -46,7 +46,7 @@
</fogtype>
<!-- END fog include -->
</parameters>
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
@@ -262,7 +262,7 @@
<!-- END fog include -->
</pass>
</technique>
- <technique n="19">
+ <technique n="18">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/forest.eff b/Compositor/Effects/forest.eff
index 9bbe17769..4d3203d10 100644
--- a/Compositor/Effects/forest.eff
+++ b/Compositor/Effects/forest.eff
@@ -72,7 +72,7 @@
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
diff --git a/Compositor/Effects/glacier.eff b/Compositor/Effects/glacier.eff
index c79d0a3b9..c7afffdd6 100644
--- a/Compositor/Effects/glacier.eff
+++ b/Compositor/Effects/glacier.eff
@@ -72,7 +72,7 @@
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
diff --git a/Compositor/Effects/glass.eff b/Compositor/Effects/glass.eff
index 8f1830be1..7bb63adf0 100644
--- a/Compositor/Effects/glass.eff
+++ b/Compositor/Effects/glass.eff
@@ -89,7 +89,7 @@
</parameters>
<!-- fall back to a fixed pipeline technique equivalent to model-transparent otherwise -->
<!-- Rembrandt technique of model-default comes at 10, so we insert before that -->
- <technique n="9">
+ <technique n="7">
<pass>
<lighting>true</lighting>
<depth>
@@ -165,7 +165,7 @@
</texture-unit>
</pass>
</technique>
- <technique n="19">
+ <technique n="18">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/grass.eff b/Compositor/Effects/grass.eff
index af65ef113..c6e3fbad0 100644
--- a/Compositor/Effects/grass.eff
+++ b/Compositor/Effects/grass.eff
@@ -33,7 +33,7 @@
<use>/environment/aircraft-effects/wash-strength</use>
</wash-strength>
</parameters>
- <technique n="19">
+ <technique n="15">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/herbtundra.eff b/Compositor/Effects/herbtundra.eff
index e85c1cfc1..da6f88562 100644
--- a/Compositor/Effects/herbtundra.eff
+++ b/Compositor/Effects/herbtundra.eff
@@ -72,7 +72,7 @@
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
diff --git a/Compositor/Effects/hud.eff b/Compositor/Effects/hud.eff
index c28fd7956..06d39ed85 100644
--- a/Compositor/Effects/hud.eff
+++ b/Compositor/Effects/hud.eff
@@ -93,7 +93,7 @@
</parameters>
<!-- fall back to a fixed pipeline technique equivalent to model-transparent otherwise -->
<!-- Rembrandt technique of model-default comes at 10, so we insert before that -->
- <technique n="9">
+ <technique n="7">
<pass>
<lighting>true</lighting>
<depth>
@@ -169,7 +169,7 @@
</texture-unit>
</pass>
</technique>
- <technique n="19">
+ <technique n="18">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/landmass.eff b/Compositor/Effects/landmass.eff
index 4c391b13c..2a83b5190 100644
--- a/Compositor/Effects/landmass.eff
+++ b/Compositor/Effects/landmass.eff
@@ -44,7 +44,7 @@
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>
- <technique n="8">
+ <technique n="6">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
@@ -380,7 +380,7 @@
<!-- END fog include -->
</pass>
</technique>
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
diff --git a/Compositor/Effects/lfeat.eff b/Compositor/Effects/lfeat.eff
index 2a51da52e..239c15e92 100644
--- a/Compositor/Effects/lfeat.eff
+++ b/Compositor/Effects/lfeat.eff
@@ -21,7 +21,7 @@
<transparent>true</transparent>
<raise_vertex type="bool">true</raise_vertex>
</parameters>
- <technique n="19">
+ <technique n="15">
<scheme>als-lighting</scheme>
<predicate>
<equal>
diff --git a/Compositor/Effects/model-combined-transparent.eff b/Compositor/Effects/model-combined-transparent.eff
index c1e2067a9..55701c583 100644
--- a/Compositor/Effects/model-combined-transparent.eff
+++ b/Compositor/Effects/model-combined-transparent.eff
@@ -7,7 +7,7 @@ and fallback to plain transparency when the model shader is disabled.
<name>Effects/model-combined-transparent</name>
<inherits-from>Effects/model-combined</inherits-from>
<!-- Rembrandt rendering -->
- <technique n="9">
+ <technique n="6">
<predicate>
<and>
<equal>
diff --git a/Compositor/Effects/model-combined.eff b/Compositor/Effects/model-combined.eff
index abae0c519..cd96f2791 100644
--- a/Compositor/Effects/model-combined.eff
+++ b/Compositor/Effects/model-combined.eff
@@ -305,7 +305,7 @@ please see Docs/README.model-combined.eff for documentation
<binormal type="int">7</binormal>
</generate>-->
<!-- Default rendering -->
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
@@ -843,7 +843,7 @@ please see Docs/README.model-combined.eff for documentation
</uniform>
</pass>
</technique>
- <technique n="19">
+ <technique n="18">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/model-interior-display.eff b/Compositor/Effects/model-interior-display.eff
index 39d523171..5c993b362 100644
--- a/Compositor/Effects/model-interior-display.eff
+++ b/Compositor/Effects/model-interior-display.eff
@@ -284,7 +284,7 @@
</uniform>
</pass>
</technique>-->
- <technique n="19">
+ <technique n="16">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/model-interior.eff b/Compositor/Effects/model-interior.eff
index 525400bad..225fc2e80 100644
--- a/Compositor/Effects/model-interior.eff
+++ b/Compositor/Effects/model-interior.eff
@@ -65,7 +65,7 @@
<ra-irradiance-map-type type="int">0</ra-irradiance-map-type>
<ra-irradiance-map-strength type="float">0.0</ra-irradiance-map-strength>
</parameters>
- <technique n="18">
+ <technique n="17">
<scheme>als-lighting</scheme>
<predicate>
<and>
@@ -648,7 +648,7 @@
</uniform>
</pass>
</technique>
- <technique n="19">
+ <technique n="18">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/model-wingflex-organic.eff b/Compositor/Effects/model-wingflex-organic.eff
index 1d45a46a1..f0e1344f5 100644
--- a/Compositor/Effects/model-wingflex-organic.eff
+++ b/Compositor/Effects/model-wingflex-organic.eff
@@ -294,7 +294,7 @@
<binormal type="int">7</binormal>
</generate>-->
<!-- Default rendering -->
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
@@ -832,7 +832,7 @@
</uniform>
</pass>
</technique>
- <technique n="19">
+ <technique n="18">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/road.eff b/Compositor/Effects/road.eff
index c5ec48dfd..f26061bf3 100644
--- a/Compositor/Effects/road.eff
+++ b/Compositor/Effects/road.eff
@@ -59,7 +59,7 @@
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>
- <technique n="19">
+ <technique n="17">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/rock.eff b/Compositor/Effects/rock.eff
index df429d572..f21507865 100644
--- a/Compositor/Effects/rock.eff
+++ b/Compositor/Effects/rock.eff
@@ -35,7 +35,7 @@
<grain-fade-power type="float">1.3</grain-fade-power>
<rock_strata>0</rock_strata>-->
</parameters>
- <technique n="19">
+ <technique n="16">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/runway.eff b/Compositor/Effects/runway.eff
index d060edf96..84c2ce804 100644
--- a/Compositor/Effects/runway.eff
+++ b/Compositor/Effects/runway.eff
@@ -254,7 +254,7 @@
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
@@ -548,7 +548,7 @@
</uniform>
</pass>
</technique>
- <technique n="19">
+ <technique n="16">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/schemes.xml b/Compositor/Effects/schemes.xml
deleted file mode 100644
index 5ea011426..000000000
--- a/Compositor/Effects/schemes.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<PropertyList>
- <scheme>
- <name>als-shadow</name>
- <fallback>Effects/shadow-pass</fallback>
- </scheme>
-</PropertyList>
diff --git a/Compositor/Effects/space-combined.eff b/Compositor/Effects/space-combined.eff
index c2464b550..bd3058a2f 100644
--- a/Compositor/Effects/space-combined.eff
+++ b/Compositor/Effects/space-combined.eff
@@ -14,7 +14,7 @@
<geo_ambience type="float">0.0</geo_ambience>
<use_geo_light type="int">0</use_geo_light>
</parameters>
- <technique n="8">
+ <technique n="5">
<pass>
<program>
<vertex-shader n="0">Shaders/ALS/space-ultra.vert</vertex-shader>
@@ -950,7 +950,7 @@
</uniform>
</pass>
</technique>
- <technique n="9">
+ <technique n="6">
<pass>
<program>
<vertex-shader n="0">Shaders/ALS/space-base.vert</vertex-shader>
diff --git a/Compositor/Effects/space.eff b/Compositor/Effects/space.eff
index d93ba695e..82bc863ae 100644
--- a/Compositor/Effects/space.eff
+++ b/Compositor/Effects/space.eff
@@ -3,7 +3,7 @@
<PropertyList>
<name>Effects/space</name>
<inherits-from>Effects/model-default</inherits-from>
- <technique n="9">
+ <technique n="7">
<pass>
<program>
<vertex-shader n="0">Shaders/ALS/space-base.vert</vertex-shader>
diff --git a/Compositor/Effects/terrain-overlay.eff b/Compositor/Effects/terrain-overlay.eff
index 200dd2aae..cf7adc30a 100644
--- a/Compositor/Effects/terrain-overlay.eff
+++ b/Compositor/Effects/terrain-overlay.eff
@@ -33,7 +33,7 @@
<overlay_autumn_flag>0</overlay_autumn_flag>
<overlay_secondary_flag>0</overlay_secondary_flag>
</parameters>
- <technique n="19">
+ <technique n="16">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/transition.eff b/Compositor/Effects/transition.eff
index 6570f472f..d1619bd72 100644
--- a/Compositor/Effects/transition.eff
+++ b/Compositor/Effects/transition.eff
@@ -86,7 +86,7 @@ parameters :
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>-->
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
diff --git a/Compositor/Effects/urban.eff b/Compositor/Effects/urban.eff
index b1b0ed289..ca3deeaa1 100644
--- a/Compositor/Effects/urban.eff
+++ b/Compositor/Effects/urban.eff
@@ -48,7 +48,7 @@
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>
- <technique n="8">
+ <technique n="6">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
@@ -319,7 +319,7 @@
<!-- END fog include -->
</pass>
</technique>
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
@@ -533,7 +533,7 @@
</uniform>
</pass>
</technique>
- <technique n="18">
+ <technique n="15">
<scheme>als-lighting</scheme>
<predicate>
<and>
@@ -1387,7 +1387,7 @@
<!-- END fog include -->
</pass>
</technique>
- <technique n="19">
+ <technique n="16">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/water-inland.eff b/Compositor/Effects/water-inland.eff
index 6a339071a..3db15d05d 100644
--- a/Compositor/Effects/water-inland.eff
+++ b/Compositor/Effects/water-inland.eff
@@ -334,7 +334,7 @@
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/water</property>
@@ -713,7 +713,7 @@
<!-- END fog include -->
</pass>
</technique>
- <technique n="18">
+ <technique n="15">
<scheme>als-lighting</scheme>
<predicate>
<and>
@@ -1606,7 +1606,7 @@
<!-- END fog include -->
</pass>
</technique>
- <technique n="19">
+ <technique n="16">
<scheme>als-lighting</scheme>
<predicate>
<and>
diff --git a/Compositor/Effects/water.eff b/Compositor/Effects/water.eff
index 84642ab4d..01f111e95 100644
--- a/Compositor/Effects/water.eff
+++ b/Compositor/Effects/water.eff
@@ -334,7 +334,7 @@
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>
- <technique n="8">
+ <technique n="6">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
@@ -772,7 +772,7 @@
</uniform>
</pass>
</technique>
- <technique n="9">
+ <technique n="7">
<predicate>
<and>
<property>/sim/rendering/shaders/quality-level</property>
@@ -1167,7 +1167,7 @@
</uniform>
</pass>
</technique>
- <technique n="18">
+ <technique n="15">
<scheme>als-lighting</scheme>
<predicate>
<and>
@@ -2040,7 +2040,7 @@
<!-- END fog include -->
</pass>
</technique>
- <technique n="19">
+ <technique n="16">
<scheme>als-lighting</scheme>
<predicate>
<and>