diff options
| author | Dylan Baker <[email protected]> | 2017-11-02 13:36:44 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2017-11-10 13:00:01 -0800 |
| commit | ad9c2f5469deadea25b6781188acdebc3942df49 (patch) | |
| tree | 908f9201d8605cb49b538ef64f197fde6ce699d6 /meson.build | |
| parent | 118a7f044191d4ab15ac99f7748a6d6d97e683d1 (diff) | |
meson: build gallium-xlib based glx
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meson.build b/meson.build index 3922733a073..1f6658bbacf 100644 --- a/meson.build +++ b/meson.build @@ -152,7 +152,6 @@ if _drivers != '' with_gallium_etnaviv = _split.contains('etnaviv') with_gallium_imx = _split.contains('imx') with_gallium = true - with_dri = true endif if with_dri_swrast and with_gallium_softpipe @@ -192,7 +191,9 @@ if with_glx == 'auto' if with_dri with_glx = 'dri' elif with_gallium - with_glx = 'gallium-xlib' + # Even when building just gallium drivers the user probably wants dri + with_glx = 'dri' + with_dri = true elif with_platform_x11 and with_any_opengl and not with_any_vk # The automatic behavior should not be to turn on xlib based glx when # building only vulkan drivers @@ -202,7 +203,7 @@ if with_glx == 'auto' endif endif -if not (with_dri or with_gallium or with_glx == 'xlib') +if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib') with_gles1 = false with_gles2 = false with_opengl = false @@ -254,6 +255,8 @@ if with_glx != 'disabled' elif with_glx == 'gallium-xlib' if not with_gallium error('Gallium-xlib based GLX requires at least one gallium driver') + elif not with_gallium_softpipe + error('Gallium-xlib based GLX requires softpipe or llvmpipe.') elif with_dri error('gallium-xlib conflicts with any dri driver') endif @@ -353,11 +356,8 @@ if with_platform_x11 if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') pre_args += '-DHAVE_X11_PLATFORM' endif - if with_glx == 'xlib' + if with_glx == 'xlib' or with_glx == 'gallium-xlib' pre_args += '-DUSE_XSHM' - elif with_glx == 'gallium-xlib' - # TODO - error('TODO') else pre_args += '-DGLX_INDIRECT_RENDERING' if with_glx_direct @@ -837,7 +837,7 @@ dep_xcb_sync = [] dep_xcb_xfixes = [] dep_xshmfence = [] if with_platform_x11 - if with_glx == 'xlib' + if with_glx == 'xlib' or with_glx == 'gallium-xlib' dep_x11 = dependency('x11') dep_xext = dependency('xext') dep_xcb = dependency('xcb') |