Drawable Renderer (#1570), CI warnings

This commit is contained in:
Tim Sylvester
2023-06-12 14:22:51 -07:00
committed by Bart Louwers
parent 3937ace95a
commit e7a82f78bc
11 changed files with 45 additions and 42 deletions

View File

@@ -32,10 +32,10 @@ using namespace style;
namespace {
static constexpr std::string_view FillShaderName = "FillShader";
static constexpr std::string_view FillOutlineShaderName = "FillOutlineShader";
static constexpr std::string_view FillPatternShaderName = "FillPatternShader";
static constexpr std::string_view FillOutlinePatternShaderName = "FillOutlinePatternShader";
constexpr std::string_view FillShaderName = "FillShader";
constexpr std::string_view FillOutlineShaderName = "FillOutlineShader";
constexpr std::string_view FillPatternShaderName = "FillPatternShader";
constexpr std::string_view FillOutlinePatternShaderName = "FillOutlinePatternShader";
inline const FillLayer::Impl& impl_cast(const Immutable<style::Layer::Impl>& impl) {
assert(impl->getTypeInfo() == FillLayer::Impl::staticTypeInfo());
@@ -493,7 +493,7 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders,
fillBuilder->addVertices(rawVerts, 0, rawVerts.size());
fillBuilder->setSegments(gfx::Triangles(),
bucket.triangles.vector(),
reinterpret_cast<const std::vector<Segment<void>>&>(bucket.triangleSegments));
reinterpret_cast<const std::vector<SegmentBase>&>(bucket.triangleSegments));
finish(*fillBuilder, tileID, interpolateUBO, tileProps);
}
if (outlineBuilder) {
@@ -503,7 +503,7 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders,
outlineBuilder->addVertices(rawVerts, 0, rawVerts.size());
outlineBuilder->setSegments(gfx::Lines(2),
bucket.lines.vector(),
reinterpret_cast<const std::vector<Segment<void>>&>(bucket.lineSegments));
reinterpret_cast<const std::vector<SegmentBase>&>(bucket.lineSegments));
finish(*outlineBuilder, tileID, interpolateUBO, tileProps);
}
} else { // FillPattern is defined
@@ -550,7 +550,7 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders,
patternBuilder->setSegments(
gfx::Triangles(),
bucket.triangles.vector(),
reinterpret_cast<const std::vector<Segment<void>>&>(bucket.triangleSegments));
reinterpret_cast<const std::vector<SegmentBase>&>(bucket.triangleSegments));
if (const auto& atlases = tile.getAtlasTextures()) {
if (const auto samplerLocation = fillShader->getSamplerLocation("u_image")) {
@@ -569,7 +569,7 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders,
outlinePatternBuilder->setSegments(
gfx::Lines(2),
bucket.lines.vector(),
reinterpret_cast<const std::vector<Segment<void>>&>(bucket.lineSegments));
reinterpret_cast<const std::vector<SegmentBase>&>(bucket.lineSegments));
if (const auto& atlases = tile.getAtlasTextures()) {
if (const auto samplerLocation = outlineShader->getSamplerLocation("u_image")) {