with_gallium_etnaviv = _split.contains('etnaviv')
with_gallium_imx = _split.contains('imx')
with_gallium = true
- with_dri = true
endif
-if not (with_dri or with_gallium)
- with_gles1 = false
- with_gles2 = false
- with_opengl = false
- with_any_opengl = false
- with_shared_glapi = false
+with_intel_vk = false
+with_amd_vk = false
+with_any_vk = false
+_vulkan_drivers = get_option('vulkan-drivers')
+if _vulkan_drivers == 'auto'
+ if not ['darwin', 'windows'].contains(host_machine.system())
+ if host_machine.cpu_family().startswith('x86')
+ _vulkan_drivers = 'amd,intel'
+ else
+ error('Unknown architecture. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.')
+ endif
+ else
+ # No vulkan driver supports windows or macOS currently
+ _vulkan_drivers = ''
+ endif
+endif
+if _vulkan_drivers != ''
+ _split = _vulkan_drivers.split(',')
+ with_intel_vk = _split.contains('intel')
+ with_amd_vk = _split.contains('amd')
+ with_any_vk = with_amd_vk or with_intel_vk
endif
if with_dri_swrast and with_gallium_softpipe
egl_native_platform = _split[0]
endif
+with_glx = get_option('glx')
+if with_glx == 'auto'
+ if with_dri
+ with_glx = 'dri'
+ elif with_gallium
+ # 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
+ with_glx = 'xlib'
+ else
+ with_glx = 'disabled'
+ endif
+endif
+
+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
+ with_any_opengl = false
+ with_shared_glapi = false
+endif
+
with_gbm = get_option('gbm')
if with_gbm == 'auto' and with_dri # TODO: or gallium
with_gbm = host_machine.system() == 'linux'
endif
pre_args += '-DGLX_USE_TLS'
-with_glx = get_option('glx')
if with_glx != 'disabled'
if not (with_platform_x11 and with_any_opengl)
if with_glx == 'auto'
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
- elif with_glx == 'dri' and not with_dri
- error('dri based GLX requires at least one DRI driver')
- elif with_glx == 'auto'
+ elif with_glx == 'xlib'
if with_dri
- with_glx = 'dri'
- elif with_gallium
- with_glx = 'gallium-xlib'
- elif with_platform_x11 and with_any_opengl
- with_glx = 'xlib'
- else
- with_glx = 'disabled'
+ error('xlib conflicts with any dri driver')
endif
+ elif with_glx == 'dri' and not with_dri
+ error('dri based GLX requires at least one DRI driver')
endif
endif
with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
endif
-with_intel_vk = false
-with_amd_vk = false
-with_any_vk = false
-_vulkan_drivers = get_option('vulkan-drivers')
-if _vulkan_drivers == 'auto'
- if not ['darwin', 'windows'].contains(host_machine.system())
- if host_machine.cpu_family().startswith('x86')
- _vulkan_drivers = 'amd,intel'
- else
- error('Unknown architecture. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.')
- endif
- else
- # No vulkan driver supports windows or macOS currently
- _vulkan_drivers = ''
- endif
-endif
-if _vulkan_drivers != ''
- _split = _vulkan_drivers.split(',')
- with_intel_vk = _split.contains('intel')
- with_amd_vk = _split.contains('amd')
- with_any_vk = with_amd_vk or with_intel_vk
- if not (with_platform_x11 or with_platform_wayland or with_platform_android)
- error('Vulkan requires at least one platform (x11, wayland, android)')
- endif
-endif
-
with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm'
with_dri3 = get_option('dri3')
if with_dri3 == 'auto'
if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
pre_args += '-DHAVE_X11_PLATFORM'
endif
- if with_glx == 'xlib'
- # TODO
- error('TODO')
- elif with_glx == 'gallium-xlib'
- # TODO
- error('TODO')
+ if with_glx == 'xlib' or with_glx == 'gallium-xlib'
+ pre_args += '-DUSE_XSHM'
else
pre_args += '-DGLX_INDIRECT_RENDERING'
if with_glx_direct
endif
endforeach
-foreach f : ['strtof', 'mkostemp', 'posix_memalign']
+foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get']
if cc.has_function(f)
pre_args += '-DHAVE_@0@'.format(f.to_upper())
endif
# TODO: some of these may be conditional
dep_zlib = dependency('zlib', version : '>= 1.2.3')
dep_thread = dependency('threads')
-if dep_thread.found() and host_machine.system() == 'linux'
+if dep_thread.found() and host_machine.system() != 'windows'
pre_args += '-DHAVE_PTHREAD'
endif
dep_elf = dependency('libelf', required : false)
dep_xcb_xfixes = []
dep_xshmfence = []
if with_platform_x11
- if with_glx == 'dri' and with_dri_platform == 'drm'
+ if with_glx == 'xlib' or with_glx == 'gallium-xlib'
+ dep_x11 = dependency('x11')
+ dep_xext = dependency('xext')
+ dep_xcb = dependency('xcb')
+ elif with_glx == 'dri' and with_dri_platform == 'drm'
dep_x11 = dependency('x11')
dep_xext = dependency('xext')
dep_xdamage = dependency('xdamage', version : '>= 1.1')
dep_xshmfence = dependency('xshmfence', version : '>= 1.1')
endif
endif
- if with_glx != 'disabled'
+ if with_glx == 'dri'
dep_dri2proto = dependency('dri2proto', version : '>= 2.8')
dep_glproto = dependency('glproto', version : '>= 1.4.14')
endif
if dep_m.found()
gl_priv_libs += '-lm'
endif
-if dep_dl.found()
+if dep_dl != [] and dep_dl.found()
gl_priv_libs += '-ldl'
endif
projects / mesa.git / blobdiff