diff options
Diffstat (limited to 'src/mbgl/renderer')
-rw-r--r-- | src/mbgl/renderer/buckets/circle_bucket.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/debug_bucket.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/fill_bucket.hpp | 6 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/heatmap_bucket.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/hillshade_bucket.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/line_bucket.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/raster_bucket.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 24 | ||||
-rw-r--r-- | src/mbgl/renderer/paint_property_binder.hpp | 10 | ||||
-rw-r--r-- | src/mbgl/renderer/render_static_data.cpp | 20 |
12 files changed, 45 insertions, 45 deletions
diff --git a/src/mbgl/renderer/buckets/circle_bucket.hpp b/src/mbgl/renderer/buckets/circle_bucket.hpp index 70995733e8..b823c3ec97 100644 --- a/src/mbgl/renderer/buckets/circle_bucket.hpp +++ b/src/mbgl/renderer/buckets/circle_bucket.hpp @@ -30,8 +30,8 @@ public: float getQueryRadius(const RenderLayer&) const override; bool supportsLayer(const style::Layer::Impl&) const override; - gl::VertexVector<CircleLayoutVertex> vertices; - gl::IndexVector<gfx::Triangles> triangles; + gfx::VertexVector<CircleLayoutVertex> vertices; + gfx::IndexVector<gfx::Triangles> triangles; SegmentVector<CircleAttributes> segments; optional<gl::VertexBuffer<CircleLayoutVertex>> vertexBuffer; diff --git a/src/mbgl/renderer/buckets/debug_bucket.cpp b/src/mbgl/renderer/buckets/debug_bucket.cpp index 52bb6ca4be..ca96bb62d2 100644 --- a/src/mbgl/renderer/buckets/debug_bucket.cpp +++ b/src/mbgl/renderer/buckets/debug_bucket.cpp @@ -23,8 +23,8 @@ DebugBucket::DebugBucket(const OverscaledTileID& id, expires(std::move(expires_)), debugMode(debugMode_) { - gl::VertexVector<FillLayoutVertex> vertices; - gl::IndexVector<gfx::Lines> indices; + gfx::VertexVector<FillLayoutVertex> vertices; + gfx::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/fill_bucket.hpp b/src/mbgl/renderer/buckets/fill_bucket.hpp index b74489ae19..d205ca801f 100644 --- a/src/mbgl/renderer/buckets/fill_bucket.hpp +++ b/src/mbgl/renderer/buckets/fill_bucket.hpp @@ -40,9 +40,9 @@ public: float getQueryRadius(const RenderLayer&) const override; bool supportsLayer(const style::Layer::Impl&) const override; - gl::VertexVector<FillLayoutVertex> vertices; - gl::IndexVector<gfx::Lines> lines; - gl::IndexVector<gfx::Triangles> triangles; + gfx::VertexVector<FillLayoutVertex> vertices; + gfx::IndexVector<gfx::Lines> lines; + gfx::IndexVector<gfx::Triangles> triangles; SegmentVector<FillAttributes> lineSegments; SegmentVector<FillAttributes> triangleSegments; diff --git a/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp b/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp index 9f8b78f0d8..7ff6b5e84d 100644 --- a/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp +++ b/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp @@ -39,8 +39,8 @@ public: float getQueryRadius(const RenderLayer&) const override; - gl::VertexVector<FillExtrusionLayoutVertex> vertices; - gl::IndexVector<gfx::Triangles> triangles; + gfx::VertexVector<FillExtrusionLayoutVertex> vertices; + gfx::IndexVector<gfx::Triangles> triangles; SegmentVector<FillExtrusionAttributes> triangleSegments; optional<gl::VertexBuffer<FillExtrusionLayoutVertex>> vertexBuffer; diff --git a/src/mbgl/renderer/buckets/heatmap_bucket.hpp b/src/mbgl/renderer/buckets/heatmap_bucket.hpp index e72e0e5c63..437a6f6473 100644 --- a/src/mbgl/renderer/buckets/heatmap_bucket.hpp +++ b/src/mbgl/renderer/buckets/heatmap_bucket.hpp @@ -29,8 +29,8 @@ public: float getQueryRadius(const RenderLayer&) const override; bool supportsLayer(const style::Layer::Impl&) const override; - gl::VertexVector<HeatmapLayoutVertex> vertices; - gl::IndexVector<gfx::Triangles> triangles; + gfx::VertexVector<HeatmapLayoutVertex> vertices; + gfx::IndexVector<gfx::Triangles> triangles; SegmentVector<HeatmapAttributes> segments; optional<gl::VertexBuffer<HeatmapLayoutVertex>> vertexBuffer; diff --git a/src/mbgl/renderer/buckets/hillshade_bucket.hpp b/src/mbgl/renderer/buckets/hillshade_bucket.hpp index 15d48d4dfe..54c16dcbd6 100644 --- a/src/mbgl/renderer/buckets/hillshade_bucket.hpp +++ b/src/mbgl/renderer/buckets/hillshade_bucket.hpp @@ -46,8 +46,8 @@ public: } // Raster-DEM Tile Sources use the default buffers from Painter - gl::VertexVector<HillshadeLayoutVertex> vertices; - gl::IndexVector<gfx::Triangles> indices; + gfx::VertexVector<HillshadeLayoutVertex> vertices; + gfx::IndexVector<gfx::Triangles> indices; SegmentVector<HillshadeAttributes> segments; optional<gl::VertexBuffer<HillshadeLayoutVertex>> vertexBuffer; diff --git a/src/mbgl/renderer/buckets/line_bucket.hpp b/src/mbgl/renderer/buckets/line_bucket.hpp index 5db561f90d..702f55d66a 100644 --- a/src/mbgl/renderer/buckets/line_bucket.hpp +++ b/src/mbgl/renderer/buckets/line_bucket.hpp @@ -43,8 +43,8 @@ public: PossiblyEvaluatedLayoutProperties layout; - gl::VertexVector<LineLayoutVertex> vertices; - gl::IndexVector<gfx::Triangles> triangles; + gfx::VertexVector<LineLayoutVertex> vertices; + gfx::IndexVector<gfx::Triangles> triangles; SegmentVector<LineAttributes> segments; optional<gl::VertexBuffer<LineLayoutVertex>> vertexBuffer; diff --git a/src/mbgl/renderer/buckets/raster_bucket.hpp b/src/mbgl/renderer/buckets/raster_bucket.hpp index 8cf71d5234..d610548411 100644 --- a/src/mbgl/renderer/buckets/raster_bucket.hpp +++ b/src/mbgl/renderer/buckets/raster_bucket.hpp @@ -32,8 +32,8 @@ 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<gfx::Triangles> indices; + gfx::VertexVector<RasterLayoutVertex> vertices; + gfx::IndexVector<gfx::Triangles> indices; SegmentVector<RasterAttributes> segments; optional<gl::VertexBuffer<RasterLayoutVertex>> vertexBuffer; diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp index af9ce91b35..cea46a54eb 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<gfx::Triangles>& triangles, const PlacedSymbol& placedSymbol) { +void addPlacedSymbol(gfx::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 5b9b11cf4d..2ebeb99062 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -88,10 +88,10 @@ public: std::unique_ptr<SymbolSizeBinder> textSizeBinder; struct TextBuffer { - gl::VertexVector<SymbolLayoutVertex> vertices; - gl::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>> dynamicVertices; - gl::VertexVector<gfx::Vertex<SymbolOpacityAttributes>> opacityVertices; - gl::IndexVector<gfx::Triangles> triangles; + gfx::VertexVector<SymbolLayoutVertex> vertices; + gfx::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>> dynamicVertices; + gfx::VertexVector<gfx::Vertex<SymbolOpacityAttributes>> opacityVertices; + gfx::IndexVector<gfx::Triangles> triangles; SegmentVector<SymbolTextAttributes> segments; std::vector<PlacedSymbol> placedSymbols; @@ -104,10 +104,10 @@ public: std::unique_ptr<SymbolSizeBinder> iconSizeBinder; struct IconBuffer { - gl::VertexVector<SymbolLayoutVertex> vertices; - gl::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>> dynamicVertices; - gl::VertexVector<gfx::Vertex<SymbolOpacityAttributes>> opacityVertices; - gl::IndexVector<gfx::Triangles> triangles; + gfx::VertexVector<SymbolLayoutVertex> vertices; + gfx::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>> dynamicVertices; + gfx::VertexVector<gfx::Vertex<SymbolOpacityAttributes>> opacityVertices; + gfx::IndexVector<gfx::Triangles> triangles; SegmentVector<SymbolIconAttributes> segments; std::vector<PlacedSymbol> placedSymbols; PremultipliedImage atlasImage; @@ -119,8 +119,8 @@ public: } icon; struct CollisionBuffer { - gl::VertexVector<gfx::Vertex<CollisionBoxLayoutAttributes>> vertices; - gl::VertexVector<gfx::Vertex<CollisionBoxDynamicAttributes>> dynamicVertices; + gfx::VertexVector<gfx::Vertex<CollisionBoxLayoutAttributes>> vertices; + gfx::VertexVector<gfx::Vertex<CollisionBoxDynamicAttributes>> dynamicVertices; SegmentVector<CollisionBoxProgram::Attributes> segments; optional<gl::VertexBuffer<gfx::Vertex<CollisionBoxLayoutAttributes>>> vertexBuffer; @@ -128,12 +128,12 @@ public: }; struct CollisionBoxBuffer : public CollisionBuffer { - gl::IndexVector<gfx::Lines> lines; + gfx::IndexVector<gfx::Lines> lines; optional<gl::IndexBuffer<gfx::Lines>> indexBuffer; } collisionBox; struct CollisionCircleBuffer : public CollisionBuffer { - gl::IndexVector<gfx::Triangles> triangles; + gfx::IndexVector<gfx::Triangles> triangles; optional<gl::IndexBuffer<gfx::Triangles>> indexBuffer; } collisionCircle; diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp index 56f187507f..874fab5add 100644 --- a/src/mbgl/renderer/paint_property_binder.hpp +++ b/src/mbgl/renderer/paint_property_binder.hpp @@ -221,7 +221,7 @@ public: private: style::PropertyExpression<T> expression; T defaultValue; - gl::VertexVector<BaseVertex> vertexVector; + gfx::VertexVector<BaseVertex> vertexVector; optional<gl::VertexBuffer<BaseVertex>> vertexBuffer; }; @@ -284,7 +284,7 @@ private: style::PropertyExpression<T> expression; T defaultValue; Range<float> zoomRange; - gl::VertexVector<Vertex> vertexVector; + gfx::VertexVector<Vertex> vertexVector; optional<gl::VertexBuffer<Vertex>> vertexBuffer; }; @@ -375,9 +375,9 @@ private: style::PropertyExpression<T> expression; T defaultValue; Range<float> zoomRange; - gl::VertexVector<Vertex> patternToVertexVector; - gl::VertexVector<Vertex2> zoomInVertexVector; - gl::VertexVector<Vertex2> zoomOutVertexVector; + gfx::VertexVector<Vertex> patternToVertexVector; + gfx::VertexVector<Vertex2> zoomInVertexVector; + gfx::VertexVector<Vertex2> zoomOutVertexVector; optional<gl::VertexBuffer<Vertex>> patternToVertexBuffer; optional<gl::VertexBuffer<Vertex2>> zoomInVertexBuffer; optional<gl::VertexBuffer<Vertex2>> zoomOutVertexBuffer; diff --git a/src/mbgl/renderer/render_static_data.cpp b/src/mbgl/renderer/render_static_data.cpp index 7313f95ecb..cae0e0a820 100644 --- a/src/mbgl/renderer/render_static_data.cpp +++ b/src/mbgl/renderer/render_static_data.cpp @@ -3,8 +3,8 @@ namespace mbgl { -static gl::VertexVector<gfx::Vertex<PositionOnlyLayoutAttributes>> tileVertices() { - gl::VertexVector<gfx::Vertex<PositionOnlyLayoutAttributes>> result; +static gfx::VertexVector<gfx::Vertex<PositionOnlyLayoutAttributes>> tileVertices() { + gfx::VertexVector<gfx::Vertex<PositionOnlyLayoutAttributes>> result; result.emplace_back(gfx::Vertex<PositionOnlyLayoutAttributes>({{{ 0, 0 }}})); result.emplace_back(gfx::Vertex<PositionOnlyLayoutAttributes>({{{ util::EXTENT, 0 }}})); result.emplace_back(gfx::Vertex<PositionOnlyLayoutAttributes>({{{ 0, util::EXTENT }}})); @@ -12,15 +12,15 @@ static gl::VertexVector<gfx::Vertex<PositionOnlyLayoutAttributes>> tileVertices( return result; } -static gl::IndexVector<gfx::Triangles> quadTriangleIndices() { - gl::IndexVector<gfx::Triangles> result; +static gfx::IndexVector<gfx::Triangles> quadTriangleIndices() { + gfx::IndexVector<gfx::Triangles> result; result.emplace_back(0, 1, 2); result.emplace_back(1, 2, 3); return result; } -static gl::IndexVector<gfx::LineStrip> tileLineStripIndices() { - gl::IndexVector<gfx::LineStrip> result; +static gfx::IndexVector<gfx::LineStrip> tileLineStripIndices() { + gfx::IndexVector<gfx::LineStrip> result; result.emplace_back(0); result.emplace_back(1); result.emplace_back(3); @@ -29,8 +29,8 @@ static gl::IndexVector<gfx::LineStrip> tileLineStripIndices() { return result; } -static gl::VertexVector<RasterLayoutVertex> rasterVertices() { - gl::VertexVector<RasterLayoutVertex> result; +static gfx::VertexVector<RasterLayoutVertex> rasterVertices() { + gfx::VertexVector<RasterLayoutVertex> result; result.emplace_back(RasterProgram::layoutVertex({ 0, 0 }, { 0, 0 })); result.emplace_back(RasterProgram::layoutVertex({ util::EXTENT, 0 }, { util::EXTENT, 0 })); result.emplace_back(RasterProgram::layoutVertex({ 0, util::EXTENT }, { 0, util::EXTENT })); @@ -38,8 +38,8 @@ static gl::VertexVector<RasterLayoutVertex> rasterVertices() { return result; } -static gl::VertexVector<ExtrusionTextureLayoutVertex> extrusionTextureVertices() { - gl::VertexVector<ExtrusionTextureLayoutVertex> result; +static gfx::VertexVector<ExtrusionTextureLayoutVertex> extrusionTextureVertices() { + gfx::VertexVector<ExtrusionTextureLayoutVertex> result; result.emplace_back(ExtrusionTextureProgram::layoutVertex({ 0, 0 })); result.emplace_back(ExtrusionTextureProgram::layoutVertex({ 1, 0 })); result.emplace_back(ExtrusionTextureProgram::layoutVertex({ 0, 1 })); |