tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drawable Renderer (#1570), Add int4 to float4 conversion for line a_data

Browse Source
This commit is contained in:
Tim Sylvester
2023-05-30 11:56:01 -07:00
committed by Bart Louwers
parent d68cbb8a9d
commit 3e8db2bc34
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mbgl/gl/vertex_attribute_gl.cpp
View File

@@ -110,7 +110,10 @@ bool VertexAttributeGL::get(const gfx::VertexAttribute::ElementType& element, GL
return gl::get<float3>(element, buffer);
case GL_FLOAT_VEC4:
case GL_FLOAT_MAT2:
return gl::get<float4>(element, buffer);
return gl::get<float4>(element, buffer) ||
gl::get<int4, float4>(element, buffer, [](int4 x) {
return float4{(float)x[0], (float)x[1], (float)x[2], (float)x[3]};
});
case GL_INT:
return gl::get<std::int32_t>(element, buffer) || gl::get<float, std::int32_t>(element, buffer);
case GL_UNSIGNED_INT:

1
src/mbgl/renderer/layers/fill_layer_tweaker.cpp
View File

@@ -7,7 +7,6 @@
#include <mbgl/renderer/layer_group.hpp>
#include <mbgl/renderer/render_tree.hpp>
#include <mbgl/renderer/paint_parameters.hpp>
#include <mbgl/renderer/render_tile.cpp>
#include <mbgl/style/layers/fill_layer_properties.hpp>
#include <mbgl/util/convert.hpp>