Remove legacy renderer from source, build files and CI (#3384)
This commit is contained in:
@@ -12,12 +12,6 @@ switch ($env:RENDERER)
|
||||
'osmesa' { $compile_flags += '-DMLN_WITH_OSMESA=ON'; break; }
|
||||
}
|
||||
|
||||
switch ($env:RENDERING_MODE)
|
||||
{
|
||||
'legacy' { $compile_flags += '-DMLN_LEGACY_RENDERER=ON' ; break; }
|
||||
'drawable' { $compile_flags += '-DMLN_DRAWABLE_RENDERER=ON'; break; }
|
||||
}
|
||||
|
||||
Write-Host 'Compile flags: ' $compile_flags
|
||||
|
||||
& cmake -B build -G Ninja $($compile_flags)
|
||||
|
||||
6
.github/workflows/android-ci.yml
vendored
6
.github/workflows/android-ci.yml
vendored
@@ -187,9 +187,9 @@ jobs:
|
||||
|
||||
- name: Build Instrumentation Tests, copy to platform/android
|
||||
run: |
|
||||
./gradlew assembleLegacyDebug assembleLegacyDebugAndroidTest -PtestBuildType=debug
|
||||
cp MapLibreAndroidTestApp/build/outputs/apk/legacy/debug/MapLibreAndroidTestApp-legacy-debug.apk InstrumentationTestApp.apk
|
||||
cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/legacy/debug/MapLibreAndroidTestApp-legacy-debug-androidTest.apk InstrumentationTests.apk
|
||||
./gradlew assembleDrawableDebug assembleDrawableDebugAndroidTest -PtestBuildType=debug
|
||||
cp MapLibreAndroidTestApp/build/outputs/apk/drawable/debug/MapLibreAndroidTestApp-drawable-debug.apk InstrumentationTestApp.apk
|
||||
cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/drawable/debug/MapLibreAndroidTestApp-drawable-debug-androidTest.apk InstrumentationTests.apk
|
||||
|
||||
- name: Upload android-ui-test
|
||||
uses: actions/upload-artifact@v4
|
||||
|
||||
14
.github/workflows/linux-ci.yml
vendored
14
.github/workflows/linux-ci.yml
vendored
@@ -53,7 +53,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: true
|
||||
matrix:
|
||||
renderer: [legacy, drawable, vulkan, drawable-rust]
|
||||
renderer: [vulkan, drawable]
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
@@ -79,19 +79,13 @@ jobs:
|
||||
- name: Install dependencies
|
||||
run: .github/scripts/install-linux-deps
|
||||
|
||||
|
||||
- if: matrix.renderer == 'drawable'
|
||||
run: echo renderer_flag_cmake=-DMLN_DRAWABLE_RENDERER=ON >> "$GITHUB_ENV"
|
||||
|
||||
- if: matrix.renderer == 'drawable-rust'
|
||||
run: |
|
||||
echo "renderer_flag_cmake=-DMLN_DRAWABLE_RENDERER=ON -DMLN_USE_RUST=ON" >> "$GITHUB_ENV"
|
||||
cargo install cxxbridge-cmd
|
||||
|
||||
- if: matrix.renderer == 'legacy'
|
||||
run: echo renderer_flag_cmake=-DMLN_LEGACY_RENDERER=ON >> "$GITHUB_ENV"
|
||||
echo "-DMLN_WITH_OPENGL=ON" >> "$GITHUB_ENV"
|
||||
|
||||
- if: matrix.renderer == 'vulkan'
|
||||
run: echo renderer_flag_cmake="-DMLN_DRAWABLE_RENDERER=ON -DMLN_LEGACY_RENDERER=OFF -DMLN_WITH_VULKAN=ON -DMLN_WITH_OPENGL=OFF" >> "$GITHUB_ENV"
|
||||
run: echo renderer_flag_cmake="-DMLN_WITH_VULKAN=ON -DMLN_WITH_OPENGL=OFF" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Build MapLibre Native Core
|
||||
env:
|
||||
|
||||
2
.github/workflows/node-ci.yml
vendored
2
.github/workflows/node-ci.yml
vendored
@@ -136,7 +136,6 @@ jobs:
|
||||
libcurl4-openssl-dev \
|
||||
libglfw3-dev \
|
||||
libuv1-dev \
|
||||
g++-12 \
|
||||
libjpeg-dev \
|
||||
libpng-dev \
|
||||
libwebp-dev
|
||||
@@ -214,7 +213,6 @@ jobs:
|
||||
-DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} \
|
||||
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
|
||||
-DCMAKE_C_COMPILER=gcc-12 \
|
||||
-DCMAKE_CXX_COMPILER=g++-12 \
|
||||
-DMLN_WITH_NODE=ON
|
||||
|
||||
- name: "Create directory '${{ github.workspace }}/platform/windows/vendor/vcpkg/bincache' (Windows)"
|
||||
|
||||
2
.github/workflows/node-release.yml
vendored
2
.github/workflows/node-release.yml
vendored
@@ -181,8 +181,6 @@ jobs:
|
||||
-DMLN_WITH_NODE=ON \
|
||||
-DMLN_WITH_OPENGL=OFF \
|
||||
-DMLN_WITH_METAL=ON \
|
||||
-DMLN_LEGACY_RENDERER=OFF \
|
||||
-DMLN_DRAWABLE_RENDERER=ON \
|
||||
-DMLN_WITH_WERROR=OFF
|
||||
|
||||
- name: Configure maplibre-native (Linux)
|
||||
|
||||
7
.github/workflows/windows-ci.yml
vendored
7
.github/workflows/windows-ci.yml
vendored
@@ -88,12 +88,6 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
renderer: [opengl, egl, vulkan, osmesa]
|
||||
rendering_mode: [legacy, drawable]
|
||||
exclude:
|
||||
- renderer: egl
|
||||
rendering_mode: drawable
|
||||
- renderer: vulkan
|
||||
rendering_mode: legacy
|
||||
runs-on: windows-2022
|
||||
steps:
|
||||
- run: |
|
||||
@@ -133,7 +127,6 @@ jobs:
|
||||
CMAKE_C_COMPILER_LAUNCHER: "${{ env.SCCACHE_PATH }}"
|
||||
CMAKE_CXX_COMPILER_LAUNCHER: "${{ env.SCCACHE_PATH }}"
|
||||
RENDERER: "${{ matrix.renderer }}"
|
||||
RENDERING_MODE: "${{ matrix.rendering_mode }}"
|
||||
timeout-minutes: 60
|
||||
run: |
|
||||
cmake --version
|
||||
|
||||
Reference in New Issue
Block a user