meson: never use static glapi because shared glapi is also static and better

Shared glapi is already statically linked with libmesa (src/mesa),
and some parts are statically linked with loaders.

Static glapi will be removed after this is merged.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33794>
This commit is contained in:
Marek Olšák 2025-02-27 03:18:35 -05:00 committed by Marge Bot
parent f0f896ef21
commit e5c76088e9
5 changed files with 5 additions and 11 deletions

View file

@ -668,7 +668,6 @@ debian-clang:
-D llvm=enabled
-D microsoft-clc=disabled
-D shared-llvm=enabled
-D shared-glapi=enabled
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
EXTRA_OPTION:
@ -706,7 +705,6 @@ debian-clang-release:
-D llvm=enabled
-D microsoft-clc=disabled
-D shared-llvm=enabled
-D shared-glapi=disabled
windows-msvc:
extends:

View file

@ -51,7 +51,6 @@ meson setup `
-Dgallium-drivers="swrast,d3d12,zink" `
-Dgallium-va=enabled `
-Dvideo-codecs="all" `
-Dshared-glapi=enabled `
-Dgles1=enabled `
-Dgles2=enabled `
-Dgallium-opencl=icd `

View file

@ -119,10 +119,8 @@ if gbm_backends_path == ''
gbm_backends_path = join_paths(get_option('prefix'), get_option('libdir'), 'gbm')
endif
# Default shared glapi disabled for windows, enabled elsewhere.
with_shared_glapi = get_option('shared-glapi') \
.disable_auto_if(host_machine.system() == 'windows') \
.allowed()
# TODO: Remove this and the old static glapi along with it.
with_shared_glapi = true
with_opengl = get_option('opengl')

View file

@ -297,9 +297,8 @@ option(
option(
'shared-glapi',
type : 'feature',
deprecated: {'true': 'enabled', 'false': 'disabled'},
description : 'Whether to build a shared or static glapi. Defaults to ' +
'disabled on Windows, enabled elsewhere'
deprecated: true,
description : 'Does nothing, left here for a while to avoid build breakages.',
)
option(

View file

@ -8,7 +8,7 @@ if not with_platform_windows
'st_format_test',
['st_format.c'],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
link_with : [libmesa, shared_glapi_lib, libgallium, libglapi],
link_with : [libmesa, libglapi, libgallium],
dependencies : [idep_gtest, idep_mesautil],
),
suite : ['st_mesa'],