fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson,ci: remove dead kmsro option in gallium-drivers

Browse source 
Fixes: 70813c1c13 ("meson: Remove kmsro from gallium-drivers")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30463>
(cherry picked from commit 89863a050b)
This commit is contained in:
Eric Engestrom 2024-08-01 11:43:51 +02:00 • committed by Eric Engestrom
parent 52ab6f8d02
commit cf19e52723
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.gitlab-ci/build/gitlab-ci.yml
View file

@ -138,7 +138,7 @@ debian-testing-msan:
# GLSL has some issues in sexpression reading. # GLSL has some issues in sexpression reading.
# gtest has issues in its test initialization. # gtest has issues in its test initialization.
MESON_TEST_ARGS: "--suite glcpp --suite format" MESON_TEST_ARGS: "--suite glcpp --suite format"
GALLIUM_DRIVERS: "freedreno,iris,nouveau,kmsro,r300,r600,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus" GALLIUM_DRIVERS: "freedreno,iris,nouveau,r300,r600,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
VULKAN_DRIVERS: intel,amd,broadcom,virtio VULKAN_DRIVERS: intel,amd,broadcom,virtio
# Do a host build for intel-clc (msan complains about # Do a host build for intel-clc (msan complains about
# uninitialized values in the LLVM libs) # uninitialized values in the LLVM libs)
@ -176,7 +176,7 @@ debian-testing-msan:
-D gallium-xa=enabled -D gallium-xa=enabled
-D gallium-nine=false -D gallium-nine=false
-D gallium-rusticl=false -D gallium-rusticl=false
GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus" GALLIUM_DRIVERS: "iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
VULKAN_DRIVERS: swrast VULKAN_DRIVERS: swrast
EXTRA_OPTION: > EXTRA_OPTION: >
-D spirv-to-dxil=true -D spirv-to-dxil=true
@ -240,7 +240,7 @@ debian-release:
-D gallium-nine=false -D gallium-nine=false
-D gallium-rusticl=false -D gallium-rusticl=false
-D llvm=enabled -D llvm=enabled
GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,freedreno,r300,svga,llvmpipe,softpipe,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus" GALLIUM_DRIVERS: "i915,iris,nouveau,freedreno,r300,svga,llvmpipe,softpipe,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus"
VULKAN_DRIVERS: "amd,imagination-experimental,microsoft-experimental" VULKAN_DRIVERS: "amd,imagination-experimental,microsoft-experimental"
EXTRA_OPTION: > EXTRA_OPTION: >
-D spirv-to-dxil=true -D spirv-to-dxil=true
@ -273,7 +273,7 @@ alpine-build-testing:
-D glvnd=disabled -D glvnd=disabled
-D platforms=wayland -D platforms=wayland
LLVM_VERSION: "16" LLVM_VERSION: "16"
GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink" GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink"
GALLIUM_ST: > GALLIUM_ST: >
-D dri3=enabled -D dri3=enabled
-D gallium-extra-hud=true -D gallium-extra-hud=true
@ -321,7 +321,7 @@ fedora-release:
-D intel-rt=enabled -D intel-rt=enabled
-D imagination-srv=true -D imagination-srv=true
-D teflon=true -D teflon=true
GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,i915,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink" GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,i915,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink"
GALLIUM_ST: > GALLIUM_ST: >
-D dri3=enabled -D dri3=enabled
-D gallium-extra-hud=true -D gallium-extra-hud=true
@ -433,7 +433,7 @@ debian-android:
- debian/arm64_build - debian/arm64_build
variables: variables:
VULKAN_DRIVERS: freedreno,broadcom VULKAN_DRIVERS: freedreno,broadcom
GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink" GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink"
BUILDTYPE: "debugoptimized" BUILDTYPE: "debugoptimized"
tags: tags:
- aarch64 - aarch64
@ -447,7 +447,7 @@ debian-arm32:
DRI_LOADERS: DRI_LOADERS:
-D glvnd=disabled -D glvnd=disabled
# remove llvmpipe from the .meson-arm list because here we have llvm=disabled # remove llvmpipe from the .meson-arm list because here we have llvm=disabled
GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,softpipe,tegra,v3d,vc4,zink" GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,softpipe,tegra,v3d,vc4,zink"
EXTRA_OPTION: > EXTRA_OPTION: >
-D llvm=disabled -D llvm=disabled
-D valgrind=disabled -D valgrind=disabled
@ -575,7 +575,7 @@ debian-clang:
-D shared-llvm=enabled -D shared-llvm=enabled
-D opencl-spirv=true -D opencl-spirv=true
-D shared-glapi=enabled -D shared-glapi=enabled
GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi" GALLIUM_DRIVERS: "iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau
EXTRA_OPTION: EXTRA_OPTION:
-D spirv-to-dxil=true -D spirv-to-dxil=true

2
.pick_status.json
View file

@ -1534,7 +1534,7 @@
"description": "meson,ci: remove dead `kmsro` option in `gallium-drivers`", "description": "meson,ci: remove dead `kmsro` option in `gallium-drivers`",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "70813c1c13b99cb029c8fa3537163650bdd17b6d", "because_sha": "70813c1c13b99cb029c8fa3537163650bdd17b6d",
"notes": null "notes": null

2
meson_options.txt
View file

@ -86,7 +86,7 @@ option(
type : 'array', type : 'array',
value : ['auto'], value : ['auto'],
choices : [ choices : [
'auto', 'kmsro', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno', 'auto', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno',
'swrast', 'v3d', 'vc4', 'etnaviv', 'tegra', 'i915', 'svga', 'virgl', 'swrast', 'v3d', 'vc4', 'etnaviv', 'tegra', 'i915', 'svga', 'virgl',
'panfrost', 'iris', 'lima', 'zink', 'd3d12', 'asahi', 'crocus', 'all', 'panfrost', 'iris', 'lima', 'zink', 'd3d12', 'asahi', 'crocus', 'all',
'softpipe', 'llvmpipe', 'softpipe', 'llvmpipe',