diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2017-07-10 21:42:13 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2017-07-11 14:59:04 +0200 |
commit | f3815fdfba99fe1eeff48c3bae0b60d783cb4e96 (patch) | |
tree | 3a2ea22316f72a1ed96ac5a5f952b72a29ba31b8 /src/mbgl/renderer/painters/painter_raster.cpp | |
parent | 47a003b7420b4a1585a647fb71590fbb13813dd5 (diff) | |
download | qtlocation-mapboxgl-f3815fdfba99fe1eeff48c3bae0b60d783cb4e96.tar.gz |
[core] move RasterBucket to Drawableupstream/kkaefer-drawable
Diffstat (limited to 'src/mbgl/renderer/painters/painter_raster.cpp')
-rw-r--r-- | src/mbgl/renderer/painters/painter_raster.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/painters/painter_raster.cpp b/src/mbgl/renderer/painters/painter_raster.cpp index aa092e94b4..5b5c4cc45c 100644 --- a/src/mbgl/renderer/painters/painter_raster.cpp +++ b/src/mbgl/renderer/painters/painter_raster.cpp @@ -43,7 +43,7 @@ void Painter::renderRaster(PaintParameters& parameters, RasterBucket& bucket, const RenderRasterLayer& layer, const mat4& matrix, - bool useBucketBuffers = false) { + const RasterDrawable& drawable) { if (pass != RenderPass::Translucent) return; if (!bucket.hasData()) @@ -77,9 +77,9 @@ void Painter::renderRaster(PaintParameters& parameters, uniforms::u_scale_parent::Value{ 1.0f }, uniforms::u_tl_parent::Value{ std::array<float, 2> {{ 0.0f, 0.0f }} }, }, - useBucketBuffers ? *bucket.vertexBuffer : rasterDrawable.vertices, - useBucketBuffers ? *bucket.indexBuffer : rasterDrawable.indices, - useBucketBuffers ? bucket.segments : rasterDrawable.segments, + drawable.vertices, + drawable.indices, + drawable.segments, paintAttributeData, properties, state.getZoom() |