mirror of https://gitlab.freedesktop.org/mesa/mesa
meson: with_glx never assigned to 'gallium-xlib', remove 'gallium-xlib'
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> Reviewed-by: Eric Engestrom <eric@igalia.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19221>
This commit is contained in:
parent
814682d00c
commit
5bed3d4ad6
|
@ -939,7 +939,7 @@ endif
|
|||
|
||||
gl_pkgconfig_c_flags = []
|
||||
if with_platform_x11
|
||||
if with_glx == 'xlib' or with_glx == 'gallium-xlib'
|
||||
if with_glx == 'xlib'
|
||||
pre_args += '-DUSE_XSHM'
|
||||
else
|
||||
pre_args += '-DGLX_INDIRECT_RENDERING'
|
||||
|
@ -2104,7 +2104,7 @@ endif
|
|||
|
||||
with_dri3_modifiers = false
|
||||
if with_platform_x11
|
||||
if with_glx == 'xlib' or with_glx == 'gallium-xlib'
|
||||
if with_glx == 'xlib'
|
||||
dep_x11 = dependency('x11')
|
||||
dep_xext = dependency('xext')
|
||||
dep_xcb = dependency('xcb')
|
||||
|
@ -2141,7 +2141,7 @@ if with_platform_x11
|
|||
dep_xshmfence = dependency('xshmfence', version : '>= 1.1')
|
||||
endif
|
||||
endif
|
||||
if with_glx == 'dri' or with_glx == 'xlib' or with_glx == 'gallium-xlib'
|
||||
if with_glx == 'dri' or with_glx == 'xlib'
|
||||
dep_glproto = dependency('glproto', version : '>= 1.4.14')
|
||||
endif
|
||||
if with_glx == 'dri'
|
||||
|
@ -2223,7 +2223,7 @@ add_project_arguments(cpp_args, language : ['cpp'])
|
|||
|
||||
gl_priv_reqs = []
|
||||
|
||||
if with_glx == 'xlib' or with_glx == 'gallium-xlib'
|
||||
if with_glx == 'xlib'
|
||||
gl_priv_reqs += ['x11', 'xext', 'xcb']
|
||||
elif with_glx == 'dri'
|
||||
gl_priv_reqs += [
|
||||
|
|
|
@ -455,7 +455,7 @@ if with_dri2 and with_platform_x11
|
|||
endif
|
||||
endif
|
||||
|
||||
if with_glx == 'xlib' or with_glx == 'gallium-xlib'
|
||||
if with_glx == 'xlib'
|
||||
files_libgalliumvlwinsys += files('vl/vl_winsys_xlib_swrast.c')
|
||||
elif with_gallium_drisw_kms
|
||||
files_libgalliumvlwinsys += files('vl/vl_winsys_dri_vgem.c')
|
||||
|
|
|
@ -36,7 +36,7 @@ link_with_libva_gallium = [
|
|||
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
|
||||
]
|
||||
|
||||
if with_glx == 'xlib' or with_glx == 'gallium-xlib'
|
||||
if with_glx == 'xlib'
|
||||
link_with_libva_gallium += [libws_xlib]
|
||||
endif
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ link_with_libvdpau_gallium = [
|
|||
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
|
||||
]
|
||||
|
||||
if with_glx == 'xlib' or with_glx == 'gallium-xlib'
|
||||
if with_glx == 'xlib'
|
||||
link_with_libvdpau_gallium += [libws_xlib]
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue