From 0a0c2b3ce04fccf31292c6a274227ec86032f407 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Wed, 25 Dec 2019 11:02:13 +0200
Subject: [PATCH] Render themes: avoid patterns and textures because of old GPU
 issues

---
 vtm-themes/resources/assets/vtm/default.xml   | 24 ++++++-----
 vtm-themes/resources/assets/vtm/mapzen.xml    | 25 +++++------
 vtm-themes/resources/assets/vtm/newtron.xml   |  4 +-
 .../resources/assets/vtm/openmaptiles.xml     | 18 ++++----
 vtm-themes/resources/assets/vtm/osmagray.xml  | 43 ++++---------------
 .../resources/assets/vtm/osmarender.xml       | 43 ++++---------------
 .../resources/assets/vtm/tronrender.xml       |  4 +-
 7 files changed, 58 insertions(+), 103 deletions(-)

diff --git a/vtm-themes/resources/assets/vtm/default.xml b/vtm-themes/resources/assets/vtm/default.xml
index 0fe0f0c2..2160ac5f 100644
--- a/vtm-themes/resources/assets/vtm/default.xml
+++ b/vtm-themes/resources/assets/vtm/default.xml
@@ -60,27 +60,29 @@
     <style-area fade="10" fill="#e6e3e5" id="railway|industrial" />
 
     <!--Note: ordered according to their inheritance via the `use` attribute-->
-    <style-area id="tex1" src="assets:textures/rough.png" />
+
+    <!-- Avoid patterns and textures because of old GPU issues -->
+    <!--<style-area id="tex1" src="assets:textures/rough.png" />-->
 
     <!-- meadow|garden -->
-    <style-area fade="10" fill="#c9dc91" id="greens" use="tex1" />
+    <style-area fade="10" fill="#c9dc91" id="greens" />
 
     <!-- grass -->
-    <style-area fade="12" fill="#d3dcb9" id="lightgreen" use="tex1" />
+    <style-area fade="12" fill="#d3dcb9" id="lightgreen" />
 
     <!-- grassland|scrub -->
-    <style-area fade="10" fill="#c2cba5" id="darkgreen" use="tex1" />
+    <style-area fade="10" fill="#c2cba5" id="darkgreen" />
 
     <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
 
     <!--farmland-->
-    <style-area fade="12" fill="#e4dab5" id="farmland" use="tex1" />
+    <style-area fade="12" fill="#e4dab5" id="farmland" />
 
     <!-- marsh|wetland|mud|nature_reserve -->
     <style-area fade="12" fill="#deecb9" id="greens2" />
 
     <!-- park|common|green|cemetery|golf_course|dog_park -->
-    <style-area fade="11" fill="#9ac56e" id="park" use="tex1" />
+    <style-area fade="11" fill="#9ac56e" id="park" />
     <!-- <style-area id="park" fill="#a3ca7b" fade="11" /> -->
 
     <!--wood-->
@@ -92,7 +94,7 @@
     <!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
 
     <!-- de:Kleingartengebiet -->
-    <style-area fade="12" fill="#efeae0" id="allotments" use="tex1" />
+    <style-area fade="12" fill="#efeae0" id="allotments" />
 
     <!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
     <style-area fade="10" fill="#ddddcc" id="quarry" />
@@ -219,7 +221,7 @@
         <m k="landuse|natural|leisure|amenity|tourism">
             <!-- kind of more like landuse imho -->
             <m k="leisure|landuse" v="nature_reserve">
-                <area src="assets:patterns/nature-reserve.png" />
+                <area fill="#40abe29c" />
                 <m zoom-min="14">
                     <line cap="butt" fix="true" stroke="#abe29c" width="1.0" />
                 </m>
@@ -280,7 +282,7 @@
 
             <!-- Heideland, keep below forest -->
             <m v="heath|sand" zoom-min="10">
-                <area fade="10" fill="#fffad1" use="tex1" />
+                <area fade="10" fill="#fffad1" />
             </m>
 
             <m k="landuse|natural" v="forest|wood">
@@ -353,7 +355,7 @@
                     <area fade="12" fill="#daefdb" />
                 </m>
                 <m v="playground|miniature_golf" zoom-min="15">
-                    <area fill="#f4f4de" use="tex1" />
+                    <area fill="#f4f4de" />
                     <line cap="butt" fix="true" stroke="#d9d9a3" width="1.0" />
                 </m>
                 <m v="playing_fields|pitch">
@@ -1030,7 +1032,7 @@
 
         <!-- non-physical boundaries -->
         <m k="boundary" v="national_park">
-            <area src="assets:patterns/nature-reserve.png" />
+            <area fill="#40abe29c" />
         </m>
 
         <!--<m k="boundary" v="administrative"> -->
diff --git a/vtm-themes/resources/assets/vtm/mapzen.xml b/vtm-themes/resources/assets/vtm/mapzen.xml
index fca5b581..45840445 100644
--- a/vtm-themes/resources/assets/vtm/mapzen.xml
+++ b/vtm-themes/resources/assets/vtm/mapzen.xml
@@ -43,18 +43,19 @@
     <!-- src="assets:textures/wood.png" -->
     <!-- <style-area id="wood" fill="#d1dbc7" fade="8" blend="11" blend-fill="#9ac56e" /> -->
 
-    <style-area id="tex1" src="assets:textures/rough.png" />
+    <!-- Avoid patterns and textures because of old GPU issues -->
+    <!--<style-area id="tex1" src="assets:textures/rough.png" />-->
 
     <!-- meadow|garden -->
-    <style-area fade="10" fill="#c9dc91" id="greens" use="tex1" />
+    <style-area fade="10" fill="#c9dc91" id="greens" />
 
     <!-- grass -->
-    <style-area fade="12" fill="#d3dcb9" id="lightgreen" use="tex1" />
+    <style-area fade="12" fill="#d3dcb9" id="lightgreen" />
 
     <!-- grassland|scrub -->
-    <style-area fade="10" fill="#c2cba5" id="darkgreen" use="tex1" />
+    <style-area fade="10" fill="#c2cba5" id="darkgreen" />
 
-    <style-area fade="12" fill="#e4dab5" id="farmland" use="tex1" />
+    <style-area fade="12" fill="#e4dab5" id="farmland" />
 
     <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
 
@@ -62,7 +63,7 @@
     <style-area fade="12" fill="#deecb9" id="greens2" />
 
     <!-- park|common|green|cemetery|golf_course|dog_park -->
-    <style-area fade="11" fill="#9ac56e" id="park" use="tex1" />
+    <style-area fade="11" fill="#9ac56e" id="park" />
     <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" /> -->
 
     <style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
@@ -72,7 +73,7 @@
     <style-line cap="butt" fade="14" fix="true" id="park" stroke="#9ac56e" width="1.0" />
 
     <!-- de:Kleingartengebiet -->
-    <style-area fade="12" fill="#efeae0" id="allotments" use="tex1" />
+    <style-area fade="12" fill="#efeae0" id="allotments" />
 
     <!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
     <style-area fade="10" fill="#ddddcc" id="quarry" />
@@ -115,7 +116,7 @@
 
     <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
     <!-- src="assets:textures/water.png" -->
-    <style-area fade="-1" fill="#99badf" id="water" use="tex1" />
+    <style-area fade="-1" fill="#99badf" id="water" />
 
     <!-- no-go area boundary -->
     <style-line cap="butt" fix="true" id="fence" stroke="#444444" width="1.2" />
@@ -181,7 +182,7 @@
         <m k="kind">
             <!-- kind of more like landuse imho -->
             <m v="nature_reserve">
-                <area src="assets:patterns/nature-reserve.png" />
+                <area fill="#40abe29c" />
                 <m zoom-min="14">
                     <line cap="butt" fix="true" stroke="#abe29c" width="1.0" />
                 </m>
@@ -240,7 +241,7 @@
 
             <!-- Heideland, keep below forest -->
             <m v="heath|sand" zoom-min="10">
-                <area fade="10" fill="#fffad1" use="tex1" />
+                <area fade="10" fill="#fffad1" />
             </m>
 
             <m v="forest|wood">
@@ -314,7 +315,7 @@
                     <area fade="12" fill="#daefdb" />
                 </m>
                 <m v="playground|miniature_golf" zoom-min="15">
-                    <area fill="#f4f4de" use="tex1" />
+                    <area fill="#f4f4de" />
                     <line cap="butt" fix="true" stroke="#d9d9a3" width="1.0" />
                 </m>
                 <m v="playing_fields|pitch">
@@ -990,7 +991,7 @@
 
         <!-- non-physical boundaries -->
         <m k="boundary" v="national_park">
-            <area src="assets:patterns/nature-reserve.png" />
+            <area fill="#40abe29c" />
         </m>
 
         <!--<m k="boundary" v="administrative"> -->
diff --git a/vtm-themes/resources/assets/vtm/newtron.xml b/vtm-themes/resources/assets/vtm/newtron.xml
index d9a1e99c..758b5a91 100644
--- a/vtm-themes/resources/assets/vtm/newtron.xml
+++ b/vtm-themes/resources/assets/vtm/newtron.xml
@@ -168,7 +168,7 @@
         <m k="landuse|natural|leisure||amenity">
             <!-- kind of more like landuse imho -->
             <m k="leisure|landuse" v="nature_reserve">
-                <area src="assets:patterns/nature-reserve.png" />
+                <area fill="#40abe29c" />
                 <m zoom-min="14">
                     <line cap="butt" fix="true" stroke="#abe29c" width="1.0" />
                 </m>
@@ -1022,7 +1022,7 @@
 
         <!-- non-physical boundaries -->
         <m k="boundary" v="national_park">
-            <area src="assets:patterns/nature-reserve.png" />
+            <area fill="#40abe29c" />
         </m>
 
         <!--<m k="boundary" v="administrative"> -->
diff --git a/vtm-themes/resources/assets/vtm/openmaptiles.xml b/vtm-themes/resources/assets/vtm/openmaptiles.xml
index ae623cdd..284507d6 100644
--- a/vtm-themes/resources/assets/vtm/openmaptiles.xml
+++ b/vtm-themes/resources/assets/vtm/openmaptiles.xml
@@ -59,19 +59,21 @@
     <!-- <style-area id="wood" fill="#d1dbc7" fade="8" blend="11" blend-fill="#9ac56e" /> -->
 
     <!--Note: ordered according to their inheritance via the `use` attribute-->
-    <style-area id="tex1" src="assets:textures/rough.png" />
+
+    <!-- Avoid patterns and textures because of old GPU issues -->
+    <!--<style-area id="tex1" src="assets:textures/rough.png" />-->
 
     <!-- meadow|garden -->
-    <style-area fade="10" fill="#c9dc91" id="greens" use="tex1" />
+    <style-area fade="10" fill="#c9dc91" id="greens" />
 
     <!-- grass -->
-    <style-area fade="12" fill="#d3dcb9" id="lightgreen" use="tex1" />
+    <style-area fade="12" fill="#d3dcb9" id="lightgreen" />
 
     <!-- grassland|scrub -->
-    <style-area fade="10" fill="#c2cba5" id="darkgreen" use="tex1" />
+    <style-area fade="10" fill="#c2cba5" id="darkgreen" />
 
     <!--farmland-->
-    <style-area fade="12" fill="#e4dab5" id="farmland" use="tex1" />
+    <style-area fade="12" fill="#e4dab5" id="farmland" />
 
     <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
 
@@ -79,7 +81,7 @@
     <style-area fade="12" fill="#deecb9" id="greens2" />
 
     <!-- park|common|green|cemetery|golf_course|dog_park -->
-    <style-area fade="11" fill="#9ac56e" id="park" use="tex1" />
+    <style-area fade="11" fill="#9ac56e" id="park" />
     <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" /> -->
 
     <!--wood-->
@@ -87,7 +89,7 @@
     <!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
 
     <!-- de:Kleingartengebiet -->
-    <style-area fade="12" fill="#efeae0" id="allotments" use="tex1" />
+    <style-area fade="12" fill="#efeae0" id="allotments" />
 
     <!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
     <style-area fade="10" fill="#ddddcc" id="quarry" />
@@ -240,7 +242,7 @@
     <m k="layer" v="park">
         <m k="class">
             <m v="national_park|nature_reserve">
-                <area src="assets:patterns/nature-reserve.png" />
+                <area fill="#40abe29c" />
             </m>
         </m>
     </m>
diff --git a/vtm-themes/resources/assets/vtm/osmagray.xml b/vtm-themes/resources/assets/vtm/osmagray.xml
index 6c0fa0ec..84e24ad2 100644
--- a/vtm-themes/resources/assets/vtm/osmagray.xml
+++ b/vtm-themes/resources/assets/vtm/osmagray.xml
@@ -69,7 +69,7 @@
         <m k="landuse">
             <m select="first">
                 <m v="military">
-                    <area src="assets:patterns/military.png" />
+                    <area fill="#40ededed" />
                 </m>
                 <m v="residential|farmyard">
                     <area fill="#e4e4e4" />
@@ -94,7 +94,7 @@
                     <area fill="#d8d8d8" />
                 </m>
                 <m v="cemetery">
-                    <area src="assets:patterns/cemetery.png" />
+                    <area fill="#e2e2e2" />
                 </m>
                 <m v="field|farm|farmland|meadow|grass">
                     <area fill="#f9f9f9" />
@@ -117,20 +117,7 @@
         </m>
 
         <m k="natural|landuse" v="forest|wood">
-            <m k="wood">
-                <m k="wood" v="coniferous">
-                    <area src="assets:patterns/wood-coniferous.png" />
-                </m>
-                <m k="wood" v="deciduous">
-                    <area src="assets:patterns/wood-deciduous.png" />
-                </m>
-                <m k="wood" v="mixed">
-                    <area src="assets:patterns/wood-mixed.png" />
-                </m>
-            </m>
-            <m k="wood" v="~">
-                <area fill="#acacac" />
-            </m>
+            <area fill="#acacac" />
 
             <m zoom-min="16">
                 <text use="caption-small-blue" />
@@ -145,12 +132,12 @@
                     <area fill="#b5b5b5" />
                 </m>
                 <m v="grave_yard">
-                    <area src="assets:patterns/cemetery.png" />
+                    <area fill="#e2e2e2" />
                 </m>
                 <m v="parking">
                     <area fill="#fafafa" />
                     <m k="access" v="private" zoom-min="15">
-                        <area src="assets:patterns/access-private.png" />
+                        <area fill="#40363636" />
                     </m>
                 </m>
                 <m closed="yes" v="fountain">
@@ -184,7 +171,7 @@
                     <area fill="#fafafa" />
                 </m>
                 <m v="marsh|wetland">
-                    <area src="assets:patterns/marsh.png" />
+                    <area fill="#e5e5e5" />
                 </m>
             </m>
             <m k="name" zoom-min="16">
@@ -206,7 +193,7 @@
                     </m>
                 </m>
                 <m v="nature_reserve">
-                    <area src="assets:patterns/nature-reserve.png" />
+                    <area fill="#40d1d1d1" />
                 </m>
 
                 <m v="stadium|sports_centre|water_park">
@@ -280,7 +267,7 @@
 
         <!-- military -->
         <m k="military">
-            <area src="assets:patterns/military.png" />
+            <area fill="#40ededed" />
         </m>
 
 
@@ -782,18 +769,6 @@
                                 </m>
                             </m>
 
-                            <!-- <m zoom-min="16">
-
-                              <line width="1.0" stroke="#ff0000" />
-
-                              <m k="access" v="destination">
-                              <line src="assets:patterns/access-destination.png" width="1.5" />
-                              </m>
-                              <m k="access" v="private">
-                              <line src="assets:patterns/access-private.png" width="1.5" />
-                              </m>
-                              </m> -->
-
                             <!-- add outline for all matches -->
                             <m select="when-matched">
                                 <outline use="casing" />
@@ -1062,7 +1037,7 @@
 
         <m k="boundary">
             <m k="boundary" v="national_park">
-                <area src="assets:patterns/nature-reserve.png" />
+                <area fill="#40d1d1d1" />
             </m>
             <m k="boundary" v="administrative">
                 <m k="admin_level">
diff --git a/vtm-themes/resources/assets/vtm/osmarender.xml b/vtm-themes/resources/assets/vtm/osmarender.xml
index c8f686a8..326c87e6 100644
--- a/vtm-themes/resources/assets/vtm/osmarender.xml
+++ b/vtm-themes/resources/assets/vtm/osmarender.xml
@@ -69,7 +69,7 @@
         <m k="landuse">
             <m select="first">
                 <m v="military">
-                    <area src="assets:patterns/military.png" />
+                    <area fill="#40eeedea" />
                 </m>
                 <m v="residential|farmyard">
                     <area fill="#e4e4e4" />
@@ -94,7 +94,7 @@
                     <area fill="#e9dd72" />
                 </m>
                 <m v="cemetery">
-                    <area src="assets:patterns/cemetery.png" />
+                    <area fill="#c7f1a3" />
                 </m>
                 <m v="field|farm|farmland|meadow|grass">
                     <area fill="#ebfff2" />
@@ -117,20 +117,7 @@
         </m>
 
         <m k="natural|landuse" v="forest|wood">
-            <m k="wood">
-                <m k="wood" v="coniferous">
-                    <area src="assets:patterns/wood-coniferous.png" />
-                </m>
-                <m k="wood" v="deciduous">
-                    <area src="assets:patterns/wood-deciduous.png" />
-                </m>
-                <m k="wood" v="mixed">
-                    <area src="assets:patterns/wood-mixed.png" />
-                </m>
-            </m>
-            <m k="wood" v="~">
-                <area fill="#6fc18e" />
-            </m>
+            <area fill="#6fc18e" />
 
             <m zoom-min="16">
                 <text use="caption-small-blue" />
@@ -145,12 +132,12 @@
                     <area fill="#cdabde" />
                 </m>
                 <m v="grave_yard">
-                    <area src="assets:patterns/cemetery.png" />
+                    <area fill="#c7f1a3" />
                 </m>
                 <m v="parking">
                     <area fill="#ffffc0" />
                     <m k="access" v="private" zoom-min="15">
-                        <area src="assets:patterns/access-private.png" />
+                        <area fill="#40ff0000" />
                     </m>
                 </m>
                 <m closed="yes" v="fountain">
@@ -184,7 +171,7 @@
                     <area fill="#ffffc0" />
                 </m>
                 <m v="marsh|wetland">
-                    <area src="assets:patterns/marsh.png" />
+                    <area fill="#deecb9" />
                 </m>
             </m>
             <m k="name" zoom-min="16">
@@ -206,7 +193,7 @@
                     </m>
                 </m>
                 <m v="nature_reserve">
-                    <area src="assets:patterns/nature-reserve.png" />
+                    <area fill="#40abe29c" />
                 </m>
 
                 <m v="stadium|sports_centre|water_park">
@@ -280,7 +267,7 @@
 
         <!-- military -->
         <m k="military">
-            <area src="assets:patterns/military.png" />
+            <area fill="#40eeedea" />
         </m>
 
 
@@ -782,18 +769,6 @@
                                 </m>
                             </m>
 
-                            <!-- <m zoom-min="16">
-
-                              <line width="1.0" stroke="#ff0000" />
-
-                              <m k="access" v="destination">
-                              <line src="assets:patterns/access-destination.png" width="1.5" />
-                              </m>
-                              <m k="access" v="private">
-                              <line src="assets:patterns/access-private.png" width="1.5" />
-                              </m>
-                              </m> -->
-
                             <!-- add outline for all matches -->
                             <m select="when-matched">
                                 <outline use="casing" />
@@ -1062,7 +1037,7 @@
 
         <m k="boundary">
             <m k="boundary" v="national_park">
-                <area src="assets:patterns/nature-reserve.png" />
+                <area fill="#40abe29c" />
             </m>
             <m k="boundary" v="administrative">
                 <m k="admin_level">
diff --git a/vtm-themes/resources/assets/vtm/tronrender.xml b/vtm-themes/resources/assets/vtm/tronrender.xml
index bd85c3e7..29a192e1 100644
--- a/vtm-themes/resources/assets/vtm/tronrender.xml
+++ b/vtm-themes/resources/assets/vtm/tronrender.xml
@@ -168,7 +168,7 @@
         <m k="landuse|natural|leisure||amenity">
             <!-- kind of more like landuse imho -->
             <m k="leisure|landuse" v="nature_reserve">
-                <area src="assets:patterns/nature-reserve.png" />
+                <area fill="#40abe29c" />
                 <m zoom-min="14">
                     <line cap="butt" fix="true" stroke="#abe29c" width="1.0" />
                 </m>
@@ -1015,7 +1015,7 @@
 
         <!-- non-physical boundaries -->
         <m k="boundary" v="national_park">
-            <area src="assets:patterns/nature-reserve.png" />
+            <area fill="#40abe29c" />
         </m>
 
         <!--<m k="boundary" v="administrative"> -->