diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-01 10:00:43 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-06 16:12:51 +0100 |
commit | 63e81b9aa8ad1a96e47a296db57e33c866315bee (patch) | |
tree | 5af815b305e67ef229984a5c2214da2985e9a2df /src/mbgl/renderer/render_static_data.cpp | |
parent | 500080ea6489bf7208859ed9bcfeefff16b301ad (diff) | |
download | qtlocation-mapboxgl-63e81b9aa8ad1a96e47a296db57e33c866315bee.tar.gz |
[core] move VertexVector/IndexVector to gfx namespace
Diffstat (limited to 'src/mbgl/renderer/render_static_data.cpp')
-rw-r--r-- | src/mbgl/renderer/render_static_data.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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 })); |