diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/gfx/context.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_hillshade_layer.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/renderer/sources/render_geojson_source.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/gfx/context.hpp b/src/mbgl/gfx/context.hpp index fe0851be11..75670c4c59 100644 --- a/src/mbgl/gfx/context.hpp +++ b/src/mbgl/gfx/context.hpp @@ -43,9 +43,8 @@ public: virtual void reduceMemoryUsage() = 0; public: - virtual std::unique_ptr<OffscreenTexture> - createOffscreenTexture(Size, - TextureChannelDataType = TextureChannelDataType::UnsignedByte) = 0; + virtual std::unique_ptr<OffscreenTexture> createOffscreenTexture(Size, TextureChannelDataType) = 0; + public: // Creates an empty texture with the specified dimensions. Texture createTexture(const Size size, diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp index a937c857cc..f3ac5c2a4f 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp @@ -140,7 +140,8 @@ void RenderHillshadeLayer::render(PaintParameters& parameters) { assert(bucket.dem); const uint16_t stride = bucket.getDEMData().stride; const uint16_t tilesize = bucket.getDEMData().dim; - auto view = parameters.context.createOffscreenTexture({ tilesize, tilesize }); + auto view = parameters.context.createOffscreenTexture({tilesize, tilesize}, + gfx::TextureChannelDataType::UnsignedByte); auto renderPass = parameters.encoder->createRenderPass( "hillshade prepare", { *view, Color{ 0.0f, 0.0f, 0.0f, 0.0f }, {}, {} }); diff --git a/src/mbgl/renderer/sources/render_geojson_source.cpp b/src/mbgl/renderer/sources/render_geojson_source.cpp index 4083a96500..2cf5c9f3b9 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.cpp +++ b/src/mbgl/renderer/sources/render_geojson_source.cpp @@ -46,11 +46,11 @@ FeatureExtensionValue getLeaves(std::shared_ptr<style::GeoJSONData> clusterData, static_cast<std::uint32_t>(*limit), static_cast<std::uint32_t>(*offset)); } - return clusterData->getLeaves(clusterID, static_cast<std::uint32_t>(*limit)); + return clusterData->getLeaves(clusterID, static_cast<std::uint32_t>(*limit), 0u); } } - return clusterData->getLeaves(clusterID); + return clusterData->getLeaves(clusterID, 10u, 0u); } // NOLINTNEXTLINE(performance-unnecessary-value-param) |