diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d1b66ef4cad..7a24ce1329b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -42,7 +42,7 @@ jobs: [binaries] llvm-config = '/usr/local/opt/llvm/bin/llvm-config' EOL - $MESON_EXEC . build --native-file=native_config -Dmoltenvk-dir=$(brew --prefix molten-vk) -Dbuild-tests=true -Dosmesa=true -Dgallium-drivers=swrast,zink -Dglx=${{ matrix.glx_option }} + $MESON_EXEC . build --native-file=native_config -Dmoltenvk-dir=$(brew --prefix molten-vk) -Dbuild-tests=true -Dgallium-drivers=swrast,zink -Dglx=${{ matrix.glx_option }} - name: Build run: $MESON_EXEC compile -C build - name: Test diff --git a/meson.options b/meson.options index 0822b588627..20001bcaa5f 100644 --- a/meson.options +++ b/meson.options @@ -533,14 +533,6 @@ option( description : 'Does nothing, left here for a while to avoid build breakages.', ) -option( - 'osmesa', - type : 'boolean', - value : false, - deprecated : true, - description : 'Does nothing, left here for a while to avoid build breakages.', -) - option( 'tools', type : 'array',