diff options
Diffstat (limited to 'src/mbgl/renderer')
25 files changed, 56 insertions, 55 deletions
diff --git a/src/mbgl/renderer/buckets/circle_bucket.hpp b/src/mbgl/renderer/buckets/circle_bucket.hpp index 9082e891e4..70995733e8 100644 --- a/src/mbgl/renderer/buckets/circle_bucket.hpp +++ b/src/mbgl/renderer/buckets/circle_bucket.hpp @@ -31,11 +31,11 @@ public: bool supportsLayer(const style::Layer::Impl&) const override; gl::VertexVector<CircleLayoutVertex> vertices; - gl::IndexVector<gl::Triangles> triangles; + gl::IndexVector<gfx::Triangles> triangles; SegmentVector<CircleAttributes> segments; optional<gl::VertexBuffer<CircleLayoutVertex>> vertexBuffer; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; std::map<std::string, CircleProgram::Binders> paintPropertyBinders; diff --git a/src/mbgl/renderer/buckets/debug_bucket.cpp b/src/mbgl/renderer/buckets/debug_bucket.cpp index 53c751c443..52bb6ca4be 100644 --- a/src/mbgl/renderer/buckets/debug_bucket.cpp +++ b/src/mbgl/renderer/buckets/debug_bucket.cpp @@ -24,7 +24,7 @@ DebugBucket::DebugBucket(const OverscaledTileID& id, debugMode(debugMode_) { gl::VertexVector<FillLayoutVertex> vertices; - gl::IndexVector<gl::Lines> indices; + gl::IndexVector<gfx::Lines> indices; auto addText = [&] (const std::string& text, double left, double baseline, double scale) { for (uint8_t c : text) { diff --git a/src/mbgl/renderer/buckets/debug_bucket.hpp b/src/mbgl/renderer/buckets/debug_bucket.hpp index fc3128e944..abb47ea211 100644 --- a/src/mbgl/renderer/buckets/debug_bucket.hpp +++ b/src/mbgl/renderer/buckets/debug_bucket.hpp @@ -35,7 +35,7 @@ public: SegmentVector<DebugAttributes> segments; optional<gl::VertexBuffer<DebugLayoutVertex>> vertexBuffer; - optional<gl::IndexBuffer<gl::Lines>> indexBuffer; + optional<gl::IndexBuffer<gfx::Lines>> indexBuffer; }; } // namespace mbgl diff --git a/src/mbgl/renderer/buckets/fill_bucket.hpp b/src/mbgl/renderer/buckets/fill_bucket.hpp index 225d4c661d..b74489ae19 100644 --- a/src/mbgl/renderer/buckets/fill_bucket.hpp +++ b/src/mbgl/renderer/buckets/fill_bucket.hpp @@ -41,14 +41,14 @@ public: bool supportsLayer(const style::Layer::Impl&) const override; gl::VertexVector<FillLayoutVertex> vertices; - gl::IndexVector<gl::Lines> lines; - gl::IndexVector<gl::Triangles> triangles; + gl::IndexVector<gfx::Lines> lines; + gl::IndexVector<gfx::Triangles> triangles; SegmentVector<FillAttributes> lineSegments; SegmentVector<FillAttributes> triangleSegments; optional<gl::VertexBuffer<FillLayoutVertex>> vertexBuffer; - optional<gl::IndexBuffer<gl::Lines>> lineIndexBuffer; - optional<gl::IndexBuffer<gl::Triangles>> triangleIndexBuffer; + optional<gl::IndexBuffer<gfx::Lines>> lineIndexBuffer; + optional<gl::IndexBuffer<gfx::Triangles>> triangleIndexBuffer; std::map<std::string, FillProgram::Binders> paintPropertyBinders; }; diff --git a/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp b/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp index 486eb221e5..9f8b78f0d8 100644 --- a/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp +++ b/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp @@ -40,11 +40,11 @@ public: float getQueryRadius(const RenderLayer&) const override; gl::VertexVector<FillExtrusionLayoutVertex> vertices; - gl::IndexVector<gl::Triangles> triangles; + gl::IndexVector<gfx::Triangles> triangles; SegmentVector<FillExtrusionAttributes> triangleSegments; optional<gl::VertexBuffer<FillExtrusionLayoutVertex>> vertexBuffer; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; std::unordered_map<std::string, FillExtrusionProgram::Binders> paintPropertyBinders; }; diff --git a/src/mbgl/renderer/buckets/heatmap_bucket.hpp b/src/mbgl/renderer/buckets/heatmap_bucket.hpp index 8948f52acb..e72e0e5c63 100644 --- a/src/mbgl/renderer/buckets/heatmap_bucket.hpp +++ b/src/mbgl/renderer/buckets/heatmap_bucket.hpp @@ -30,11 +30,11 @@ public: bool supportsLayer(const style::Layer::Impl&) const override; gl::VertexVector<HeatmapLayoutVertex> vertices; - gl::IndexVector<gl::Triangles> triangles; + gl::IndexVector<gfx::Triangles> triangles; SegmentVector<HeatmapAttributes> segments; optional<gl::VertexBuffer<HeatmapLayoutVertex>> vertexBuffer; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; std::map<std::string, HeatmapProgram::Binders> paintPropertyBinders; diff --git a/src/mbgl/renderer/buckets/hillshade_bucket.hpp b/src/mbgl/renderer/buckets/hillshade_bucket.hpp index c5e58198ee..15d48d4dfe 100644 --- a/src/mbgl/renderer/buckets/hillshade_bucket.hpp +++ b/src/mbgl/renderer/buckets/hillshade_bucket.hpp @@ -47,11 +47,11 @@ public: // Raster-DEM Tile Sources use the default buffers from Painter gl::VertexVector<HillshadeLayoutVertex> vertices; - gl::IndexVector<gl::Triangles> indices; + gl::IndexVector<gfx::Triangles> indices; SegmentVector<HillshadeAttributes> segments; optional<gl::VertexBuffer<HillshadeLayoutVertex>> vertexBuffer; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; private: DEMData demdata; bool prepared = false; diff --git a/src/mbgl/renderer/buckets/line_bucket.hpp b/src/mbgl/renderer/buckets/line_bucket.hpp index 5ebb575c6f..5db561f90d 100644 --- a/src/mbgl/renderer/buckets/line_bucket.hpp +++ b/src/mbgl/renderer/buckets/line_bucket.hpp @@ -44,11 +44,11 @@ public: PossiblyEvaluatedLayoutProperties layout; gl::VertexVector<LineLayoutVertex> vertices; - gl::IndexVector<gl::Triangles> triangles; + gl::IndexVector<gfx::Triangles> triangles; SegmentVector<LineAttributes> segments; optional<gl::VertexBuffer<LineLayoutVertex>> vertexBuffer; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; std::map<std::string, LineProgram::Binders> paintPropertyBinders; diff --git a/src/mbgl/renderer/buckets/raster_bucket.hpp b/src/mbgl/renderer/buckets/raster_bucket.hpp index e4f6fb04af..8cf71d5234 100644 --- a/src/mbgl/renderer/buckets/raster_bucket.hpp +++ b/src/mbgl/renderer/buckets/raster_bucket.hpp @@ -33,11 +33,11 @@ public: // Bucket specific vertices are used for Image Sources only // Raster Tile Sources use the default buffers from Painter gl::VertexVector<RasterLayoutVertex> vertices; - gl::IndexVector<gl::Triangles> indices; + gl::IndexVector<gfx::Triangles> indices; SegmentVector<RasterAttributes> segments; optional<gl::VertexBuffer<RasterLayoutVertex>> vertexBuffer; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; }; } // namespace mbgl diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp index 969597f5bd..af9ce91b35 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.cpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp @@ -152,7 +152,7 @@ void SymbolBucket::updateOpacity() { uploaded = false; } -void addPlacedSymbol(gl::IndexVector<gl::Triangles>& triangles, const PlacedSymbol& placedSymbol) { +void addPlacedSymbol(gl::IndexVector<gfx::Triangles>& triangles, const PlacedSymbol& placedSymbol) { auto endIndex = placedSymbol.vertexStartIndex + placedSymbol.glyphOffsets.size() * 4; for (auto vertexIndex = placedSymbol.vertexStartIndex; vertexIndex < endIndex; vertexIndex += 4) { triangles.emplace_back(vertexIndex + 0, vertexIndex + 1, vertexIndex + 2); diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index 4fa24aa614..5b9b11cf4d 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -91,14 +91,14 @@ public: gl::VertexVector<SymbolLayoutVertex> vertices; gl::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>> dynamicVertices; gl::VertexVector<gfx::Vertex<SymbolOpacityAttributes>> opacityVertices; - gl::IndexVector<gl::Triangles> triangles; + gl::IndexVector<gfx::Triangles> triangles; SegmentVector<SymbolTextAttributes> segments; std::vector<PlacedSymbol> placedSymbols; optional<gl::VertexBuffer<SymbolLayoutVertex>> vertexBuffer; optional<gl::VertexBuffer<gfx::Vertex<SymbolDynamicLayoutAttributes>>> dynamicVertexBuffer; optional<gl::VertexBuffer<gfx::Vertex<SymbolOpacityAttributes>>> opacityVertexBuffer; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; } text; std::unique_ptr<SymbolSizeBinder> iconSizeBinder; @@ -107,7 +107,7 @@ public: gl::VertexVector<SymbolLayoutVertex> vertices; gl::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>> dynamicVertices; gl::VertexVector<gfx::Vertex<SymbolOpacityAttributes>> opacityVertices; - gl::IndexVector<gl::Triangles> triangles; + gl::IndexVector<gfx::Triangles> triangles; SegmentVector<SymbolIconAttributes> segments; std::vector<PlacedSymbol> placedSymbols; PremultipliedImage atlasImage; @@ -115,7 +115,7 @@ public: optional<gl::VertexBuffer<SymbolLayoutVertex>> vertexBuffer; optional<gl::VertexBuffer<gfx::Vertex<SymbolDynamicLayoutAttributes>>> dynamicVertexBuffer; optional<gl::VertexBuffer<gfx::Vertex<SymbolOpacityAttributes>>> opacityVertexBuffer; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; } icon; struct CollisionBuffer { @@ -128,13 +128,13 @@ public: }; struct CollisionBoxBuffer : public CollisionBuffer { - gl::IndexVector<gl::Lines> lines; - optional<gl::IndexBuffer<gl::Lines>> indexBuffer; + gl::IndexVector<gfx::Lines> lines; + optional<gl::IndexBuffer<gfx::Lines>> indexBuffer; } collisionBox; struct CollisionCircleBuffer : public CollisionBuffer { - gl::IndexVector<gl::Triangles> triangles; - optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; + gl::IndexVector<gfx::Triangles> triangles; + optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; } collisionCircle; uint32_t bucketInstanceId = 0; diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp index 0efee4a5c1..df22514677 100644 --- a/src/mbgl/renderer/layers/render_background_layer.cpp +++ b/src/mbgl/renderer/layers/render_background_layer.cpp @@ -67,7 +67,7 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) { program.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index c868839084..888cc190a3 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -96,7 +96,7 @@ void RenderCircleLayer::render(PaintParameters& parameters, RenderSource*) { programInstance.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), parameters.mapMode != MapMode::Continuous ? parameters.stencilModeForClipping(tile.clip) diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp index 482b626abf..0552092f20 100644 --- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp @@ -92,7 +92,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* programInstance.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), parameters.depthModeFor3D(gl::DepthMode::ReadWrite), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), @@ -193,7 +193,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* programInstance.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), gl::DepthMode::disabled(), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index 9b4a5c6361..303120d815 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -119,7 +119,7 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { if ((evaluated.get<FillColor>().constantOr(Color()).a >= 1.0f && evaluated.get<FillOpacity>().constantOr(0) >= 1.0f) == (parameters.pass == RenderPass::Opaque)) { draw(parameters.programs.getFillLayerPrograms().fill, - gl::Triangles(), + gfx::Triangles(), parameters.depthModeForSublayer(1, parameters.pass == RenderPass::Opaque ? gl::DepthMode::ReadWrite : gl::DepthMode::ReadOnly), @@ -129,7 +129,7 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { if (evaluated.get<FillAntialias>() && parameters.pass == RenderPass::Translucent) { draw(parameters.programs.getFillLayerPrograms().fillOutline, - gl::Lines{ 2.0f }, + gfx::Lines{ 2.0f }, parameters.depthModeForSublayer( unevaluated.get<FillOutlineColor>().isUndefined() ? 2 : 0, gl::DepthMode::ReadOnly), @@ -205,14 +205,14 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { }; draw(parameters.programs.getFillLayerPrograms().fillPattern, - gl::Triangles(), + gfx::Triangles(), parameters.depthModeForSublayer(1, gl::DepthMode::ReadWrite), *bucket.triangleIndexBuffer, bucket.triangleSegments); if (evaluated.get<FillAntialias>() && unevaluated.get<FillOutlineColor>().isUndefined()) { draw(parameters.programs.getFillLayerPrograms().fillOutlinePattern, - gl::Lines { 2.0f }, + gfx::Lines { 2.0f }, parameters.depthModeForSublayer(2, gl::DepthMode::ReadOnly), *bucket.lineIndexBuffer, bucket.lineSegments); diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp index 5c615c5337..d380afea00 100644 --- a/src/mbgl/renderer/layers/render_heatmap_layer.cpp +++ b/src/mbgl/renderer/layers/render_heatmap_layer.cpp @@ -119,7 +119,7 @@ void RenderHeatmapLayer::render(PaintParameters& parameters, RenderSource*) { programInstance.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), stencilMode, gl::ColorMode::additive(), @@ -167,7 +167,7 @@ void RenderHeatmapLayer::render(PaintParameters& parameters, RenderSource*) { programInstance.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), gl::DepthMode::disabled(), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp index a55c18f32b..9b94e5145c 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp @@ -96,7 +96,7 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src programInstance.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), @@ -157,7 +157,7 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src programInstance.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp index ea6f948068..98fedd9bd7 100644 --- a/src/mbgl/renderer/layers/render_line_layer.cpp +++ b/src/mbgl/renderer/layers/render_line_layer.cpp @@ -1,4 +1,5 @@ #include <mbgl/renderer/layers/render_line_layer.hpp> +#include <mbgl/renderer/buckets/line_bucket.hpp> #include <mbgl/renderer/render_tile.hpp> #include <mbgl/renderer/paint_parameters.hpp> #include <mbgl/renderer/image_manager.hpp> @@ -86,7 +87,7 @@ void RenderLineLayer::render(PaintParameters& parameters, RenderSource*) { programInstance.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), parameters.stencilModeForClipping(tile.clip), parameters.colorModeForRenderPass(), diff --git a/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp index 13f62fa6ad..666a2ab913 100644 --- a/src/mbgl/renderer/layers/render_raster_layer.cpp +++ b/src/mbgl/renderer/layers/render_raster_layer.cpp @@ -110,7 +110,7 @@ void RenderRasterLayer::render(PaintParameters& parameters, RenderSource* source programInstance.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 7239278a79..eb1ae26a8d 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -116,7 +116,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { programInstance.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), values_.pitchAlignment == AlignmentType::Map ? parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly) : gl::DepthMode::disabled(), @@ -251,7 +251,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { }}; parameters.programs.getSymbolLayerPrograms().collisionBox.draw( parameters.context, - gl::Lines { 1.0f }, + gfx::Lines { 1.0f }, gl::DepthMode::disabled(), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), @@ -286,7 +286,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { parameters.programs.getSymbolLayerPrograms().collisionCircle.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), gl::DepthMode::disabled(), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), diff --git a/src/mbgl/renderer/render_static_data.cpp b/src/mbgl/renderer/render_static_data.cpp index 292a0298b0..7313f95ecb 100644 --- a/src/mbgl/renderer/render_static_data.cpp +++ b/src/mbgl/renderer/render_static_data.cpp @@ -12,15 +12,15 @@ static gl::VertexVector<gfx::Vertex<PositionOnlyLayoutAttributes>> tileVertices( return result; } -static gl::IndexVector<gl::Triangles> quadTriangleIndices() { - gl::IndexVector<gl::Triangles> result; +static gl::IndexVector<gfx::Triangles> quadTriangleIndices() { + gl::IndexVector<gfx::Triangles> result; result.emplace_back(0, 1, 2); result.emplace_back(1, 2, 3); return result; } -static gl::IndexVector<gl::LineStrip> tileLineStripIndices() { - gl::IndexVector<gl::LineStrip> result; +static gl::IndexVector<gfx::LineStrip> tileLineStripIndices() { + gl::IndexVector<gfx::LineStrip> result; result.emplace_back(0); result.emplace_back(1); result.emplace_back(3); diff --git a/src/mbgl/renderer/render_static_data.hpp b/src/mbgl/renderer/render_static_data.hpp index 2e53067af6..e578e2af0a 100644 --- a/src/mbgl/renderer/render_static_data.hpp +++ b/src/mbgl/renderer/render_static_data.hpp @@ -20,8 +20,8 @@ public: gl::VertexBuffer<RasterLayoutVertex> rasterVertexBuffer; gl::VertexBuffer<ExtrusionTextureLayoutVertex> extrusionTextureVertexBuffer; - gl::IndexBuffer<gl::Triangles> quadTriangleIndexBuffer; - gl::IndexBuffer<gl::LineStrip> tileBorderIndexBuffer; + gl::IndexBuffer<gfx::Triangles> quadTriangleIndexBuffer; + gl::IndexBuffer<gfx::LineStrip> tileBorderIndexBuffer; SegmentVector<BackgroundAttributes> tileTriangleSegments; SegmentVector<DebugAttributes> tileBorderSegments; diff --git a/src/mbgl/renderer/render_tile.cpp b/src/mbgl/renderer/render_tile.cpp index a3f95ad869..e4af47937d 100644 --- a/src/mbgl/renderer/render_tile.cpp +++ b/src/mbgl/renderer/render_tile.cpp @@ -95,7 +95,7 @@ void RenderTile::finishRender(PaintParameters& parameters) { program.draw( parameters.context, - gl::Lines { 4.0f * parameters.pixelRatio }, + gfx::Lines { 4.0f * parameters.pixelRatio }, gl::DepthMode::disabled(), parameters.stencilModeForClipping(clip), gl::ColorMode::unblended(), @@ -117,7 +117,7 @@ void RenderTile::finishRender(PaintParameters& parameters) { program.draw( parameters.context, - gl::Lines { 2.0f * parameters.pixelRatio }, + gfx::Lines { 2.0f * parameters.pixelRatio }, gl::DepthMode::disabled(), parameters.stencilModeForClipping(clip), gl::ColorMode::unblended(), @@ -141,7 +141,7 @@ void RenderTile::finishRender(PaintParameters& parameters) { if (parameters.debugOptions & MapDebugOptions::TileBorders) { parameters.programs.debug.draw( parameters.context, - gl::LineStrip { 4.0f * parameters.pixelRatio }, + gfx::LineStrip { 4.0f * parameters.pixelRatio }, gl::DepthMode::disabled(), parameters.stencilModeForClipping(clip), gl::ColorMode::unblended(), diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index 44ea982986..14cb291a31 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -442,7 +442,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { program.draw( parameters.context, - gl::Triangles(), + gfx::Triangles(), gl::DepthMode::disabled(), gl::StencilMode { gl::StencilMode::Always(), diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp index 69a5f2cc83..a020d6ff13 100644 --- a/src/mbgl/renderer/sources/render_image_source.cpp +++ b/src/mbgl/renderer/sources/render_image_source.cpp @@ -63,7 +63,7 @@ void RenderImageSource::finishRender(PaintParameters& parameters) { for (auto matrix : matrices) { programInstance.draw( parameters.context, - gl::LineStrip { 4.0f * parameters.pixelRatio }, + gfx::LineStrip { 4.0f * parameters.pixelRatio }, gl::DepthMode::disabled(), gl::StencilMode::disabled(), gl::ColorMode::unblended(), |