From a06145fe92f30f227f8e15f72deebbc1864bee1a Mon Sep 17 00:00:00 2001 From: Tim Sylvester Date: Tue, 30 May 2023 07:30:24 -0700 Subject: [PATCH] Drawable Renderer (#1570), warnings --- include/mbgl/gfx/drawable_builder.hpp | 6 +++--- src/mbgl/renderer/layers/render_fill_layer.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/mbgl/gfx/drawable_builder.hpp b/include/mbgl/gfx/drawable_builder.hpp index 3e04f9e3c..4f68cf0e7 100644 --- a/include/mbgl/gfx/drawable_builder.hpp +++ b/include/mbgl/gfx/drawable_builder.hpp @@ -85,8 +85,8 @@ public: void setColorAttrMode(ColorAttrMode mode) { colorAttrMode = mode; } /// Width for lines - int32_t getLineWidth() const { return lineWidth; } - void setLineWidth(int32_t value) { lineWidth = value; } + float getLineWidth() const { return lineWidth; } + void setLineWidth(float value) { lineWidth = value; } DepthMaskType getDepthType() const { return depthType; } void setDepthType(DepthMaskType value) { depthType = value; } @@ -158,7 +158,7 @@ protected: std::string vertexAttrName; std::string colorAttrName; mbgl::RenderPass renderPass; - int32_t lineWidth = 1; + float lineWidth = 1.0f; DrawPriority drawPriority = 0; int32_t layerIndex = -1; int32_t subLayerIndex = 0; diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index ea2f157e8..8a6508bf6 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -467,7 +467,7 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders, outlineBuilder = context.createDrawableBuilder("fill-outline"); outlineBuilder->setShader(outlineShader); outlineBuilder->setColorAttrMode(gfx::DrawableBuilder::ColorAttrMode::None); - outlineBuilder->setLineWidth(2); + outlineBuilder->setLineWidth(2.0f); outlineBuilder->setDepthType(gfx::DepthMaskType::ReadOnly); outlineBuilder->setCullFaceMode(gfx::CullFaceMode::disabled()); outlineBuilder->setLayerIndex(layerIndex); @@ -549,7 +549,7 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders, outlinePatternBuilder = context.createDrawableBuilder("fill-outline-pattern"); outlinePatternBuilder->setShader(outlineShader); outlinePatternBuilder->setColorAttrMode(gfx::DrawableBuilder::ColorAttrMode::None); - outlinePatternBuilder->setLineWidth(2); + outlinePatternBuilder->setLineWidth(2.0f); outlinePatternBuilder->setDepthType(gfx::DepthMaskType::ReadOnly); outlinePatternBuilder->setCullFaceMode(gfx::CullFaceMode::disabled()); outlinePatternBuilder->setLayerIndex(layerIndex);