[core] remove unused dem memory

platform/node/test/ignores.json

@@ -143,5 +143,9 @@
   "render-tests/feature-state/composite-expression": "https://github.com/mapbox/mapbox-gl-native/issues/12613",
   "render-tests/feature-state/data-expression": "https://github.com/mapbox/mapbox-gl-native/issues/12613",
   "render-tests/feature-state/set-paint-property": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
-  "render-tests/feature-state/vector-source": "https://github.com/mapbox/mapbox-gl-native/issues/12613"
+  "render-tests/feature-state/vector-source": "https://github.com/mapbox/mapbox-gl-native/issues/12613",
+  "render-tests/symbol-sort-key/icon-expression": "https://github.com/mapbox/mapbox-gl-native/issues/14028",
+  "render-tests/symbol-sort-key/text-expression": "https://github.com/mapbox/mapbox-gl-native/issues/14028",
+  "render-tests/symbol-sort-key/text-placement": "https://github.com/mapbox/mapbox-gl-native/issues/14028",
+  "render-tests/fill-opacity/opaque-fill-over-symbol-layer": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/7612"
 }

scripts/style-spec.js

@@ -1,3 +1,6 @@
 var spec = module.exports = require('../mapbox-gl-js/src/style-spec/reference/v8');
 
 // Make temporary modifications here when Native doesn't have all features that JS has.
+delete spec.layout_symbol['symbol-sort-key'];
+delete spec.layout_symbol['symbol-z-order'].values['auto'];
+spec.layout_symbol['symbol-z-order'].default = 'viewport-y';

src/mbgl/geometry/dem_data.cpp

@@ -5,8 +5,8 @@ namespace mbgl {
 
 DEMData::DEMData(const PremultipliedImage& _image, Tileset::DEMEncoding encoding):
     dim(_image.size.height),
-    border(std::max<int32_t>(std::ceil(_image.size.height / 2), 1)),
-    stride(dim + 2 * border),
+    // extra two pixels per row for border backfilling on either edge
+    stride(dim + 2),
     image({ static_cast<uint32_t>(stride), static_cast<uint32_t>(stride) }) {
 
     if (_image.size.height != _image.size.width){
@@ -76,22 +76,16 @@ void DEMData::backfillBorder(const DEMData& borderTileData, int8_t dx, int8_t dy
     // represents. For example, dx = -1, dy = -1 represents the upper left corner of the
     // base tile, so we only need to backfill one pixel at coordinates (-1, -1) of the tile
     // image.
-    int32_t _xMin = dx * dim;
-    int32_t _xMax = dx * dim + dim;
-    int32_t _yMin = dy * dim;
-    int32_t _yMax = dy * dim + dim;
+    int32_t xMin = dx * dim;
+    int32_t xMax = dx * dim + dim;
+    int32_t yMin = dy * dim;
+    int32_t yMax = dy * dim + dim;
 
-    if (dx == -1) _xMin = _xMax - 1;
-    else if (dx == 1) _xMax = _xMin + 1;
+    if (dx == -1) xMin = xMax - 1;
+    else if (dx == 1) xMax = xMin + 1;
 
-    if (dy == -1) _yMin = _yMax - 1;
-    else if (dy == 1) _yMax = _yMin + 1;
-
-    int32_t xMin = util::clamp(_xMin, -border, dim + border);
-    int32_t xMax = util::clamp(_xMax, -border, dim + border);
-
-    int32_t yMin = util::clamp(_yMin, -border, dim + border);
-    int32_t yMax = util::clamp(_yMax, -border, dim + border);
+    if (dy == -1) yMin = yMax - 1;
+    else if (dy == 1) yMax = yMin + 1;
 
     int32_t ox = -dx * dim;
     int32_t oy = -dy * dim;

src/mbgl/geometry/dem_data.hpp

@@ -29,19 +29,18 @@ class DEMData {
     }
 
     const int32_t dim;
-    const int32_t border;
     const int32_t stride;
 
 
     private:
         PremultipliedImage image;
 
         size_t idx(const int32_t x, const int32_t y) const {
-            assert(x >= -border);
-            assert(x < dim + border);
-            assert(y >= -border);
-            assert(y < dim + border);
-            return (y + border) * stride + (x + border);
+            assert(x >= -1);
+            assert(x < dim + 1);
+            assert(y >= -1);
+            assert(y < dim + 1);
+            return (y + 1) * stride + (x + 1);
         }
 
 };

src/mbgl/renderer/layers/render_hillshade_layer.cpp

@@ -125,6 +125,7 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src
         }
 
         if (!bucket.isPrepared() && parameters.pass == RenderPass::Pass3D) {
+            const uint16_t stride = bucket.getDEMData().stride;
             const uint16_t tilesize = bucket.getDEMData().dim;
             OffscreenTexture view(parameters.context, { tilesize, tilesize });
             view.bind();
@@ -138,7 +139,7 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src
             const auto allUniformValues = programInstance.computeAllUniformValues(
                 HillshadePrepareProgram::UniformValues {
                     uniforms::u_matrix::Value( mat ),
-                    uniforms::u_dimension::Value( {{uint16_t(tilesize * 2), uint16_t(tilesize * 2)}} ),
+                    uniforms::u_dimension::Value( {{stride, stride}} ),
                     uniforms::u_zoom::Value( float(tile.id.canonical.z) ),
                     uniforms::u_maxzoom::Value( float(maxzoom) ),
                     uniforms::u_image::Value( 0 )

src/mbgl/shaders/hillshade.cpp

@@ -7,8 +7,8 @@ namespace mbgl {
 namespace shaders {
 
 const char* hillshade::name = "hillshade";
-const char* hillshade::vertexSource = source() + 29196;
-const char* hillshade::fragmentSource = source() + 29367;
+const char* hillshade::vertexSource = source() + 29307;
+const char* hillshade::fragmentSource = source() + 29478;
 
 // Uncompressed source of hillshade.vertex.glsl:
 /*

src/mbgl/shaders/hillshade_prepare.cpp

@@ -8,11 +8,12 @@ namespace shaders {
 
 const char* hillshade_prepare::name = "hillshade_prepare";
 const char* hillshade_prepare::vertexSource = source() + 27892;
-const char* hillshade_prepare::fragmentSource = source() + 28074;
+const char* hillshade_prepare::fragmentSource = source() + 28185;
 
 // Uncompressed source of hillshade_prepare.vertex.glsl:
 /*
 uniform mat4 u_matrix;
+uniform vec2 u_dimension;
 
 attribute vec2 a_pos;
 attribute vec2 a_texture_pos;
@@ -21,7 +22,10 @@ varying vec2 v_pos;
 
 void main() {
     gl_Position = u_matrix * vec4(a_pos, 0, 1);
-    v_pos = (a_texture_pos / 8192.0) / 2.0 + 0.25;
+
+    highp vec2 epsilon = 1.0 / u_dimension;
+    float scale = (u_dimension.x - 2.0) / u_dimension.x;
+    v_pos = (a_texture_pos / 8192.0) * scale + epsilon;
 }
 
 */

src/mbgl/shaders/line.cpp

@@ -7,8 +7,8 @@ namespace mbgl {
 namespace shaders {
 
 const char* line::name = "line";
-const char* line::vertexSource = source() + 30441;
-const char* line::fragmentSource = source() + 33365;
+const char* line::vertexSource = source() + 30552;
+const char* line::fragmentSource = source() + 33476;
 
 // Uncompressed source of line.vertex.glsl:
 /*

src/mbgl/shaders/line_gradient.cpp

@@ -7,8 +7,8 @@ namespace mbgl {
 namespace shaders {
 
 const char* line_gradient::name = "line_gradient";
-const char* line_gradient::vertexSource = source() + 34191;
-const char* line_gradient::fragmentSource = source() + 36910;
+const char* line_gradient::vertexSource = source() + 34302;
+const char* line_gradient::fragmentSource = source() + 37021;
 
 // Uncompressed source of line_gradient.vertex.glsl:
 /*

src/mbgl/shaders/line_pattern.cpp

@@ -7,8 +7,8 @@ namespace mbgl {
 namespace shaders {
 
 const char* line_pattern::name = "line_pattern";
-const char* line_pattern::vertexSource = source() + 37697;
-const char* line_pattern::fragmentSource = source() + 41018;
+const char* line_pattern::vertexSource = source() + 37808;
+const char* line_pattern::fragmentSource = source() + 41129;
 
 // Uncompressed source of line_pattern.vertex.glsl:
 /*

src/mbgl/shaders/line_sdf.cpp

@@ -7,8 +7,8 @@ namespace mbgl {
 namespace shaders {
 
 const char* line_sdf::name = "line_sdf";
-const char* line_sdf::vertexSource = source() + 43331;
-const char* line_sdf::fragmentSource = source() + 46945;
+const char* line_sdf::vertexSource = source() + 43442;
+const char* line_sdf::fragmentSource = source() + 47056;
 
 // Uncompressed source of line_sdf.vertex.glsl:
 /*

src/mbgl/shaders/raster.cpp

@@ -7,8 +7,8 @@ namespace mbgl {
 namespace shaders {
 
 const char* raster::name = "raster";
-const char* raster::vertexSource = source() + 48448;
-const char* raster::fragmentSource = source() + 48797;
+const char* raster::vertexSource = source() + 48559;
+const char* raster::fragmentSource = source() + 48908;
 
 // Uncompressed source of raster.vertex.glsl:
 /*