fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meson: make GLX require OpenGL

Browse source 
This isn't strictly true, but making that work isn't worth the effort;
see https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21343#note_1774683

Suggested-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21343>
This commit is contained in:
Eric Engestrom 2023-02-15 19:18:27 +00:00 • committed by Marge Bot
parent 50b82ca818
commit 8955340839
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
meson.build
View file

@ -320,7 +320,9 @@ with_platform_windows = _platforms.contains('windows')
with_glx = get_option('glx')
if with_glx == 'auto'
if with_platform_android
if not with_opengl
with_glx = 'disabled'
elif with_platform_android
with_glx = 'disabled'
elif with_dri
with_glx = 'dri'
@ -345,6 +347,10 @@ if with_glx == 'dri'
endif
endif
if not with_opengl and with_glx != 'disabled'
error('Building GLX without OpenGL is not supported.') \
endif
if not (with_dri or with_gallium or with_glx != 'disabled')
with_gles1 = false
with_gles2 = false