diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-05 18:36:41 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-06 16:12:51 +0100 |
commit | 3a57aa65d75af0d71bda9c1bde8fe8118ce7c7d1 (patch) | |
tree | 5e5e149094a45a1b3b0457b2f698661c66741428 /src/mbgl/renderer | |
parent | 4737a45383911fcddf93f0a33e7e25246a5da07e (diff) | |
download | qtlocation-mapboxgl-3a57aa65d75af0d71bda9c1bde8fe8118ce7c7d1.tar.gz |
[core] move VertexBuffer<> to gfx namespace
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.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/fill_bucket.hpp | 4 | ||||
-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.hpp | 18 | ||||
-rw-r--r-- | src/mbgl/renderer/paint_property_binder.hpp | 10 | ||||
-rw-r--r-- | src/mbgl/renderer/render_static_data.hpp | 8 |
11 files changed, 34 insertions, 34 deletions
diff --git a/src/mbgl/renderer/buckets/circle_bucket.hpp b/src/mbgl/renderer/buckets/circle_bucket.hpp index 9495a9650c..27fdd5339c 100644 --- a/src/mbgl/renderer/buckets/circle_bucket.hpp +++ b/src/mbgl/renderer/buckets/circle_bucket.hpp @@ -3,7 +3,7 @@ #include <mbgl/renderer/bucket.hpp> #include <mbgl/map/mode.hpp> #include <mbgl/tile/geometry_tile_data.hpp> -#include <mbgl/gl/vertex_buffer.hpp> +#include <mbgl/gfx/vertex_buffer.hpp> #include <mbgl/gfx/index_buffer.hpp> #include <mbgl/programs/segment.hpp> #include <mbgl/programs/circle_program.hpp> @@ -34,7 +34,7 @@ public: gfx::IndexVector<gfx::Triangles> triangles; SegmentVector<CircleAttributes> segments; - optional<gl::VertexBuffer<CircleLayoutVertex>> vertexBuffer; + optional<gfx::VertexBuffer<CircleLayoutVertex>> vertexBuffer; optional<gfx::IndexBuffer> indexBuffer; std::map<std::string, CircleProgram::Binders> paintPropertyBinders; diff --git a/src/mbgl/renderer/buckets/debug_bucket.hpp b/src/mbgl/renderer/buckets/debug_bucket.hpp index e30d580df4..5623e9697d 100644 --- a/src/mbgl/renderer/buckets/debug_bucket.hpp +++ b/src/mbgl/renderer/buckets/debug_bucket.hpp @@ -5,7 +5,7 @@ #include <mbgl/util/geometry.hpp> #include <mbgl/util/optional.hpp> #include <mbgl/util/noncopyable.hpp> -#include <mbgl/gl/vertex_buffer.hpp> +#include <mbgl/gfx/vertex_buffer.hpp> #include <mbgl/gfx/index_buffer.hpp> #include <mbgl/programs/debug_program.hpp> @@ -34,7 +34,7 @@ public: const MapDebugOptions debugMode; SegmentVector<DebugAttributes> segments; - optional<gl::VertexBuffer<DebugLayoutVertex>> vertexBuffer; + optional<gfx::VertexBuffer<DebugLayoutVertex>> vertexBuffer; optional<gfx::IndexBuffer> indexBuffer; }; diff --git a/src/mbgl/renderer/buckets/fill_bucket.hpp b/src/mbgl/renderer/buckets/fill_bucket.hpp index dc7180ee3d..3ff3ecc1aa 100644 --- a/src/mbgl/renderer/buckets/fill_bucket.hpp +++ b/src/mbgl/renderer/buckets/fill_bucket.hpp @@ -2,7 +2,7 @@ #include <mbgl/renderer/bucket.hpp> #include <mbgl/tile/geometry_tile_data.hpp> -#include <mbgl/gl/vertex_buffer.hpp> +#include <mbgl/gfx/vertex_buffer.hpp> #include <mbgl/gfx/index_buffer.hpp> #include <mbgl/programs/segment.hpp> #include <mbgl/programs/fill_program.hpp> @@ -46,7 +46,7 @@ public: SegmentVector<FillAttributes> lineSegments; SegmentVector<FillAttributes> triangleSegments; - optional<gl::VertexBuffer<FillLayoutVertex>> vertexBuffer; + optional<gfx::VertexBuffer<FillLayoutVertex>> vertexBuffer; optional<gfx::IndexBuffer> lineIndexBuffer; optional<gfx::IndexBuffer> triangleIndexBuffer; diff --git a/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp b/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp index 840ed70b4c..0065231b9e 100644 --- a/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp +++ b/src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp @@ -2,7 +2,7 @@ #include <mbgl/renderer/bucket.hpp> #include <mbgl/tile/geometry_tile_data.hpp> -#include <mbgl/gl/vertex_buffer.hpp> +#include <mbgl/gfx/vertex_buffer.hpp> #include <mbgl/gfx/index_buffer.hpp> #include <mbgl/programs/segment.hpp> #include <mbgl/programs/fill_extrusion_program.hpp> @@ -43,7 +43,7 @@ public: gfx::IndexVector<gfx::Triangles> triangles; SegmentVector<FillExtrusionAttributes> triangleSegments; - optional<gl::VertexBuffer<FillExtrusionLayoutVertex>> vertexBuffer; + optional<gfx::VertexBuffer<FillExtrusionLayoutVertex>> vertexBuffer; optional<gfx::IndexBuffer> 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 ad0ad7b99d..7b3fdacd77 100644 --- a/src/mbgl/renderer/buckets/heatmap_bucket.hpp +++ b/src/mbgl/renderer/buckets/heatmap_bucket.hpp @@ -3,7 +3,7 @@ #include <mbgl/renderer/bucket.hpp> #include <mbgl/map/mode.hpp> #include <mbgl/tile/geometry_tile_data.hpp> -#include <mbgl/gl/vertex_buffer.hpp> +#include <mbgl/gfx/vertex_buffer.hpp> #include <mbgl/gfx/index_buffer.hpp> #include <mbgl/programs/segment.hpp> #include <mbgl/programs/heatmap_program.hpp> @@ -33,7 +33,7 @@ public: gfx::IndexVector<gfx::Triangles> triangles; SegmentVector<HeatmapAttributes> segments; - optional<gl::VertexBuffer<HeatmapLayoutVertex>> vertexBuffer; + optional<gfx::VertexBuffer<HeatmapLayoutVertex>> vertexBuffer; optional<gfx::IndexBuffer> 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 89da41d174..50b05aaeef 100644 --- a/src/mbgl/renderer/buckets/hillshade_bucket.hpp +++ b/src/mbgl/renderer/buckets/hillshade_bucket.hpp @@ -2,7 +2,7 @@ #include <mbgl/gfx/index_buffer.hpp> #include <mbgl/gl/texture.hpp> -#include <mbgl/gl/vertex_buffer.hpp> +#include <mbgl/gfx/vertex_buffer.hpp> #include <mbgl/programs/hillshade_program.hpp> #include <mbgl/programs/hillshade_prepare_program.hpp> #include <mbgl/renderer/bucket.hpp> @@ -50,7 +50,7 @@ public: gfx::IndexVector<gfx::Triangles> indices; SegmentVector<HillshadeAttributes> segments; - optional<gl::VertexBuffer<HillshadeLayoutVertex>> vertexBuffer; + optional<gfx::VertexBuffer<HillshadeLayoutVertex>> vertexBuffer; optional<gfx::IndexBuffer> indexBuffer; private: DEMData demdata; diff --git a/src/mbgl/renderer/buckets/line_bucket.hpp b/src/mbgl/renderer/buckets/line_bucket.hpp index 1faf775d55..069e27bfd9 100644 --- a/src/mbgl/renderer/buckets/line_bucket.hpp +++ b/src/mbgl/renderer/buckets/line_bucket.hpp @@ -1,7 +1,7 @@ #pragma once #include <mbgl/renderer/bucket.hpp> #include <mbgl/tile/geometry_tile_data.hpp> -#include <mbgl/gl/vertex_buffer.hpp> +#include <mbgl/gfx/vertex_buffer.hpp> #include <mbgl/gfx/index_buffer.hpp> #include <mbgl/programs/segment.hpp> #include <mbgl/programs/line_program.hpp> @@ -47,7 +47,7 @@ public: gfx::IndexVector<gfx::Triangles> triangles; SegmentVector<LineAttributes> segments; - optional<gl::VertexBuffer<LineLayoutVertex>> vertexBuffer; + optional<gfx::VertexBuffer<LineLayoutVertex>> vertexBuffer; optional<gfx::IndexBuffer> 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 510dbf1f8f..ea48a0c235 100644 --- a/src/mbgl/renderer/buckets/raster_bucket.hpp +++ b/src/mbgl/renderer/buckets/raster_bucket.hpp @@ -2,7 +2,7 @@ #include <mbgl/gfx/index_buffer.hpp> #include <mbgl/gl/texture.hpp> -#include <mbgl/gl/vertex_buffer.hpp> +#include <mbgl/gfx/vertex_buffer.hpp> #include <mbgl/programs/raster_program.hpp> #include <mbgl/renderer/bucket.hpp> #include <mbgl/renderer/tile_mask.hpp> @@ -36,7 +36,7 @@ public: gfx::IndexVector<gfx::Triangles> indices; SegmentVector<RasterAttributes> segments; - optional<gl::VertexBuffer<RasterLayoutVertex>> vertexBuffer; + optional<gfx::VertexBuffer<RasterLayoutVertex>> vertexBuffer; optional<gfx::IndexBuffer> indexBuffer; }; diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index c28a2cbc95..67662927ba 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -2,7 +2,7 @@ #include <mbgl/renderer/bucket.hpp> #include <mbgl/map/mode.hpp> -#include <mbgl/gl/vertex_buffer.hpp> +#include <mbgl/gfx/vertex_buffer.hpp> #include <mbgl/gfx/index_buffer.hpp> #include <mbgl/programs/segment.hpp> #include <mbgl/programs/symbol_program.hpp> @@ -95,9 +95,9 @@ public: 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<gfx::VertexBuffer<SymbolLayoutVertex>> vertexBuffer; + optional<gfx::VertexBuffer<gfx::Vertex<SymbolDynamicLayoutAttributes>>> dynamicVertexBuffer; + optional<gfx::VertexBuffer<gfx::Vertex<SymbolOpacityAttributes>>> opacityVertexBuffer; optional<gfx::IndexBuffer> indexBuffer; } text; @@ -112,9 +112,9 @@ public: std::vector<PlacedSymbol> placedSymbols; PremultipliedImage atlasImage; - optional<gl::VertexBuffer<SymbolLayoutVertex>> vertexBuffer; - optional<gl::VertexBuffer<gfx::Vertex<SymbolDynamicLayoutAttributes>>> dynamicVertexBuffer; - optional<gl::VertexBuffer<gfx::Vertex<SymbolOpacityAttributes>>> opacityVertexBuffer; + optional<gfx::VertexBuffer<SymbolLayoutVertex>> vertexBuffer; + optional<gfx::VertexBuffer<gfx::Vertex<SymbolDynamicLayoutAttributes>>> dynamicVertexBuffer; + optional<gfx::VertexBuffer<gfx::Vertex<SymbolOpacityAttributes>>> opacityVertexBuffer; optional<gfx::IndexBuffer> indexBuffer; } icon; @@ -123,8 +123,8 @@ public: gfx::VertexVector<gfx::Vertex<CollisionBoxDynamicAttributes>> dynamicVertices; SegmentVector<CollisionBoxProgram::Attributes> segments; - optional<gl::VertexBuffer<gfx::Vertex<CollisionBoxLayoutAttributes>>> vertexBuffer; - optional<gl::VertexBuffer<gfx::Vertex<CollisionBoxDynamicAttributes>>> dynamicVertexBuffer; + optional<gfx::VertexBuffer<gfx::Vertex<CollisionBoxLayoutAttributes>>> vertexBuffer; + optional<gfx::VertexBuffer<gfx::Vertex<CollisionBoxDynamicAttributes>>> dynamicVertexBuffer; }; struct CollisionBoxBuffer : public CollisionBuffer { diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp index cb4c3b5519..da317f93e8 100644 --- a/src/mbgl/renderer/paint_property_binder.hpp +++ b/src/mbgl/renderer/paint_property_binder.hpp @@ -223,7 +223,7 @@ private: style::PropertyExpression<T> expression; T defaultValue; gfx::VertexVector<BaseVertex> vertexVector; - optional<gl::VertexBuffer<BaseVertex>> vertexBuffer; + optional<gfx::VertexBuffer<BaseVertex>> vertexBuffer; }; template <class T, class A> @@ -288,7 +288,7 @@ private: T defaultValue; Range<float> zoomRange; gfx::VertexVector<Vertex> vertexVector; - optional<gl::VertexBuffer<Vertex>> vertexBuffer; + optional<gfx::VertexBuffer<Vertex>> vertexBuffer; }; template <class T, class A1, class A2> @@ -377,9 +377,9 @@ private: 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; + optional<gfx::VertexBuffer<Vertex>> patternToVertexBuffer; + optional<gfx::VertexBuffer<Vertex2>> zoomInVertexBuffer; + optional<gfx::VertexBuffer<Vertex2>> zoomOutVertexBuffer; CrossfadeParameters crossfade; }; diff --git a/src/mbgl/renderer/render_static_data.hpp b/src/mbgl/renderer/render_static_data.hpp index 3d4f3e7dbe..da887dff22 100644 --- a/src/mbgl/renderer/render_static_data.hpp +++ b/src/mbgl/renderer/render_static_data.hpp @@ -1,6 +1,6 @@ #pragma once -#include <mbgl/gl/vertex_buffer.hpp> +#include <mbgl/gfx/vertex_buffer.hpp> #include <mbgl/gfx/index_buffer.hpp> #include <mbgl/programs/background_program.hpp> #include <mbgl/programs/extrusion_texture_program.hpp> @@ -16,9 +16,9 @@ class RenderStaticData { public: RenderStaticData(gl::Context&, float pixelRatio, const optional<std::string>& programCacheDir); - gl::VertexBuffer<gfx::Vertex<PositionOnlyLayoutAttributes>> tileVertexBuffer; - gl::VertexBuffer<RasterLayoutVertex> rasterVertexBuffer; - gl::VertexBuffer<ExtrusionTextureLayoutVertex> extrusionTextureVertexBuffer; + gfx::VertexBuffer<gfx::Vertex<PositionOnlyLayoutAttributes>> tileVertexBuffer; + gfx::VertexBuffer<RasterLayoutVertex> rasterVertexBuffer; + gfx::VertexBuffer<ExtrusionTextureLayoutVertex> extrusionTextureVertexBuffer; gfx::IndexBuffer quadTriangleIndexBuffer; gfx::IndexBuffer tileBorderIndexBuffer; |