From 3e8db2bc34262f3ffdb88c0ac4fcb3ce508f0e22 Mon Sep 17 00:00:00 2001 From: Tim Sylvester Date: Tue, 30 May 2023 11:56:01 -0700 Subject: [PATCH] Drawable Renderer (#1570), Add `int4` to `float4` conversion for line `a_data` --- src/mbgl/gl/vertex_attribute_gl.cpp | 5 ++++- src/mbgl/renderer/layers/fill_layer_tweaker.cpp | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mbgl/gl/vertex_attribute_gl.cpp b/src/mbgl/gl/vertex_attribute_gl.cpp index 5846b51c3..122099f13 100644 --- a/src/mbgl/gl/vertex_attribute_gl.cpp +++ b/src/mbgl/gl/vertex_attribute_gl.cpp @@ -110,7 +110,10 @@ bool VertexAttributeGL::get(const gfx::VertexAttribute::ElementType& element, GL return gl::get(element, buffer); case GL_FLOAT_VEC4: case GL_FLOAT_MAT2: - return gl::get(element, buffer); + return gl::get(element, buffer) || + gl::get(element, buffer, [](int4 x) { + return float4{(float)x[0], (float)x[1], (float)x[2], (float)x[3]}; + }); case GL_INT: return gl::get(element, buffer) || gl::get(element, buffer); case GL_UNSIGNED_INT: diff --git a/src/mbgl/renderer/layers/fill_layer_tweaker.cpp b/src/mbgl/renderer/layers/fill_layer_tweaker.cpp index d76d0bbb9..822a0968a 100644 --- a/src/mbgl/renderer/layers/fill_layer_tweaker.cpp +++ b/src/mbgl/renderer/layers/fill_layer_tweaker.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include