From fd37d9065029c732d97e6fa59bc0a0d27ecd3c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Thu, 28 Feb 2019 17:41:38 +0100 Subject: [core] move draw mode and primitives to gfx namespace --- src/core-files.json | 5 +- src/mbgl/gfx/draw_mode.hpp | 72 ++++++++++++++++++++++ src/mbgl/gfx/primitives.hpp | 24 ++++++++ src/mbgl/gfx/types.hpp | 19 ++++++ src/mbgl/gl/context.cpp | 38 +++++++----- src/mbgl/gl/context.hpp | 14 ++--- src/mbgl/gl/draw_mode.hpp | 72 ---------------------- src/mbgl/gl/index_buffer.hpp | 2 +- src/mbgl/gl/primitives.hpp | 24 -------- src/mbgl/gl/types.hpp | 10 --- src/mbgl/gl/vertex_buffer.hpp | 4 +- src/mbgl/programs/background_program.hpp | 4 +- src/mbgl/programs/circle_program.hpp | 2 +- src/mbgl/programs/clipping_mask_program.hpp | 2 +- src/mbgl/programs/collision_box_program.hpp | 4 +- src/mbgl/programs/debug_program.hpp | 2 +- src/mbgl/programs/extrusion_texture_program.hpp | 2 +- src/mbgl/programs/fill_extrusion_program.hpp | 4 +- src/mbgl/programs/fill_program.hpp | 8 +-- src/mbgl/programs/heatmap_program.hpp | 2 +- src/mbgl/programs/heatmap_texture_program.hpp | 2 +- src/mbgl/programs/hillshade_prepare_program.hpp | 2 +- src/mbgl/programs/hillshade_program.hpp | 2 +- src/mbgl/programs/line_program.hpp | 8 +-- src/mbgl/programs/raster_program.hpp | 2 +- src/mbgl/programs/symbol_program.hpp | 6 +- src/mbgl/renderer/buckets/circle_bucket.hpp | 4 +- src/mbgl/renderer/buckets/debug_bucket.cpp | 2 +- src/mbgl/renderer/buckets/debug_bucket.hpp | 2 +- src/mbgl/renderer/buckets/fill_bucket.hpp | 8 +-- .../renderer/buckets/fill_extrusion_bucket.hpp | 4 +- src/mbgl/renderer/buckets/heatmap_bucket.hpp | 4 +- src/mbgl/renderer/buckets/hillshade_bucket.hpp | 4 +- src/mbgl/renderer/buckets/line_bucket.hpp | 4 +- src/mbgl/renderer/buckets/raster_bucket.hpp | 4 +- src/mbgl/renderer/buckets/symbol_bucket.cpp | 2 +- src/mbgl/renderer/buckets/symbol_bucket.hpp | 16 ++--- .../renderer/layers/render_background_layer.cpp | 2 +- src/mbgl/renderer/layers/render_circle_layer.cpp | 2 +- .../layers/render_fill_extrusion_layer.cpp | 4 +- src/mbgl/renderer/layers/render_fill_layer.cpp | 8 +-- src/mbgl/renderer/layers/render_heatmap_layer.cpp | 4 +- .../renderer/layers/render_hillshade_layer.cpp | 4 +- src/mbgl/renderer/layers/render_line_layer.cpp | 3 +- src/mbgl/renderer/layers/render_raster_layer.cpp | 2 +- src/mbgl/renderer/layers/render_symbol_layer.cpp | 6 +- src/mbgl/renderer/render_static_data.cpp | 8 +-- src/mbgl/renderer/render_static_data.hpp | 4 +- src/mbgl/renderer/render_tile.cpp | 6 +- src/mbgl/renderer/renderer_impl.cpp | 2 +- src/mbgl/renderer/sources/render_image_source.cpp | 2 +- 51 files changed, 231 insertions(+), 216 deletions(-) create mode 100644 src/mbgl/gfx/draw_mode.hpp create mode 100644 src/mbgl/gfx/primitives.hpp create mode 100644 src/mbgl/gfx/types.hpp delete mode 100644 src/mbgl/gl/draw_mode.hpp delete mode 100644 src/mbgl/gl/primitives.hpp diff --git a/src/core-files.json b/src/core-files.json index 8efb9062de..11209e3504 100644 --- a/src/core-files.json +++ b/src/core-files.json @@ -499,6 +499,9 @@ "mbgl/geometry/feature_index.hpp": "src/mbgl/geometry/feature_index.hpp", "mbgl/geometry/line_atlas.hpp": "src/mbgl/geometry/line_atlas.hpp", "mbgl/gfx/attribute.hpp": "src/mbgl/gfx/attribute.hpp", + "mbgl/gfx/draw_mode.hpp": "src/mbgl/gfx/draw_mode.hpp", + "mbgl/gfx/primitives.hpp": "src/mbgl/gfx/primitives.hpp", + "mbgl/gfx/types.hpp": "src/mbgl/gfx/types.hpp", "mbgl/gfx/uniform.hpp": "src/mbgl/gfx/uniform.hpp", "mbgl/gl/attribute.hpp": "src/mbgl/gl/attribute.hpp", "mbgl/gl/color_mode.hpp": "src/mbgl/gl/color_mode.hpp", @@ -508,13 +511,11 @@ "mbgl/gl/debugging_extension.hpp": "src/mbgl/gl/debugging_extension.hpp", "mbgl/gl/defines.hpp": "src/mbgl/gl/defines.hpp", "mbgl/gl/depth_mode.hpp": "src/mbgl/gl/depth_mode.hpp", - "mbgl/gl/draw_mode.hpp": "src/mbgl/gl/draw_mode.hpp", "mbgl/gl/extension.hpp": "src/mbgl/gl/extension.hpp", "mbgl/gl/features.hpp": "src/mbgl/gl/features.hpp", "mbgl/gl/framebuffer.hpp": "src/mbgl/gl/framebuffer.hpp", "mbgl/gl/index_buffer.hpp": "src/mbgl/gl/index_buffer.hpp", "mbgl/gl/object.hpp": "src/mbgl/gl/object.hpp", - "mbgl/gl/primitives.hpp": "src/mbgl/gl/primitives.hpp", "mbgl/gl/program.hpp": "src/mbgl/gl/program.hpp", "mbgl/gl/program_binary_extension.hpp": "src/mbgl/gl/program_binary_extension.hpp", "mbgl/gl/renderbuffer.hpp": "src/mbgl/gl/renderbuffer.hpp", diff --git a/src/mbgl/gfx/draw_mode.hpp b/src/mbgl/gfx/draw_mode.hpp new file mode 100644 index 0000000000..a0a9b6c575 --- /dev/null +++ b/src/mbgl/gfx/draw_mode.hpp @@ -0,0 +1,72 @@ +#pragma once + +#include +#include + +#include + +namespace mbgl { +namespace gfx { + +class Points { +public: + using Primitive = Point; + + static constexpr std::size_t bufferGroupSize = 1; + static constexpr PrimitiveType primitiveType = PrimitiveType::Points; + + explicit Points(float pointSize_) : pointSize(pointSize_) {} + + float pointSize; +}; + +class Lines { +public: + using Primitive = Line; + + static constexpr std::size_t bufferGroupSize = 2; + static constexpr PrimitiveType primitiveType = PrimitiveType::Lines; + + explicit Lines(float lineWidth_) : lineWidth(lineWidth_) { + assert(lineWidth > 0); + } + + float lineWidth; +}; + +class LineStrip { +public: + // LineStrip is a form of "Line" rendering, but the element buffer + // cannot be grouped into logical elements beyond a single Point. + using Primitive = Line; + + static constexpr std::size_t bufferGroupSize = 1; + static constexpr PrimitiveType primitiveType = PrimitiveType::LineStrip; + + explicit LineStrip(float lineWidth_) : lineWidth(lineWidth_) { + assert(lineWidth > 0); + } + + float lineWidth; +}; + +class Triangles { +public: + using Primitive = Triangle; + + static constexpr std::size_t bufferGroupSize = 3; + static constexpr PrimitiveType primitiveType = PrimitiveType::Triangles; +}; + +class TriangleStrip { +public: + // TriangleStrip is a form of "Triangle" rendering, but the element buffer + // cannot be grouped into logical elements beyond a single Point. + using Primitive = Triangle; + + static constexpr std::size_t bufferGroupSize = 1; + static constexpr PrimitiveType primitiveType = PrimitiveType::TriangleStrip; +}; + +} // namespace gfx +} // namespace mbgl diff --git a/src/mbgl/gfx/primitives.hpp b/src/mbgl/gfx/primitives.hpp new file mode 100644 index 0000000000..f92b1ec525 --- /dev/null +++ b/src/mbgl/gfx/primitives.hpp @@ -0,0 +1,24 @@ +#pragma once + +#include + +namespace mbgl { +namespace gfx { + +class Point { +public: + static constexpr std::size_t vertexCount = 1; +}; + +class Line { +public: + static constexpr std::size_t vertexCount = 2; +}; + +class Triangle { +public: + static constexpr std::size_t vertexCount = 3; +}; + +} // namespace gfx +} // namespace mbgl diff --git a/src/mbgl/gfx/types.hpp b/src/mbgl/gfx/types.hpp new file mode 100644 index 0000000000..ea7b2da5dc --- /dev/null +++ b/src/mbgl/gfx/types.hpp @@ -0,0 +1,19 @@ +#pragma once + +#include + +namespace mbgl { +namespace gfx { + +enum class PrimitiveType : uint8_t { + Points, + Lines, + LineLoop, + LineStrip, + Triangles, + TriangleStrip, + TriangleFan +}; + +} // namespace gfx +} // namespace mbgl diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp index 2463993cf0..64365a1018 100644 --- a/src/mbgl/gl/context.cpp +++ b/src/mbgl/gl/context.cpp @@ -40,15 +40,6 @@ static_assert(underlying_type(RenderbufferType::DepthComponent) == GL_DEPTH_COMP static_assert(underlying_type(RenderbufferType::DepthComponent) == GL_DEPTH_COMPONENT16, "OpenGL type mismatch"); #endif // MBGL_USE_GLES2 - -static_assert(underlying_type(PrimitiveType::Points) == GL_POINTS, "OpenGL type mismatch"); -static_assert(underlying_type(PrimitiveType::Lines) == GL_LINES, "OpenGL type mismatch"); -static_assert(underlying_type(PrimitiveType::LineLoop) == GL_LINE_LOOP, "OpenGL type mismatch"); -static_assert(underlying_type(PrimitiveType::LineStrip) == GL_LINE_STRIP, "OpenGL type mismatch"); -static_assert(underlying_type(PrimitiveType::Triangles) == GL_TRIANGLES, "OpenGL type mismatch"); -static_assert(underlying_type(PrimitiveType::TriangleStrip) == GL_TRIANGLE_STRIP, "OpenGL type mismatch"); -static_assert(underlying_type(PrimitiveType::TriangleFan) == GL_TRIANGLE_FAN, "OpenGL type mismatch"); - static_assert(std::is_same::value, "OpenGL type mismatch"); static_assert(std::is_same::value, "OpenGL type mismatch"); static_assert(std::is_same::value, "OpenGL type mismatch"); @@ -684,26 +675,26 @@ void Context::setCullFaceMode(const CullFaceMode& mode) { } #if not MBGL_USE_GLES2 -void Context::setDrawMode(const Points& points) { +void Context::setDrawMode(const gfx::Points& points) { pointSize = points.pointSize; } #else -void Context::setDrawMode(const Points&) { +void Context::setDrawMode(const gfx::Points&) { } #endif // MBGL_USE_GLES2 -void Context::setDrawMode(const Lines& lines) { +void Context::setDrawMode(const gfx::Lines& lines) { lineWidth = lines.lineWidth; } -void Context::setDrawMode(const LineStrip& lineStrip) { +void Context::setDrawMode(const gfx::LineStrip& lineStrip) { lineWidth = lineStrip.lineWidth; } -void Context::setDrawMode(const Triangles&) { +void Context::setDrawMode(const gfx::Triangles&) { } -void Context::setDrawMode(const TriangleStrip&) { +void Context::setDrawMode(const gfx::TriangleStrip&) { } void Context::setDepthMode(const DepthMode& depth) { @@ -752,11 +743,24 @@ void Context::setColorMode(const ColorMode& color) { colorMask = color.mask; } -void Context::draw(PrimitiveType primitiveType, +GLenum toGLenum(const gfx::PrimitiveType primitiveType) { + switch (primitiveType) { + case gfx::PrimitiveType::Points: return GL_POINTS; + case gfx::PrimitiveType::Lines: return GL_LINES; + case gfx::PrimitiveType::LineLoop: return GL_LINE_LOOP; + case gfx::PrimitiveType::LineStrip: return GL_LINE_STRIP; + case gfx::PrimitiveType::Triangles: return GL_TRIANGLES; + case gfx::PrimitiveType::TriangleStrip: return GL_TRIANGLE_STRIP; + case gfx::PrimitiveType::TriangleFan: return GL_TRIANGLE_FAN; + } + return GL_INVALID_ENUM; +} + +void Context::draw(gfx::PrimitiveType primitiveType, std::size_t indexOffset, std::size_t indexLength) { MBGL_CHECK_ERROR(glDrawElements( - static_cast(primitiveType), + toGLenum(primitiveType), static_cast(indexLength), GL_UNSIGNED_SHORT, reinterpret_cast(sizeof(uint16_t) * indexOffset))); diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp index a10b49da48..b09c64de5a 100644 --- a/src/mbgl/gl/context.hpp +++ b/src/mbgl/gl/context.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -164,18 +164,18 @@ public: optional depth, optional stencil); - void setDrawMode(const Points&); - void setDrawMode(const Lines&); - void setDrawMode(const LineStrip&); - void setDrawMode(const Triangles&); - void setDrawMode(const TriangleStrip&); + void setDrawMode(const gfx::Points&); + void setDrawMode(const gfx::Lines&); + void setDrawMode(const gfx::LineStrip&); + void setDrawMode(const gfx::Triangles&); + void setDrawMode(const gfx::TriangleStrip&); void setDepthMode(const DepthMode&); void setStencilMode(const StencilMode&); void setColorMode(const ColorMode&); void setCullFaceMode(const CullFaceMode&); - void draw(PrimitiveType, + void draw(gfx::PrimitiveType, std::size_t indexOffset, std::size_t indexLength); diff --git a/src/mbgl/gl/draw_mode.hpp b/src/mbgl/gl/draw_mode.hpp deleted file mode 100644 index 6f0c5ea4a4..0000000000 --- a/src/mbgl/gl/draw_mode.hpp +++ /dev/null @@ -1,72 +0,0 @@ -#pragma once - -#include -#include - -#include - -namespace mbgl { -namespace gl { - -class Points { -public: - using Primitive = Point; - - static constexpr std::size_t bufferGroupSize = 1; - static constexpr PrimitiveType primitiveType = PrimitiveType::Points; - - explicit Points(float pointSize_) : pointSize(pointSize_) {} - - float pointSize; -}; - -class Lines { -public: - using Primitive = Line; - - static constexpr std::size_t bufferGroupSize = 2; - static constexpr PrimitiveType primitiveType = PrimitiveType::Lines; - - explicit Lines(float lineWidth_) : lineWidth(lineWidth_) { - assert(lineWidth > 0); - } - - float lineWidth; -}; - -class LineStrip { -public: - // LineStrip is a form of "Line" rendering, but the element buffer - // cannot be grouped into logical elements beyond a single Point. - using Primitive = Line; - - static constexpr std::size_t bufferGroupSize = 1; - static constexpr PrimitiveType primitiveType = PrimitiveType::LineStrip; - - explicit LineStrip(float lineWidth_) : lineWidth(lineWidth_) { - assert(lineWidth > 0); - } - - float lineWidth; -}; - -class Triangles { -public: - using Primitive = Triangle; - - static constexpr std::size_t bufferGroupSize = 3; - static constexpr PrimitiveType primitiveType = PrimitiveType::Triangles; -}; - -class TriangleStrip { -public: - // TriangleStrip is a form of "Triangle" rendering, but the element buffer - // cannot be grouped into logical elements beyond a single Point. - using Primitive = Triangle; - - static constexpr std::size_t bufferGroupSize = 1; - static constexpr PrimitiveType primitiveType = PrimitiveType::TriangleStrip; -}; - -} // namespace gl -} // namespace mbgl diff --git a/src/mbgl/gl/index_buffer.hpp b/src/mbgl/gl/index_buffer.hpp index 87bfb6068f..14bdcf09e7 100644 --- a/src/mbgl/gl/index_buffer.hpp +++ b/src/mbgl/gl/index_buffer.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/mbgl/gl/primitives.hpp b/src/mbgl/gl/primitives.hpp deleted file mode 100644 index a101694643..0000000000 --- a/src/mbgl/gl/primitives.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include - -namespace mbgl { -namespace gl { - -class Point { -public: - static constexpr std::size_t vertexCount = 1; -}; - -class Line { -public: - static constexpr std::size_t vertexCount = 2; -}; - -class Triangle { -public: - static constexpr std::size_t vertexCount = 3; -}; - -} // namespace gl -} // namespace mbgl diff --git a/src/mbgl/gl/types.hpp b/src/mbgl/gl/types.hpp index 376a784a0c..4c3033454f 100644 --- a/src/mbgl/gl/types.hpp +++ b/src/mbgl/gl/types.hpp @@ -73,16 +73,6 @@ enum class TextureType : uint32_t { #endif // MBGL_USE_GLES2 }; -enum class PrimitiveType { - Points = 0x0000, - Lines = 0x0001, - LineLoop = 0x0002, - LineStrip = 0x0003, - Triangles = 0x0004, - TriangleStrip = 0x0005, - TriangleFan = 0x0006 -}; - struct PixelStorageType { int32_t alignment; }; diff --git a/src/mbgl/gl/vertex_buffer.hpp b/src/mbgl/gl/vertex_buffer.hpp index 29eba2e979..0e2db2608f 100644 --- a/src/mbgl/gl/vertex_buffer.hpp +++ b/src/mbgl/gl/vertex_buffer.hpp @@ -1,8 +1,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/mbgl/programs/background_program.hpp b/src/mbgl/programs/background_program.hpp index 1cdc99e0ca..0cf1b5e895 100644 --- a/src/mbgl/programs/background_program.hpp +++ b/src/mbgl/programs/background_program.hpp @@ -46,7 +46,7 @@ using BackgroundPatternUniforms = TypeList< class BackgroundProgram : public Program< shaders::background, - gl::Triangle, + gfx::Triangle, BackgroundLayoutAttributes, BackgroundUniforms, style::Properties<>> @@ -57,7 +57,7 @@ public: class BackgroundPatternProgram : public Program< shaders::background_pattern, - gl::Triangle, + gfx::Triangle, BackgroundLayoutAttributes, BackgroundPatternUniforms, style::Properties<>> diff --git a/src/mbgl/programs/circle_program.hpp b/src/mbgl/programs/circle_program.hpp index 3e59402a87..c3a6e4c205 100644 --- a/src/mbgl/programs/circle_program.hpp +++ b/src/mbgl/programs/circle_program.hpp @@ -15,7 +15,7 @@ MBGL_DEFINE_UNIFORM_SCALAR(bool, u_scale_with_map); class CircleProgram : public Program< shaders::circle, - gl::Triangle, + gfx::Triangle, TypeList< attributes::a_pos>, TypeList< diff --git a/src/mbgl/programs/clipping_mask_program.hpp b/src/mbgl/programs/clipping_mask_program.hpp index 87111b0da9..4ce86cbf06 100644 --- a/src/mbgl/programs/clipping_mask_program.hpp +++ b/src/mbgl/programs/clipping_mask_program.hpp @@ -10,7 +10,7 @@ namespace mbgl { class ClippingMaskProgram : public Program< shaders::clipping_mask, - gl::Triangle, + gfx::Triangle, PositionOnlyLayoutAttributes, TypeList< uniforms::u_matrix>, diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp index 46fe882f44..1adfadf794 100644 --- a/src/mbgl/programs/collision_box_program.hpp +++ b/src/mbgl/programs/collision_box_program.hpp @@ -21,7 +21,7 @@ using CollisionBoxDynamicAttributes = TypeList; class CollisionBoxProgram : public Program< shaders::collision_box, - gl::Line, + gfx::Line, TypeListConcat, TypeList< uniforms::u_matrix, @@ -107,7 +107,7 @@ public: class CollisionCircleProgram : public Program< shaders::collision_circle, - gl::Triangle, + gfx::Triangle, TypeListConcat, TypeList< uniforms::u_matrix, diff --git a/src/mbgl/programs/debug_program.hpp b/src/mbgl/programs/debug_program.hpp index 17e7d638f9..2827f52d53 100644 --- a/src/mbgl/programs/debug_program.hpp +++ b/src/mbgl/programs/debug_program.hpp @@ -10,7 +10,7 @@ namespace mbgl { class DebugProgram : public Program< shaders::debug, - gl::Line, + gfx::Line, TypeList< attributes::a_pos>, TypeList< diff --git a/src/mbgl/programs/extrusion_texture_program.hpp b/src/mbgl/programs/extrusion_texture_program.hpp index d1ae773f90..606909f54e 100644 --- a/src/mbgl/programs/extrusion_texture_program.hpp +++ b/src/mbgl/programs/extrusion_texture_program.hpp @@ -11,7 +11,7 @@ namespace mbgl { class ExtrusionTextureProgram : public Program< shaders::extrusion_texture, - gl::Triangle, + gfx::Triangle, TypeList, TypeList< uniforms::u_matrix, diff --git a/src/mbgl/programs/fill_extrusion_program.hpp b/src/mbgl/programs/fill_extrusion_program.hpp index 4b8c148f11..548fb15d55 100644 --- a/src/mbgl/programs/fill_extrusion_program.hpp +++ b/src/mbgl/programs/fill_extrusion_program.hpp @@ -54,7 +54,7 @@ using FillExtrusionPatternUniforms = TypeList< class FillExtrusionProgram : public Program< shaders::fill_extrusion, - gl::Triangle, + gfx::Triangle, FillExtrusionLayoutAttributes, FillExtrusionUniforms, style::FillExtrusionPaintProperties> @@ -90,7 +90,7 @@ public: class FillExtrusionPatternProgram : public Program< shaders::fill_extrusion_pattern, - gl::Triangle, + gfx::Triangle, FillExtrusionLayoutAttributes, FillExtrusionPatternUniforms, style::FillExtrusionPaintProperties> diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp index b0037ca7f9..863671bbb9 100644 --- a/src/mbgl/programs/fill_program.hpp +++ b/src/mbgl/programs/fill_program.hpp @@ -39,7 +39,7 @@ using FillPatternUniforms = TypeList< class FillProgram : public Program< shaders::fill, - gl::Triangle, + gfx::Triangle, FillLayoutAttributes, FillUniforms, style::FillPaintProperties> @@ -59,7 +59,7 @@ public: class FillPatternProgram : public Program< shaders::fill_pattern, - gl::Triangle, + gfx::Triangle, FillLayoutAttributes, FillPatternUniforms, style::FillPaintProperties> @@ -78,7 +78,7 @@ public: class FillOutlineProgram : public Program< shaders::fill_outline, - gl::Line, + gfx::Line, FillLayoutAttributes, FillUniforms, style::FillPaintProperties> @@ -89,7 +89,7 @@ public: class FillOutlinePatternProgram : public Program< shaders::fill_outline_pattern, - gl::Line, + gfx::Line, FillLayoutAttributes, FillPatternUniforms, style::FillPaintProperties> diff --git a/src/mbgl/programs/heatmap_program.hpp b/src/mbgl/programs/heatmap_program.hpp index d2fe0320ab..23021c7d5d 100644 --- a/src/mbgl/programs/heatmap_program.hpp +++ b/src/mbgl/programs/heatmap_program.hpp @@ -16,7 +16,7 @@ MBGL_DEFINE_UNIFORM_SCALAR(float, u_intensity); class HeatmapProgram : public Program< shaders::heatmap, - gl::Triangle, + gfx::Triangle, TypeList< attributes::a_pos>, TypeList< diff --git a/src/mbgl/programs/heatmap_texture_program.hpp b/src/mbgl/programs/heatmap_texture_program.hpp index dea33edc03..6d07b2cfb9 100644 --- a/src/mbgl/programs/heatmap_texture_program.hpp +++ b/src/mbgl/programs/heatmap_texture_program.hpp @@ -15,7 +15,7 @@ MBGL_DEFINE_UNIFORM_SCALAR(uint32_t, u_color_ramp); class HeatmapTextureProgram : public Program< shaders::heatmap_texture, - gl::Triangle, + gfx::Triangle, TypeList, TypeList< uniforms::u_matrix, diff --git a/src/mbgl/programs/hillshade_prepare_program.hpp b/src/mbgl/programs/hillshade_prepare_program.hpp index 10decd0343..5265c83f4c 100644 --- a/src/mbgl/programs/hillshade_prepare_program.hpp +++ b/src/mbgl/programs/hillshade_prepare_program.hpp @@ -15,7 +15,7 @@ MBGL_DEFINE_UNIFORM_SCALAR(float, u_maxzoom); class HillshadePrepareProgram : public Program< shaders::hillshade_prepare, - gl::Triangle, + gfx::Triangle, TypeList< attributes::a_pos, attributes::a_texture_pos>, diff --git a/src/mbgl/programs/hillshade_program.hpp b/src/mbgl/programs/hillshade_program.hpp index 9c71afdb9c..8592f248e5 100644 --- a/src/mbgl/programs/hillshade_program.hpp +++ b/src/mbgl/programs/hillshade_program.hpp @@ -20,7 +20,7 @@ MBGL_DEFINE_UNIFORM_VECTOR(float, 2, u_latrange); class HillshadeProgram : public Program< shaders::hillshade, - gl::Triangle, + gfx::Triangle, TypeList< attributes::a_pos, attributes::a_texture_pos>, diff --git a/src/mbgl/programs/line_program.hpp b/src/mbgl/programs/line_program.hpp index 1c96ecbf34..e35c11a29c 100644 --- a/src/mbgl/programs/line_program.hpp +++ b/src/mbgl/programs/line_program.hpp @@ -35,7 +35,7 @@ using LineLayoutAttributes = TypeList< class LineProgram : public Program< shaders::line, - gl::Triangle, + gfx::Triangle, LineLayoutAttributes, TypeList< uniforms::u_matrix, @@ -99,7 +99,7 @@ public: class LinePatternProgram : public Program< shaders::line_pattern, - gl::Triangle, + gfx::Triangle, LineLayoutAttributes, TypeList< uniforms::u_matrix, @@ -125,7 +125,7 @@ public: class LineSDFProgram : public Program< shaders::line_sdf, - gl::Triangle, + gfx::Triangle, LineLayoutAttributes, TypeList< uniforms::u_matrix, @@ -156,7 +156,7 @@ public: class LineGradientProgram : public Program< shaders::line_gradient, - gl::Triangle, + gfx::Triangle, LineLayoutAttributes, TypeList< uniforms::u_matrix, diff --git a/src/mbgl/programs/raster_program.hpp b/src/mbgl/programs/raster_program.hpp index 45b324696d..90d444a2d4 100644 --- a/src/mbgl/programs/raster_program.hpp +++ b/src/mbgl/programs/raster_program.hpp @@ -25,7 +25,7 @@ MBGL_DEFINE_UNIFORM_VECTOR(float, 2, u_tl_parent); class RasterProgram : public Program< shaders::raster, - gl::Triangle, + gfx::Triangle, TypeList< attributes::a_pos, attributes::a_texture_pos>, diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index d6bad6da77..ebe40f15b4 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -341,7 +341,7 @@ public: class SymbolIconProgram : public SymbolProgram< shaders::symbol_icon, - gl::Triangle, + gfx::Triangle, SymbolLayoutAttributes, TypeList< uniforms::u_matrix, @@ -380,7 +380,7 @@ enum class SymbolSDFPart { template class SymbolSDFProgram : public SymbolProgram< shaders::symbol_sdf, - gl::Triangle, + gfx::Triangle, SymbolLayoutAttributes, TypeList< uniforms::u_matrix, @@ -402,7 +402,7 @@ class SymbolSDFProgram : public SymbolProgram< { public: using BaseProgram = SymbolProgram vertices; - gl::IndexVector triangles; + gl::IndexVector triangles; SegmentVector segments; optional> vertexBuffer; - optional> indexBuffer; + optional> indexBuffer; std::map 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 vertices; - gl::IndexVector indices; + gl::IndexVector 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 segments; optional> vertexBuffer; - optional> indexBuffer; + optional> 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 vertices; - gl::IndexVector lines; - gl::IndexVector triangles; + gl::IndexVector lines; + gl::IndexVector triangles; SegmentVector lineSegments; SegmentVector triangleSegments; optional> vertexBuffer; - optional> lineIndexBuffer; - optional> triangleIndexBuffer; + optional> lineIndexBuffer; + optional> triangleIndexBuffer; std::map 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 vertices; - gl::IndexVector triangles; + gl::IndexVector triangles; SegmentVector triangleSegments; optional> vertexBuffer; - optional> indexBuffer; + optional> indexBuffer; std::unordered_map 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 vertices; - gl::IndexVector triangles; + gl::IndexVector triangles; SegmentVector segments; optional> vertexBuffer; - optional> indexBuffer; + optional> indexBuffer; std::map 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 vertices; - gl::IndexVector indices; + gl::IndexVector indices; SegmentVector segments; optional> vertexBuffer; - optional> indexBuffer; + optional> 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 vertices; - gl::IndexVector triangles; + gl::IndexVector triangles; SegmentVector segments; optional> vertexBuffer; - optional> indexBuffer; + optional> indexBuffer; std::map 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 vertices; - gl::IndexVector indices; + gl::IndexVector indices; SegmentVector segments; optional> vertexBuffer; - optional> indexBuffer; + optional> 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& triangles, const PlacedSymbol& placedSymbol) { +void addPlacedSymbol(gl::IndexVector& 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 vertices; gl::VertexVector> dynamicVertices; gl::VertexVector> opacityVertices; - gl::IndexVector triangles; + gl::IndexVector triangles; SegmentVector segments; std::vector placedSymbols; optional> vertexBuffer; optional>> dynamicVertexBuffer; optional>> opacityVertexBuffer; - optional> indexBuffer; + optional> indexBuffer; } text; std::unique_ptr iconSizeBinder; @@ -107,7 +107,7 @@ public: gl::VertexVector vertices; gl::VertexVector> dynamicVertices; gl::VertexVector> opacityVertices; - gl::IndexVector triangles; + gl::IndexVector triangles; SegmentVector segments; std::vector placedSymbols; PremultipliedImage atlasImage; @@ -115,7 +115,7 @@ public: optional> vertexBuffer; optional>> dynamicVertexBuffer; optional>> opacityVertexBuffer; - optional> indexBuffer; + optional> indexBuffer; } icon; struct CollisionBuffer { @@ -128,13 +128,13 @@ public: }; struct CollisionBoxBuffer : public CollisionBuffer { - gl::IndexVector lines; - optional> indexBuffer; + gl::IndexVector lines; + optional> indexBuffer; } collisionBox; struct CollisionCircleBuffer : public CollisionBuffer { - gl::IndexVector triangles; - optional> indexBuffer; + gl::IndexVector triangles; + optional> 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().constantOr(Color()).a >= 1.0f && evaluated.get().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() && parameters.pass == RenderPass::Translucent) { draw(parameters.programs.getFillLayerPrograms().fillOutline, - gl::Lines{ 2.0f }, + gfx::Lines{ 2.0f }, parameters.depthModeForSublayer( unevaluated.get().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() && unevaluated.get().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 +#include #include #include #include @@ -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> tileVertices( return result; } -static gl::IndexVector quadTriangleIndices() { - gl::IndexVector result; +static gl::IndexVector quadTriangleIndices() { + gl::IndexVector result; result.emplace_back(0, 1, 2); result.emplace_back(1, 2, 3); return result; } -static gl::IndexVector tileLineStripIndices() { - gl::IndexVector result; +static gl::IndexVector tileLineStripIndices() { + gl::IndexVector 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 rasterVertexBuffer; gl::VertexBuffer extrusionTextureVertexBuffer; - gl::IndexBuffer quadTriangleIndexBuffer; - gl::IndexBuffer tileBorderIndexBuffer; + gl::IndexBuffer quadTriangleIndexBuffer; + gl::IndexBuffer tileBorderIndexBuffer; SegmentVector tileTriangleSegments; SegmentVector 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(), -- cgit v1.2.1