From 1d877850b91ba17cb45b80b946afec7c778551cb Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Mon, 13 Apr 2020 17:17:45 +0100
Subject: [PATCH] Fix OSM2city buildings for Compositor using model shader

Previously osm2city buildings did not render under the
Compositor/ALS pipeline with /sim/rendering/shaders/model>0

Now it does.  Thanks to merspieler for assistance in
diagnosing the problem.
---
 Compositor/Effects/building.eff | 48 +++++++--------------------------
 1 file changed, 9 insertions(+), 39 deletions(-)

diff --git a/Compositor/Effects/building.eff b/Compositor/Effects/building.eff
index 0e31f3aac..7298777ff 100644
--- a/Compositor/Effects/building.eff
+++ b/Compositor/Effects/building.eff
@@ -115,28 +115,11 @@
 		<building-flag type="int">1</building-flag>
   </parameters>
 
-<technique n="4">
-  <!-- Atmospheric scattering technique with model shader-->
-  <scheme>als-lighting</scheme>
- 	<predicate>
-		<and>
-		  <property>/sim/rendering/shaders/quality-level</property>
-		  <property>/sim/rendering/shaders/model</property>
-		  <or>
-  			<less-equal>
-  			  <value type="float">2.0</value>
-  			  <glversion/>
-  			</less-equal>
-  			<and>
-  			  <extension-supported>GL_ARB_shader_objects</extension-supported>
-  			  <extension-supported>GL_ARB_shading_language_100</extension-supported>
-  			  <extension-supported>GL_ARB_vertex_shader</extension-supported>
-  			  <extension-supported>GL_ARB_fragment_shader</extension-supported>
-  			</and>
-		  </or>
-		</and>
-  </predicate>
-
+<technique n="7">
+  <!-- Atmospheric scattering technique with
+    /sim/rendering/shaders/quality-level > 0
+    /sim/rendering/shaders/model> 0
+  -->
     <pass>
       <texture-unit n="4">
     	  <unit>4</unit>
@@ -183,21 +166,6 @@
 
   <technique n="19">
     <!-- Base Atmospheric scattering technique -->
-    <scheme>als-lighting</scheme>
-    <predicate>
-      <or>
-        <less-equal>
-          <value type="float">2.0</value>
-          <glversion/>
-        </less-equal>
-        <and>
-          <extension-supported>GL_ARB_shader_objects</extension-supported>
-          <extension-supported>GL_ARB_shading_language_100</extension-supported>
-          <extension-supported>GL_ARB_vertex_shader</extension-supported>
-          <extension-supported>GL_ARB_fragment_shader</extension-supported>
-        </and>
-      </or>
-    </predicate>
     <pass>
       <program>
         <vertex-shader>Shaders/ALS/building-default.vert</vertex-shader>
@@ -226,8 +194,8 @@
   </technique>
 
 
-  <technique n="7">
-  <!-- Model shader, quality > 0 -->
+  <technique n="4">
+  <!-- Non-ALS.  Model shader > 0 , quality > 0 -->
 	<pass>
 		<material>
 			<active>true</active>
@@ -284,6 +252,7 @@
   </technique>
 
   <technique n="8">
+  <!-- Generic shaders, quality > 0 -->
 		<pass>
 			<vertex-program-two-side>
 				<use>vertex-program-two-side</use>
@@ -314,6 +283,7 @@
 	</technique>
 
   <technique n="9">
+  <!-- Fallback - no predicate -->
 		<pass>
 			<lighting>true</lighting>
 			<material>