diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2018-03-07 18:45:30 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-03-21 10:06:12 -0400 |
| commit | 22b489d27365d2513bf1cab6da92254e3bdbcf41 (patch) | |
| tree | 677ab6d0e7565c7b3398a74fd520fde5592a6c36 /include | |
| parent | e0748b10a8621066b404d713a76826907da777b9 (diff) | |
Remove always true GLAMOR_HAS_DRM_* guards
With earlier commit the required version was bumped to 2.4.89, thus the
guards always evaluate to true.
Fixes: e4e3447603b ("Add RandR leases with modesetting driver support
[v6]")
Cc: Keith Packard <keithp@keithp.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix-config.h.in | 9 | ||||
| -rw-r--r-- | include/meson.build | 6 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 58585724c..396157bcc 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -491,15 +491,6 @@ /* GBM has modifiers support */ #undef GBM_BO_WITH_MODIFIERS -/* Build glamor use new drmGetDeviceNameFromFD2 */ -#undef GLAMOR_HAS_DRM_NAME_FROM_FD_2 - -/* Glamor should use atomic DRM API */ -#undef GLAMOR_HAS_DRM_ATOMIC - -/* Glamor can retrieve supported DRM formats/modifiers */ -#undef GLAMOR_HAS_DRM_MODIFIERS - /* Glamor can use eglQueryDmaBuf* functions */ #undef GLAMOR_HAS_EGL_QUERY_DMABUF diff --git a/include/meson.build b/include/meson.build index e6abf22f8..10c7d2556 100644 --- a/include/meson.build +++ b/include/meson.build @@ -73,12 +73,6 @@ conf_data.set_quoted('SHMDIR', '/tmp') conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found()) conf_data.set('WITH_LIBDRM', libdrm_dep.found()) -conf_data.set('GLAMOR_HAS_DRM_ATOMIC', - libdrm_dep.found() and libdrm_dep.version().version_compare('>= 2.4.62')) -conf_data.set('GLAMOR_HAS_DRM_NAME_FROM_FD_2', - libdrm_dep.found() and libdrm_dep.version().version_compare('>= 2.4.74')) -conf_data.set('GLAMOR_HAS_DRM_MODIFIERS', - libdrm_dep.found() and libdrm_dep.version().version_compare('>= 2.4.83')) conf_data.set('GLAMOR_HAS_EGL_QUERY_DMABUF', epoxy_dep.found() and epoxy_dep.version().version_compare('>= 1.4.4')) conf_data.set('GLXEXT', build_glx) |