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

Fix failing Vulkan render tests (#2851)

Browse Source
This commit is contained in:
Adrian Cojocaru
2024-09-19 21:30:14 +03:00
committed by GitHub
parent 7913eab644
commit e2df2d9061
12 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/android.cmake
View File

@@ -248,6 +248,10 @@ add_library(
${PROJECT_SOURCE_DIR}/platform/android/MapLibreAndroid/src/cpp/http_file_source.cpp
)
if(MLN_WITH_VULKAN)
target_compile_definitions(mbgl-render-test-runner PRIVATE "MLN_RENDER_BACKEND_VULKAN=1")
endif()
target_include_directories(
mbgl-render-test-runner
PRIVATE ${ANDROID_NDK}/sources/android/native_app_glue ${PROJECT_SOURCE_DIR}/platform/android/src ${PROJECT_SOURCE_DIR}/src

5
platform/android/src/test/render_test_runner.cpp
View File

@@ -53,8 +53,13 @@ void android_main(struct android_app* app) {
return result;
};
#if MLN_RENDER_BACKEND_VULKAN
auto result = runTestWithManifest("/metrics/android-vulkan-render-test-runner-metrics.json");
result = runTestWithManifest("/metrics/android-vulkan-render-test-runner-style.json") && result;
#else
auto result = runTestWithManifest("/metrics/android-render-test-runner-metrics.json");
result = runTestWithManifest("/metrics/android-render-test-runner-style.json") && result;
#endif
mbgl::Log::Info(mbgl::Event::General, "All tests are finished!");
changeState(env, app, result);
}