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

Warnings (#1791)

Browse Source
This commit is contained in:
Tim Sylvester
2023-10-20 16:23:26 -07:00
committed by GitHub
parent 1a1c826fa4
commit da45706601
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbgl/shaders/gl/drawable_hillshade_prepare.hpp
View File

@@ -81,7 +81,7 @@ void main() {
float b = getElevation(v_pos + vec2(0, -epsilon.y), 0.0);
float c = getElevation(v_pos + vec2(epsilon.x, -epsilon.y), 0.0);
float d = getElevation(v_pos + vec2(-epsilon.x, 0), 0.0);
float e = getElevation(v_pos, 0.0);
//float e = getElevation(v_pos, 0.0);
float f = getElevation(v_pos + vec2(epsilon.x, 0), 0.0);
float g = getElevation(v_pos + vec2(-epsilon.x, epsilon.y), 0.0);
float h = getElevation(v_pos + vec2(0, epsilon.y), 0.0);

2
include/mbgl/shaders/gl/hillshade_prepare.hpp
View File

@@ -64,7 +64,7 @@ void main() {
float b = getElevation(v_pos + vec2(0, -epsilon.y), 0.0);
float c = getElevation(v_pos + vec2(epsilon.x, -epsilon.y), 0.0);
float d = getElevation(v_pos + vec2(-epsilon.x, 0), 0.0);
float e = getElevation(v_pos, 0.0);
//float e = getElevation(v_pos, 0.0);
float f = getElevation(v_pos + vec2(epsilon.x, 0), 0.0);
float g = getElevation(v_pos + vec2(-epsilon.x, epsilon.y), 0.0);
float h = getElevation(v_pos + vec2(0, epsilon.y), 0.0);

2
include/mbgl/shaders/mtl/hillshade_prepare.hpp
View File

@@ -93,7 +93,7 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]],
float b = getElevation(in.pos + float2(0, -epsilon.y), 0.0, image, image_sampler, drawable.unpack);
float c = getElevation(in.pos + float2(epsilon.x, -epsilon.y), 0.0, image, image_sampler, drawable.unpack);
float d = getElevation(in.pos + float2(-epsilon.x, 0), 0.0, image, image_sampler, drawable.unpack);
float e = getElevation(in.pos, 0.0, image, image_sampler, drawable.unpack);
//float e = getElevation(in.pos, 0.0, image, image_sampler, drawable.unpack);
float f = getElevation(in.pos + float2(epsilon.x, 0), 0.0, image, image_sampler, drawable.unpack);
float g = getElevation(in.pos + float2(-epsilon.x, epsilon.y), 0.0, image, image_sampler, drawable.unpack);
float h = getElevation(in.pos + float2(0, epsilon.y), 0.0, image, image_sampler, drawable.unpack);

5
render-test/runner.cpp
View File

@@ -817,11 +817,14 @@ void TestRunner::run(TestMetadata& metadata) {
// TODO: remove usage of std::codecvt_utf8
// https://github.com/maplibre/maplibre-native/issues/1269
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
static std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> cv;
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
if (it == symbols.end()) {
symbols.push_back({tileId, box, placed, isIcon});
return;

2
shaders/drawable.hillshade_prepare.fragment.glsl
View File

@@ -46,7 +46,7 @@ void main() {
float b = getElevation(v_pos + vec2(0, -epsilon.y), 0.0);
float c = getElevation(v_pos + vec2(epsilon.x, -epsilon.y), 0.0);
float d = getElevation(v_pos + vec2(-epsilon.x, 0), 0.0);
float e = getElevation(v_pos, 0.0);
//float e = getElevation(v_pos, 0.0);
float f = getElevation(v_pos + vec2(epsilon.x, 0), 0.0);
float g = getElevation(v_pos + vec2(-epsilon.x, epsilon.y), 0.0);
float h = getElevation(v_pos + vec2(0, epsilon.y), 0.0);

2
shaders/hillshade_prepare.fragment.glsl
View File

@@ -38,7 +38,7 @@ void main() {
float b = getElevation(v_pos + vec2(0, -epsilon.y), 0.0);
float c = getElevation(v_pos + vec2(epsilon.x, -epsilon.y), 0.0);
float d = getElevation(v_pos + vec2(-epsilon.x, 0), 0.0);
float e = getElevation(v_pos, 0.0);
//float e = getElevation(v_pos, 0.0);
float f = getElevation(v_pos + vec2(epsilon.x, 0), 0.0);
float g = getElevation(v_pos + vec2(-epsilon.x, epsilon.y), 0.0);
float h = getElevation(v_pos + vec2(0, epsilon.y), 0.0);