summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnsis Brammanis <ansis@mapbox.com>2018-08-14 17:08:35 -0700
committerAnsis Brammanis <ansis@mapbox.com>2018-08-14 17:08:35 -0700
commit0a6c4f92c38142ce80595977bd9f1de6c722e95d (patch)
tree57133a333e4b26b3080b7f9cfbe26777b1b341cc
parent20f880ebec82bbd7553fc382400227efc0105bce (diff)
downloadqtlocation-mapboxgl-upstream/fix-small-icon-size.tar.gz
[core] fix icon-size for small data-driven valuesupstream/fix-small-icon-size
port of https://github.com/mapbox/mapbox-gl-js/pull/7125
m---------mapbox-gl-js0
-rw-r--r--platform/node/test/ignores.json8
-rw-r--r--src/mbgl/programs/symbol_program.hpp4
-rw-r--r--src/mbgl/shaders/source.cpp374
-rw-r--r--src/mbgl/shaders/symbol_icon.cpp2
-rw-r--r--src/mbgl/shaders/symbol_sdf.cpp4
6 files changed, 199 insertions, 193 deletions
diff --git a/mapbox-gl-js b/mapbox-gl-js
-Subproject 6c22a1720dac51eac1c898ca06b3e2f24dbe081
+Subproject 23469bc8f264745dbe391f920626a559f2d0053
diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json
index 18e9e11c49..4d20af1f48 100644
--- a/platform/node/test/ignores.json
+++ b/platform/node/test/ignores.json
@@ -88,5 +88,11 @@
"render-tests/combinations/symbol-translucent--fill-extrusion-translucent": "needs investigation",
"render-tests/feature-state/composite-expression": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
"render-tests/feature-state/data-expression": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
- "render-tests/feature-state/vector-source": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue"
+ "render-tests/feature-state/vector-source": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
+ "render-tests/text-field/formatted-arabic": "https://github.com/mapbox/mapbox-gl-native/issues/12612",
+ "render-tests/text-field/formatted-line": "https://github.com/mapbox/mapbox-gl-native/issues/12612",
+ "render-tests/text-field/formatted": "https://github.com/mapbox/mapbox-gl-native/issues/12612",
+ "render-tests/basic-v9/z0-wide": "https://github.com/mapbox/mapbox-gl-native/pull/12611",
+ "render-tests/bright-v9/z0-wide": "https://github.com/mapbox/mapbox-gl-native/pull/12611",
+ "render-tests/satellite-v9/z0-wide": "https://github.com/mapbox/mapbox-gl-native/pull/12611"
}
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp
index 0378cc0970..651f12828f 100644
--- a/src/mbgl/programs/symbol_program.hpp
+++ b/src/mbgl/programs/symbol_program.hpp
@@ -66,8 +66,8 @@ struct SymbolLayoutAttributes : gl::Attributes<
{{
tx,
ty,
- static_cast<uint16_t>(sizeData.min * 10),
- static_cast<uint16_t>(sizeData.max * 10)
+ static_cast<uint16_t>(sizeData.min * 256),
+ static_cast<uint16_t>(sizeData.max * 256)
}}
};
}
diff --git a/src/mbgl/shaders/source.cpp b/src/mbgl/shaders/source.cpp
index d5a4593ad9..242b726004 100644
--- a/src/mbgl/shaders/source.cpp
+++ b/src/mbgl/shaders/source.cpp
@@ -1272,193 +1272,193 @@ const char* source() {
0xaf, 0xea, 0x39, 0x92, 0x2d, 0xac, 0x48, 0x1c,
0xf1, 0x0c, 0x60, 0x84, 0xdf, 0x0e, 0xde, 0x75,
0x24, 0xee, 0x6f, 0x87, 0xef, 0x3a, 0x9a, 0x51,
- 0xe1, 0xa1, 0x3b, 0x1c, 0xa8, 0x53, 0xf7, 0x0f,
- 0x81, 0xb3, 0x4f, 0x48, 0xdc, 0x1a, 0x0e, 0xba,
- 0xff, 0xba, 0x9e, 0x9a, 0x86, 0x7b, 0xad, 0x9e,
- 0x24, 0x4b, 0xb4, 0xe1, 0x37, 0xd7, 0xa9, 0xba,
- 0xdc, 0x79, 0x4d, 0xee, 0xfb, 0xdb, 0x68, 0xa0,
- 0xf6, 0x82, 0x1b, 0xde, 0x09, 0x0c, 0x73, 0x91,
- 0x18, 0xde, 0x09, 0x90, 0x5c, 0xd0, 0xbd, 0x8d,
- 0xd6, 0x5f, 0xcf, 0x02, 0x72, 0x8b, 0x27, 0x17,
- 0x55, 0x54, 0x16, 0x99, 0x65, 0xa2, 0xf1, 0xa1,
- 0xc7, 0x97, 0x90, 0xa5, 0x6e, 0x14, 0x54, 0x66,
- 0x9c, 0x84, 0xa5, 0xbb, 0xe9, 0xc5, 0x37, 0x46,
- 0x5e, 0xad, 0x45, 0xa9, 0xdf, 0xc4, 0xec, 0xc5,
- 0xb1, 0x86, 0xd0, 0x54, 0xab, 0x5f, 0x0f, 0xbf,
- 0x3c, 0x3b, 0xd6, 0x9d, 0x8a, 0xc6, 0x9c, 0x0d,
- 0x52, 0xba, 0x2f, 0xfc, 0x1f, 0x5b, 0x5f, 0xf8,
- 0xf6, 0xcf, 0x1d, 0x69, 0xa7, 0x50, 0x0f, 0x56,
- 0x01, 0xe6, 0xef, 0x75, 0x1a, 0x9c, 0xd3, 0xdc,
- 0xa1, 0x13, 0x2e, 0x2e, 0xeb, 0x54, 0xc4, 0x81,
- 0x97, 0x76, 0x67, 0x61, 0x10, 0xa9, 0xd7, 0x0a,
- 0x19, 0xdb, 0x0d, 0xf1, 0x8a, 0x6b, 0xda, 0xc7,
- 0x7a, 0x48, 0x62, 0x78, 0x2c, 0x6b, 0xfd, 0x44,
- 0xfd, 0xef, 0xc0, 0x58, 0xb6, 0x88, 0x56, 0x40,
- 0x12, 0x2f, 0xe1, 0xed, 0x6c, 0xda, 0x19, 0x48,
- 0x92, 0x67, 0xf2, 0xba, 0x49, 0x33, 0x65, 0xf1,
- 0x0d, 0xb7, 0xee, 0x8b, 0xd1, 0x01, 0x5d, 0x5f,
- 0x4b, 0x8e, 0x5b, 0xe2, 0x10, 0xbc, 0xd6, 0x74,
- 0x58, 0xb2, 0xc9, 0x43, 0x6f, 0x0d, 0xde, 0x7d,
- 0xce, 0x31, 0x6a, 0x13, 0xfb, 0xd6, 0x84, 0xa3,
- 0x69, 0x9b, 0x79, 0xdc, 0xeb, 0xad, 0x28, 0x5c,
- 0xa5, 0xc8, 0x1b, 0xca, 0xd4, 0x7e, 0x56, 0x1e,
- 0x58, 0xc3, 0x02, 0xcb, 0x44, 0x4d, 0xd7, 0x75,
- 0xd5, 0x84, 0xae, 0x9b, 0xf9, 0xfa, 0x22, 0xf6,
- 0x75, 0x45, 0xe3, 0xca, 0x92, 0x8d, 0xd5, 0x75,
- 0x79, 0xc6, 0x28, 0x67, 0x4e, 0x0b, 0x2f, 0xb6,
- 0xba, 0x02, 0x5f, 0x65, 0x10, 0x61, 0xdb, 0x92,
- 0x45, 0x47, 0xe0, 0x0d, 0x19, 0x16, 0x5e, 0xb8,
- 0x19, 0xc5, 0xed, 0x95, 0x20, 0x1e, 0x3d, 0xc6,
- 0xfc, 0x47, 0xa7, 0x9c, 0xe1, 0xc0, 0xe1, 0xdd,
- 0x4f, 0x8a, 0xfd, 0x56, 0x6c, 0x7e, 0x86, 0x30,
- 0xa1, 0xa3, 0x87, 0xf2, 0x5e, 0x6c, 0x05, 0x01,
- 0xef, 0x9a, 0x85, 0xfa, 0xa6, 0x96, 0xe2, 0x94,
- 0xaf, 0xa0, 0x35, 0xc4, 0x8e, 0xf2, 0xda, 0xd0,
- 0x58, 0x76, 0xca, 0xbf, 0x4e, 0x9c, 0x54, 0x51,
- 0xf6, 0x45, 0x35, 0x1f, 0x87, 0x55, 0x52, 0x87,
- 0xb5, 0xe8, 0x76, 0x6d, 0x58, 0x8b, 0xaa, 0xec,
- 0x0d, 0x8e, 0x65, 0xae, 0x20, 0x9f, 0xe8, 0xdb,
- 0xeb, 0x02, 0x1c, 0x9b, 0x20, 0xe8, 0xd3, 0x06,
- 0xa6, 0xa2, 0x38, 0x5e, 0xb4, 0x96, 0xaa, 0x23,
- 0x19, 0xb4, 0x3f, 0x4e, 0x73, 0xa4, 0x37, 0x56,
- 0xbb, 0x6c, 0x74, 0x3e, 0xd7, 0x47, 0x33, 0xfe,
- 0xdb, 0xb7, 0xa5, 0x1a, 0x4d, 0x68, 0xb6, 0xe4,
- 0x62, 0x44, 0x0f, 0xf9, 0xa1, 0xe5, 0xaa, 0x05,
- 0x6e, 0xd6, 0x4b, 0x23, 0x77, 0x42, 0x3b, 0xbb,
- 0x1a, 0x9c, 0x99, 0x64, 0x11, 0xc0, 0x6c, 0x30,
- 0x8e, 0x7c, 0x8a, 0xe9, 0x97, 0x0a, 0x02, 0x2b,
- 0xa3, 0x59, 0x40, 0x62, 0xe9, 0x5d, 0xb4, 0x68,
- 0x2c, 0x68, 0x82, 0xc7, 0xec, 0x6f, 0x2e, 0x78,
- 0x38, 0x1d, 0x9f, 0xd8, 0xdd, 0x17, 0xf2, 0xd0,
- 0xdb, 0xa6, 0x27, 0x69, 0x12, 0x39, 0xf9, 0x64,
- 0x31, 0x0a, 0x6f, 0x2e, 0x2d, 0xde, 0xe2, 0x0b,
- 0x4e, 0x5b, 0xda, 0x97, 0x57, 0x1c, 0xaa, 0xd1,
- 0x5e, 0x09, 0x9d, 0x2b, 0xf2, 0x46, 0xcb, 0xdf,
- 0xe5, 0xbd, 0x43, 0x5b, 0x3d, 0x1e, 0xfa, 0xc2,
- 0xb5, 0x61, 0x69, 0x2e, 0xe1, 0x03, 0x74, 0xa6,
- 0xe4, 0x5a, 0x5c, 0x57, 0x37, 0x37, 0x5c, 0x7e,
- 0xb9, 0xa2, 0xbb, 0x2d, 0x9d, 0xbd, 0x8b, 0xd3,
- 0xef, 0x28, 0xbd, 0x13, 0x0d, 0xc2, 0xff, 0x8b,
- 0x33, 0xd8, 0x09, 0x01, 0xdc, 0x1f, 0x5d, 0x84,
- 0x42, 0x4f, 0x5e, 0xbe, 0x47, 0xcf, 0x36, 0x29,
- 0xac, 0x65, 0x4a, 0xf6, 0x44, 0xe5, 0x14, 0x8e,
- 0x76, 0xcc, 0xdb, 0x39, 0xd5, 0xb5, 0xb2, 0x64,
- 0x9d, 0x4e, 0x8c, 0xba, 0xcb, 0x89, 0x3b, 0xfd,
- 0x30, 0x46, 0x14, 0xa2, 0x4b, 0xf8, 0x8f, 0xb2,
- 0x65, 0xe3, 0x33, 0x49, 0x3e, 0xe0, 0x8e, 0x39,
- 0x1b, 0x18, 0x7d, 0x05, 0xdc, 0x8a, 0x08, 0x88,
- 0x00, 0x8b, 0xe8, 0xd1, 0x22, 0xdd, 0x08, 0xe0,
- 0xfb, 0xc3, 0x75, 0x4a, 0x86, 0x49, 0x29, 0x47,
- 0x5a, 0x28, 0x16, 0xd5, 0xed, 0xec, 0x18, 0xcb,
- 0xde, 0x12, 0x89, 0x10, 0xb4, 0x16, 0xbd, 0xda,
- 0xfc, 0x1f, 0x10, 0x1c, 0xce, 0x40, 0x61, 0xef,
- 0x28, 0x10, 0xed, 0x0e, 0xd6, 0x13, 0x56, 0x3d,
- 0x7a, 0xc8, 0x59, 0xae, 0x27, 0xde, 0xed, 0x4c,
- 0x0f, 0xca, 0xf4, 0x50, 0x7b, 0xf9, 0x1f, 0x46,
- 0x51, 0xd3, 0x43, 0x19, 0x53, 0xde, 0xf0, 0x5a,
- 0xc6, 0x54, 0xaa, 0x7c, 0x32, 0x63, 0x17, 0x37,
- 0x78, 0x76, 0xb8, 0xd5, 0x1a, 0x5d, 0x16, 0x16,
- 0x5e, 0x94, 0x34, 0x61, 0x6d, 0xca, 0x1b, 0xb0,
- 0x36, 0x95, 0x2a, 0xb1, 0xb6, 0x8b, 0x1b, 0xb0,
- 0x76, 0xab, 0x7d, 0x01, 0x6f, 0x6b, 0x68, 0x40,
- 0x0d, 0x8f, 0x33, 0x4c, 0x79, 0x3d, 0xae, 0xa6,
- 0x4e, 0x25, 0xba, 0x76, 0x71, 0x03, 0xc6, 0x6e,
- 0xb5, 0xab, 0x91, 0xae, 0x7f, 0x52, 0xa5, 0x8b,
- 0xaf, 0x40, 0xb9, 0xf6, 0x71, 0x95, 0x55, 0x7a,
- 0x15, 0xc2, 0x05, 0x0f, 0xa2, 0x87, 0x67, 0x9e,
- 0xba, 0x27, 0xa3, 0xe2, 0xb5, 0x8d, 0x9c, 0xd5,
- 0x56, 0xc8, 0x6d, 0x6d, 0x69, 0x78, 0x3a, 0xbb,
- 0x77, 0x80, 0xfb, 0xf2, 0xeb, 0xf0, 0x3a, 0x56,
- 0x34, 0x8b, 0x1f, 0x92, 0x7c, 0xaa, 0xff, 0xac,
- 0x7c, 0xdc, 0x63, 0x8a, 0x3b, 0x05, 0x5e, 0x59,
- 0xf7, 0xcc, 0xc7, 0x05, 0x58, 0xc9, 0xf3, 0x1a,
- 0xb0, 0xb3, 0xf8, 0x1e, 0xc1, 0xd5, 0x7f, 0x56,
- 0x62, 0x67, 0x8a, 0x3b, 0x05, 0x9e, 0x58, 0x87,
- 0x9d, 0x0b, 0xb0, 0x92, 0xb7, 0x7d, 0x26, 0x8f,
- 0x82, 0x2c, 0x2e, 0xa6, 0x67, 0xaa, 0xfe, 0x75,
- 0x89, 0x29, 0xee, 0x14, 0x38, 0x5c, 0x1d, 0x5e,
- 0x2e, 0xc0, 0x4a, 0x56, 0x75, 0x15, 0x76, 0xda,
- 0x5b, 0x4d, 0xff, 0x55, 0x8f, 0x9b, 0x7a, 0xc7,
- 0x65, 0x31, 0xb2, 0x46, 0xcc, 0xb4, 0xd7, 0x5b,
- 0x15, 0x4b, 0xfa, 0x4c, 0xed, 0xb6, 0x45, 0xb3,
- 0xed, 0xce, 0x6e, 0xfb, 0x27, 0xb3, 0xdb, 0xbe,
- 0x92, 0xb1, 0x5d, 0xf0, 0xac, 0x44, 0x91, 0x57,
- 0x9a, 0x17, 0x4d, 0xc6, 0xd5, 0x25, 0xbe, 0x6d,
- 0x8a, 0xbc, 0xcb, 0x64, 0x4d, 0xaf, 0x3b, 0xa6,
- 0x89, 0x72, 0x5f, 0xe4, 0x7a, 0x19, 0x6c, 0xad,
- 0xa0, 0x63, 0xa5, 0x1c, 0x9d, 0x2c, 0x28, 0xb7,
- 0x68, 0xc6, 0x20, 0xb5, 0xe3, 0x90, 0xc6, 0x45,
- 0xc5, 0x09, 0x48, 0x83, 0x88, 0xdf, 0x18, 0x81,
- 0x64, 0xaf, 0x33, 0x21, 0x13, 0x34, 0xfb, 0x89,
- 0x08, 0x25, 0x56, 0x0e, 0xd0, 0x81, 0x09, 0x9d,
- 0x31, 0x64, 0x28, 0x1a, 0xf4, 0xc6, 0xe7, 0xd4,
- 0xa7, 0xfe, 0xa5, 0x4e, 0xc0, 0x8a, 0x07, 0x94,
- 0x7c, 0x0f, 0x63, 0x3b, 0xc6, 0xd3, 0x01, 0xda,
- 0xab, 0x19, 0x2d, 0x86, 0x89, 0xa9, 0x1e, 0x30,
- 0x45, 0x91, 0xd1, 0xc3, 0x8e, 0x0b, 0x18, 0x5e,
- 0x67, 0xbc, 0x91, 0x97, 0xce, 0x0b, 0xc3, 0xc5,
- 0x72, 0x49, 0x4a, 0xa0, 0xa9, 0xd0, 0xfb, 0x14,
- 0xcb, 0x11, 0x73, 0xd9, 0xdb, 0x6e, 0xe0, 0x94,
- 0x17, 0xfd, 0xea, 0x51, 0xff, 0x39, 0x4c, 0xee,
- 0xdb, 0x98, 0xdb, 0x6f, 0xdf, 0xd4, 0xfe, 0x19,
- 0x99, 0xd9, 0x99, 0xa5, 0x48, 0x1a, 0x25, 0x5a,
- 0x7f, 0xac, 0x00, 0x75, 0xbd, 0x28, 0x9c, 0xc7,
- 0x78, 0x56, 0x1c, 0x23, 0xf1, 0x3f, 0x26, 0xaf,
- 0x3a, 0x58, 0x91, 0xf0, 0x03, 0x60, 0xeb, 0x45,
- 0x5c, 0x1b, 0xf3, 0x99, 0x53, 0xb2, 0xe1, 0x84,
- 0x5d, 0xec, 0xe8, 0xe5, 0x8a, 0xdd, 0xc1, 0x9b,
- 0x04, 0xe4, 0xb0, 0x39, 0xea, 0xc7, 0xb8, 0x65,
- 0x88, 0x56, 0xf9, 0xe4, 0x09, 0x63, 0xc3, 0x7d,
- 0xe4, 0xf6, 0xa1, 0xed, 0x95, 0x7a, 0x1b, 0x0c,
- 0x1b, 0xb2, 0xc0, 0x5d, 0x65, 0xf5, 0xa6, 0xdc,
- 0x90, 0xb1, 0x17, 0x1b, 0xbe, 0x6c, 0x29, 0x41,
- 0x89, 0x30, 0xe7, 0xe7, 0x93, 0xcb, 0xc0, 0xa3,
- 0xb0, 0x4f, 0x80, 0x4d, 0x6d, 0x7f, 0xbd, 0xdd,
- 0x15, 0xc2, 0xee, 0x0a, 0xe1, 0x8b, 0xbb, 0x42,
- 0x30, 0x5c, 0xc5, 0x7d, 0x2d, 0xe6, 0x3c, 0x34,
- 0xb3, 0x25, 0xca, 0xcf, 0xe2, 0xb2, 0x41, 0x3d,
- 0xe2, 0xd5, 0xa6, 0xbe, 0xe9, 0x2d, 0xdc, 0x3e,
- 0xc8, 0x6b, 0x0c, 0x52, 0x67, 0xd5, 0xe3, 0x30,
- 0x7c, 0x17, 0x7b, 0x41, 0xa1, 0xb9, 0x4c, 0x3c,
- 0x32, 0x56, 0x6d, 0x95, 0x1f, 0x9b, 0x35, 0xad,
- 0x1d, 0xc1, 0xa1, 0xc0, 0x6a, 0xf1, 0xe2, 0x2b,
- 0x0e, 0x15, 0xdf, 0xe8, 0xec, 0xbb, 0xef, 0xc7,
- 0xaf, 0xff, 0x29, 0x8e, 0xac, 0xd0, 0x51, 0x2f,
- 0xbf, 0xfb, 0xe1, 0xe5, 0xf8, 0x87, 0x17, 0x7f,
- 0xff, 0xfb, 0x0b, 0x98, 0x8c, 0xe1, 0xe0, 0xb0,
- 0x5f, 0x7e, 0xfb, 0x50, 0x65, 0x7c, 0x40, 0x55,
- 0xe3, 0x64, 0x0b, 0x3b, 0xe3, 0x7d, 0x5b, 0x08,
- 0xef, 0xd5, 0xb6, 0x77, 0x7f, 0xc6, 0xb9, 0x7b,
- 0xb6, 0xab, 0xdd, 0x89, 0x51, 0xac, 0xf2, 0x7e,
- 0xad, 0xda, 0x80, 0xe4, 0xbc, 0xb3, 0xa9, 0xb3,
- 0x7c, 0xdd, 0x86, 0x51, 0xe8, 0x4a, 0x9b, 0xd0,
- 0xcd, 0xac, 0x39, 0x57, 0x1b, 0x73, 0x6e, 0x64,
- 0x86, 0xb9, 0xeb, 0xf7, 0x6b, 0x05, 0x3b, 0xca,
- 0xcd, 0x2c, 0x20, 0x57, 0x19, 0x40, 0x6e, 0x66,
- 0xbd, 0xe0, 0x33, 0x42, 0x2e, 0xb2, 0x36, 0x3a,
- 0x54, 0x1d, 0x33, 0x72, 0xc9, 0x7b, 0x17, 0x45,
- 0x23, 0x82, 0x55, 0x76, 0x59, 0x3a, 0x23, 0xcc,
- 0x8c, 0xc9, 0x3a, 0x45, 0xef, 0xb1, 0x6b, 0x4b,
- 0xc8, 0xca, 0xde, 0x6c, 0x3c, 0xd4, 0x6d, 0x8a,
- 0x29, 0xca, 0x26, 0xfc, 0x12, 0xea, 0xd4, 0x66,
- 0xc7, 0x7d, 0xd1, 0x32, 0x9d, 0xee, 0xb9, 0xbb,
- 0x42, 0x1e, 0x0c, 0xf6, 0xd3, 0xc7, 0xf5, 0x6c,
- 0x86, 0x9e, 0xd8, 0xa3, 0xc3, 0xa7, 0xf4, 0x60,
- 0x9f, 0xe3, 0x8a, 0x00, 0x62, 0xf8, 0xb7, 0x2d,
- 0x8c, 0x4b, 0xe6, 0x5d, 0xf2, 0xba, 0x87, 0xc6,
- 0x36, 0xed, 0xa9, 0x32, 0x85, 0x58, 0xcb, 0x2c,
- 0xd6, 0x1e, 0x1c, 0xf4, 0xc3, 0xe7, 0x00, 0x5b,
- 0x1e, 0x27, 0x4f, 0x2c, 0xac, 0xdb, 0xdb, 0xa0,
- 0x4d, 0x51, 0x8c, 0x24, 0xbe, 0x8c, 0xad, 0x45,
- 0x5f, 0x7d, 0x4b, 0xae, 0xd0, 0x7d, 0x38, 0x52,
- 0xa1, 0x35, 0x6a, 0xf9, 0x56, 0xad, 0xf2, 0xa2,
- 0x19, 0xaf, 0x99, 0xd5, 0x7b, 0x81, 0xd2, 0x54,
- 0x33, 0x3e, 0x53, 0x0a, 0xa5, 0x81, 0x03, 0xdc,
- 0x13, 0xa5, 0xb7, 0x7d, 0x8e, 0xe8, 0x28, 0xaf,
- 0xbf, 0xad, 0x57, 0x6e, 0x34, 0x80, 0xae, 0x03,
- 0xad, 0xc3, 0xa3, 0x7a, 0x52, 0xf8, 0x78, 0x83,
- 0xe7, 0x6c, 0x28, 0x5d, 0xb9, 0xa7, 0xf8, 0x2d,
- 0x5c, 0x93, 0xff, 0x7f, 0xc9, 0x73, 0xe5, 0xd5
+ 0x91, 0xcf, 0x31, 0xa6, 0xa5, 0x93, 0xc2, 0x8b,
+ 0xc0, 0xe9, 0x27, 0x2c, 0x6e, 0x0d, 0x09, 0x8d,
+ 0x40, 0x6d, 0x57, 0x4d, 0x03, 0xbe, 0x56, 0x57,
+ 0x92, 0x29, 0xda, 0xf0, 0x9b, 0xeb, 0x54, 0x5d,
+ 0xef, 0xbc, 0x26, 0x07, 0xfe, 0x6d, 0x74, 0x50,
+ 0x7b, 0xc9, 0x0d, 0xf7, 0x04, 0x96, 0xb9, 0x48,
+ 0x0c, 0xf7, 0x04, 0x48, 0x2e, 0xe8, 0xde, 0x46,
+ 0x6b, 0xb0, 0x67, 0x01, 0x39, 0xc6, 0x93, 0x93,
+ 0x2a, 0xaa, 0x8b, 0xcc, 0x34, 0xd1, 0xfc, 0xd0,
+ 0xe3, 0x6b, 0xc8, 0x52, 0x37, 0x0a, 0x2a, 0xb3,
+ 0x4e, 0xc2, 0xd2, 0xdd, 0xf6, 0xe2, 0x1b, 0x23,
+ 0xb1, 0xd6, 0xa2, 0xd4, 0x6f, 0x62, 0xf7, 0xe2,
+ 0x58, 0x43, 0x68, 0xaa, 0xd5, 0xaf, 0x87, 0x5f,
+ 0x9e, 0x1d, 0xeb, 0x56, 0x45, 0x63, 0xce, 0x26,
+ 0x29, 0xdd, 0x17, 0xfe, 0x8f, 0xed, 0x2f, 0x7c,
+ 0xff, 0xe7, 0x8e, 0xb4, 0x53, 0xa8, 0x07, 0xab,
+ 0x00, 0xf3, 0xf7, 0x3a, 0x0d, 0xce, 0x69, 0xee,
+ 0xd0, 0x0d, 0x17, 0x97, 0x75, 0x2a, 0xe2, 0xc0,
+ 0x4b, 0xbb, 0xb3, 0x30, 0x88, 0xd4, 0x7b, 0x85,
+ 0x8c, 0x2d, 0x87, 0x78, 0xc9, 0x35, 0xed, 0x63,
+ 0x3d, 0x24, 0x31, 0x3c, 0x98, 0xb5, 0x86, 0xa2,
+ 0xfe, 0x77, 0x60, 0x6c, 0x5b, 0x44, 0x2b, 0x20,
+ 0x8b, 0x97, 0xf0, 0x76, 0xb6, 0xed, 0x0c, 0x64,
+ 0xc9, 0x33, 0x79, 0xe1, 0xa4, 0xd9, 0xb2, 0xf8,
+ 0x86, 0x5b, 0x03, 0xb1, 0x1f, 0xd0, 0x05, 0xb6,
+ 0xe4, 0xb9, 0x25, 0x1e, 0xc1, 0x6b, 0x4d, 0xc7,
+ 0x25, 0x1b, 0x3d, 0x06, 0x6a, 0x6b, 0xf0, 0xf6,
+ 0x73, 0x0e, 0x52, 0x9b, 0xd8, 0xb7, 0x26, 0x1c,
+ 0x4d, 0xdb, 0xcc, 0xe5, 0x5e, 0x6f, 0x45, 0xe1,
+ 0x2a, 0x49, 0xde, 0x50, 0x26, 0xf7, 0xb3, 0x32,
+ 0xc1, 0x1a, 0x26, 0x58, 0x26, 0x6a, 0xba, 0xb0,
+ 0xab, 0x26, 0x74, 0xdd, 0xcc, 0xd7, 0x57, 0xb1,
+ 0xaf, 0x2b, 0x1a, 0x57, 0x96, 0x6c, 0xac, 0xae,
+ 0xcb, 0x33, 0x46, 0x59, 0x73, 0x5a, 0x78, 0xb5,
+ 0xd5, 0x15, 0xf8, 0x2e, 0x83, 0x08, 0xdb, 0x96,
+ 0x2d, 0x3a, 0x02, 0xef, 0xc8, 0xb0, 0xf0, 0xc2,
+ 0xcd, 0x29, 0x6e, 0xaf, 0x04, 0x71, 0xe9, 0x31,
+ 0x66, 0x40, 0x3a, 0xe5, 0x1c, 0x07, 0x0e, 0xf7,
+ 0x7e, 0x52, 0xec, 0xb7, 0x62, 0xf3, 0x33, 0x84,
+ 0x09, 0x1d, 0x3e, 0x94, 0xf9, 0x62, 0x2b, 0x08,
+ 0x78, 0xdb, 0x2c, 0xd4, 0x37, 0xb5, 0x14, 0xa7,
+ 0x7c, 0x09, 0xad, 0x21, 0x76, 0x94, 0xdf, 0x86,
+ 0xc6, 0xb2, 0x53, 0xfe, 0x75, 0xe2, 0x24, 0x8b,
+ 0xb2, 0xaf, 0xaa, 0xf9, 0x40, 0xac, 0x92, 0x3b,
+ 0xac, 0x45, 0xb7, 0x6b, 0xc3, 0x5a, 0x54, 0xe5,
+ 0x6f, 0x70, 0x6c, 0x73, 0x05, 0x09, 0x45, 0xdf,
+ 0x5f, 0x17, 0xe0, 0xd8, 0x04, 0x41, 0x9f, 0x36,
+ 0x30, 0x15, 0xc5, 0xf1, 0xa2, 0xbd, 0x54, 0x1d,
+ 0xca, 0xa0, 0xff, 0x71, 0xa2, 0x23, 0xbd, 0xb1,
+ 0xda, 0x65, 0xb3, 0xf3, 0xb9, 0x3e, 0x9c, 0xf1,
+ 0xdf, 0xbe, 0x2d, 0xd7, 0x68, 0x42, 0xb3, 0x65,
+ 0x17, 0x23, 0x7c, 0xc8, 0x0f, 0x2d, 0x57, 0x31,
+ 0x70, 0xf3, 0x5e, 0x1a, 0xc9, 0x13, 0xda, 0xd9,
+ 0xd5, 0xe0, 0xd4, 0x24, 0x9b, 0x00, 0xe6, 0x83,
+ 0x71, 0x24, 0x54, 0x4c, 0xc0, 0x54, 0x10, 0x59,
+ 0x19, 0xcd, 0x02, 0x12, 0x4b, 0xef, 0xa2, 0x45,
+ 0x63, 0x41, 0x23, 0x3c, 0xe6, 0x7f, 0x73, 0xc1,
+ 0xc3, 0xf1, 0xf8, 0xc4, 0xee, 0xbe, 0x90, 0x89,
+ 0xde, 0x36, 0x3e, 0x49, 0xa3, 0xc8, 0xc9, 0x27,
+ 0x8b, 0x52, 0x78, 0x73, 0x79, 0xf1, 0x16, 0xdf,
+ 0x70, 0xda, 0xf2, 0xbe, 0xbc, 0xe4, 0x50, 0x8d,
+ 0xf6, 0x4a, 0xe8, 0x5c, 0x91, 0x39, 0x5a, 0xfe,
+ 0x2e, 0x6f, 0x1e, 0xda, 0xea, 0xf9, 0xd0, 0x17,
+ 0xae, 0x0f, 0x4b, 0x83, 0x09, 0x1f, 0xa0, 0x33,
+ 0x25, 0xd9, 0xe2, 0xba, 0xba, 0xd9, 0xe1, 0xf2,
+ 0xcb, 0x15, 0xdd, 0x6e, 0xe9, 0xfc, 0x5d, 0x9c,
+ 0x80, 0x47, 0x69, 0x9e, 0x68, 0x12, 0xfe, 0x5f,
+ 0x9c, 0xc1, 0x4e, 0x08, 0xe0, 0xfe, 0xe8, 0x22,
+ 0x14, 0x7a, 0xf4, 0xf2, 0x3d, 0xfa, 0xb6, 0x49,
+ 0x61, 0x2d, 0x53, 0xd2, 0x27, 0xaa, 0xa7, 0x70,
+ 0xb4, 0x63, 0xe6, 0xce, 0xa9, 0xae, 0x95, 0x25,
+ 0xeb, 0x74, 0x62, 0x14, 0x5e, 0x4e, 0xdd, 0xe9,
+ 0x87, 0x31, 0xa2, 0x10, 0x5d, 0xc2, 0x7f, 0x94,
+ 0x35, 0x1b, 0x1f, 0x4a, 0xf2, 0x01, 0x77, 0xcc,
+ 0xf9, 0xc0, 0xe8, 0x2b, 0xe0, 0x56, 0x44, 0x40,
+ 0x04, 0x58, 0x44, 0xcf, 0x16, 0xe9, 0x4e, 0x00,
+ 0x5f, 0x20, 0xae, 0x53, 0x32, 0x4d, 0x4a, 0x39,
+ 0xd2, 0x42, 0xb1, 0xa8, 0x70, 0x67, 0xc7, 0x58,
+ 0xf6, 0x96, 0x48, 0x84, 0xa0, 0xb5, 0xe8, 0xdd,
+ 0xe6, 0xff, 0x80, 0xe0, 0x70, 0x06, 0x2a, 0x7b,
+ 0x47, 0x81, 0x68, 0x77, 0xb0, 0x9e, 0xb0, 0xea,
+ 0xd1, 0x53, 0xce, 0x72, 0x3d, 0xf1, 0x6e, 0x67,
+ 0x7c, 0x50, 0xc6, 0x87, 0xda, 0xeb, 0xff, 0x30,
+ 0x8a, 0x9a, 0x9e, 0xca, 0x98, 0xf2, 0x86, 0xf7,
+ 0x32, 0xa6, 0x52, 0xe5, 0xa3, 0x19, 0xbb, 0xb8,
+ 0xc1, 0xb7, 0xc3, 0xad, 0xd6, 0xe8, 0xb4, 0xb0,
+ 0xf0, 0xa2, 0xa4, 0x09, 0x6b, 0x53, 0xde, 0x80,
+ 0xb5, 0xa9, 0x54, 0x89, 0xb5, 0x5d, 0xdc, 0x80,
+ 0xb5, 0x5b, 0xed, 0x0b, 0x78, 0x5d, 0x43, 0x03,
+ 0x6a, 0x78, 0x9e, 0x61, 0xca, 0xeb, 0x71, 0x35,
+ 0x75, 0x2a, 0xd1, 0xb5, 0x8b, 0x1b, 0x30, 0x76,
+ 0xab, 0x5d, 0x8d, 0x74, 0xfd, 0xa3, 0x2a, 0x5d,
+ 0x7c, 0x05, 0xca, 0xb5, 0xcf, 0xab, 0xac, 0xd2,
+ 0xab, 0x10, 0x2e, 0xf8, 0x10, 0x3d, 0x3c, 0x03,
+ 0xd5, 0x3d, 0x99, 0x15, 0xaf, 0x6d, 0xe6, 0xac,
+ 0xb6, 0x43, 0x6e, 0x6b, 0x4d, 0xc3, 0xd3, 0xd9,
+ 0xbd, 0x05, 0xdc, 0x97, 0x5f, 0x87, 0xd7, 0xb1,
+ 0xa3, 0x59, 0xfc, 0x90, 0xe4, 0x53, 0xfd, 0x67,
+ 0xe5, 0xf3, 0x1e, 0x53, 0xdc, 0x29, 0xf0, 0xca,
+ 0xba, 0x87, 0x3e, 0x2e, 0xc0, 0x4a, 0x9e, 0xd7,
+ 0x80, 0x9d, 0xc5, 0xf7, 0x08, 0xae, 0xfe, 0xb3,
+ 0x12, 0x3b, 0x53, 0xdc, 0x29, 0xf0, 0xc4, 0x3a,
+ 0xec, 0x5c, 0x80, 0x95, 0xbc, 0xed, 0x33, 0x79,
+ 0x16, 0x64, 0x71, 0x31, 0x3d, 0x53, 0xf5, 0xef,
+ 0x4b, 0x4c, 0x71, 0xa7, 0xc0, 0xe1, 0xea, 0xf0,
+ 0x72, 0x01, 0x56, 0xb2, 0xaa, 0xab, 0xb0, 0xd3,
+ 0xfe, 0x6a, 0xfa, 0xaf, 0x7a, 0xdc, 0xd4, 0x4b,
+ 0x2e, 0x8b, 0x91, 0x35, 0x62, 0xa6, 0xfd, 0xde,
+ 0xaa, 0x58, 0xd2, 0x67, 0x6a, 0xb9, 0x2d, 0x1a,
+ 0x6e, 0x77, 0x96, 0xdb, 0x3f, 0x9d, 0xe5, 0xf6,
+ 0x95, 0x8c, 0xef, 0x82, 0xa7, 0x25, 0x0a, 0xbd,
+ 0xd2, 0xc0, 0x68, 0xb2, 0xae, 0x2e, 0xf1, 0x7d,
+ 0x53, 0xe4, 0x5d, 0x26, 0x6b, 0x7a, 0xe1, 0x31,
+ 0x4d, 0x94, 0x0b, 0x23, 0xd7, 0xcb, 0x60, 0x73,
+ 0x05, 0x1d, 0x2b, 0xed, 0xe8, 0x64, 0x41, 0xf9,
+ 0x45, 0x33, 0x06, 0xa9, 0x9d, 0x87, 0x34, 0x2e,
+ 0x2a, 0x56, 0x40, 0x1a, 0x44, 0xfc, 0xce, 0x08,
+ 0x64, 0x7b, 0x9d, 0x0d, 0x99, 0xa0, 0xd9, 0xcf,
+ 0x44, 0x28, 0xb9, 0x72, 0x80, 0x4e, 0x4c, 0xe8,
+ 0x90, 0x21, 0xc3, 0xd1, 0xa0, 0x47, 0x3e, 0xa7,
+ 0x3f, 0xf5, 0x2f, 0x75, 0x12, 0x56, 0x3c, 0xa2,
+ 0xe4, 0x9b, 0x18, 0xdb, 0x39, 0x9e, 0x8e, 0xd0,
+ 0x5e, 0xcd, 0x68, 0x31, 0x54, 0x4c, 0xf5, 0x80,
+ 0x29, 0x92, 0x8c, 0x1e, 0x76, 0x5c, 0xc0, 0xf0,
+ 0x3a, 0xe3, 0x8d, 0xbc, 0x74, 0x5e, 0x18, 0x2e,
+ 0x96, 0x4b, 0x52, 0x02, 0x5d, 0x85, 0xde, 0xa8,
+ 0x58, 0xce, 0x98, 0xcb, 0xde, 0x76, 0x03, 0xa7,
+ 0xdc, 0xe8, 0x57, 0x8f, 0xfa, 0xcf, 0x61, 0x74,
+ 0xdf, 0xc6, 0xe0, 0x7e, 0xfb, 0xc6, 0xf6, 0xcf,
+ 0xc8, 0xd0, 0xce, 0x2c, 0x45, 0xd2, 0x28, 0xd1,
+ 0xfa, 0x63, 0x05, 0xa8, 0xeb, 0x45, 0xe1, 0x3c,
+ 0xc6, 0xd3, 0xe2, 0x18, 0x89, 0xff, 0x31, 0x79,
+ 0xd6, 0xc1, 0x8a, 0x84, 0x1f, 0x00, 0x5b, 0x2f,
+ 0xe2, 0xda, 0x98, 0xd3, 0x9c, 0x12, 0x0e, 0x27,
+ 0xec, 0x66, 0x47, 0xaf, 0x57, 0xec, 0x0e, 0xde,
+ 0x24, 0x20, 0x89, 0xcd, 0x51, 0x43, 0xc6, 0x2d,
+ 0x43, 0xb4, 0xca, 0x67, 0x4f, 0x18, 0x1b, 0xee,
+ 0x23, 0xb7, 0x0f, 0x6d, 0xaf, 0xd4, 0xdb, 0x60,
+ 0xe8, 0x90, 0x05, 0xee, 0x2a, 0xab, 0x37, 0xe5,
+ 0x8a, 0x8c, 0xbd, 0xd8, 0xf0, 0x65, 0x4b, 0x09,
+ 0x4a, 0x84, 0x39, 0x3f, 0xa1, 0x5c, 0x06, 0x1e,
+ 0x85, 0x7e, 0x02, 0x6c, 0x6a, 0xfb, 0xeb, 0xed,
+ 0x2e, 0x11, 0x76, 0x97, 0x08, 0x5f, 0xdc, 0x25,
+ 0x82, 0xe1, 0x2a, 0xee, 0x8b, 0x31, 0xe7, 0xb1,
+ 0x99, 0x2d, 0x53, 0x7e, 0x16, 0xd7, 0x0d, 0xea,
+ 0x21, 0xaf, 0x36, 0xf6, 0x4d, 0x6f, 0xe1, 0xfe,
+ 0x41, 0x5e, 0x64, 0x90, 0x42, 0xab, 0x1e, 0x88,
+ 0xe1, 0xdb, 0xd8, 0x0b, 0x0a, 0xcf, 0x65, 0x62,
+ 0x92, 0xb1, 0x72, 0xab, 0x7c, 0xd9, 0xac, 0x69,
+ 0xed, 0x08, 0x0e, 0x07, 0x56, 0x8b, 0x17, 0x5f,
+ 0x72, 0xa8, 0x18, 0x47, 0x67, 0xdf, 0x7d, 0x3f,
+ 0x7e, 0xfd, 0x4f, 0x71, 0x64, 0x85, 0x8f, 0x7a,
+ 0xf9, 0xdd, 0x0f, 0x2f, 0xc7, 0x3f, 0xbc, 0xf8,
+ 0xfb, 0xdf, 0x5f, 0xc0, 0x64, 0x0c, 0x07, 0x87,
+ 0xfd, 0xf2, 0xfb, 0x87, 0x2a, 0xf3, 0x03, 0x2a,
+ 0x1b, 0x27, 0x5b, 0x58, 0x1a, 0xef, 0xdb, 0x46,
+ 0x78, 0xaf, 0xd6, 0xbd, 0xfb, 0x33, 0xcf, 0xdd,
+ 0xb3, 0x65, 0xed, 0x4e, 0xcc, 0x62, 0x95, 0x37,
+ 0x6c, 0xd5, 0x26, 0x24, 0xe7, 0xad, 0x4d, 0x9d,
+ 0xed, 0xeb, 0x36, 0xcc, 0x42, 0x57, 0x5a, 0x85,
+ 0x6e, 0x66, 0xcf, 0xb9, 0xda, 0x9c, 0x73, 0x23,
+ 0x43, 0xcc, 0x5d, 0xbf, 0x61, 0x2b, 0x58, 0x52,
+ 0x6e, 0x66, 0x03, 0xb9, 0xca, 0x04, 0x72, 0x33,
+ 0xfb, 0x05, 0x9f, 0x11, 0x72, 0x91, 0xb5, 0xd9,
+ 0xa1, 0xea, 0x98, 0x91, 0x4b, 0xde, 0xbb, 0x28,
+ 0x9a, 0x11, 0xac, 0xb2, 0xcb, 0xd2, 0x19, 0x61,
+ 0x66, 0x4c, 0xd6, 0x29, 0x7a, 0x90, 0x5d, 0x5b,
+ 0x42, 0x56, 0x16, 0x67, 0xe3, 0xa5, 0x6e, 0x53,
+ 0x4c, 0x51, 0x36, 0xe1, 0xd7, 0x50, 0xa7, 0x36,
+ 0x3b, 0xee, 0x8b, 0x96, 0xe9, 0x74, 0xcf, 0xdd,
+ 0x15, 0xf2, 0x60, 0xb0, 0x9f, 0x3f, 0xae, 0x67,
+ 0x33, 0xf4, 0xc6, 0x26, 0x33, 0x02, 0xc8, 0x52,
+ 0x1c, 0x5b, 0xc4, 0x31, 0x2b, 0x68, 0xd3, 0x05,
+ 0xce, 0x74, 0xc9, 0xf3, 0x1e, 0x1a, 0xdb, 0xb4,
+ 0xa7, 0xca, 0x14, 0x62, 0x2d, 0xb3, 0x58, 0x7b,
+ 0x70, 0xd0, 0x0f, 0x9f, 0x03, 0x6c, 0x79, 0x9c,
+ 0x3c, 0xb1, 0xb0, 0x6e, 0x6f, 0x83, 0x36, 0x45,
+ 0x32, 0x92, 0xf8, 0x32, 0xb6, 0x16, 0x7d, 0xf5,
+ 0x2d, 0xb9, 0x42, 0xf7, 0xe1, 0x48, 0x85, 0xd6,
+ 0xa8, 0xe5, 0x7b, 0xb5, 0xca, 0xab, 0x66, 0xbc,
+ 0x68, 0x56, 0x6f, 0x06, 0x4a, 0x53, 0xcd, 0xf8,
+ 0x4c, 0x29, 0x9c, 0x06, 0x0e, 0x70, 0x4f, 0x94,
+ 0xde, 0xf7, 0x39, 0xa2, 0xa3, 0xbc, 0x00, 0xb7,
+ 0x5e, 0xba, 0xd1, 0x00, 0xba, 0x0e, 0xb4, 0x0e,
+ 0x8f, 0xea, 0x49, 0xe1, 0xe3, 0x0d, 0x9e, 0xb4,
+ 0xa1, 0x74, 0xe5, 0x9e, 0xe2, 0xb7, 0x70, 0x51,
+ 0xfe, 0xff, 0x01, 0x25, 0x68, 0xe6, 0xc5
};
static std::string decompressed = util::decompress(std::string(reinterpret_cast<const char*>(compressed), sizeof(compressed)));
return decompressed.c_str();
diff --git a/src/mbgl/shaders/symbol_icon.cpp b/src/mbgl/shaders/symbol_icon.cpp
index 9e33b99def..db758b656b 100644
--- a/src/mbgl/shaders/symbol_icon.cpp
+++ b/src/mbgl/shaders/symbol_icon.cpp
@@ -8,7 +8,7 @@ namespace shaders {
const char* symbol_icon::name = "symbol_icon";
const char* symbol_icon::vertexSource = source() + 59607;
-const char* symbol_icon::fragmentSource = source() + 63011;
+const char* symbol_icon::fragmentSource = source() + 63013;
} // namespace shaders
} // namespace mbgl
diff --git a/src/mbgl/shaders/symbol_sdf.cpp b/src/mbgl/shaders/symbol_sdf.cpp
index 3443b4f21c..de9d3729a3 100644
--- a/src/mbgl/shaders/symbol_sdf.cpp
+++ b/src/mbgl/shaders/symbol_sdf.cpp
@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* symbol_sdf::name = "symbol_sdf";
-const char* symbol_sdf::vertexSource = source() + 63461;
-const char* symbol_sdf::fragmentSource = source() + 69382;
+const char* symbol_sdf::vertexSource = source() + 63463;
+const char* symbol_sdf::fragmentSource = source() + 69386;
} // namespace shaders
} // namespace mbgl