diff options
| author | Emil Velikov <[email protected]> | 2016-11-27 00:25:28 +0000 |
|---|---|---|
| committer | Juan A. Suarez Romero <[email protected]> | 2017-05-31 22:32:03 +0200 |
| commit | 60297c97cd297edaab9563dcd521c7a39b0e753b (patch) | |
| tree | 0db8e0d40909f2f9d585ce1080fe456ba3f8a92b /src/vulkan | |
| parent | 4c0010e93cf24aa1a0ae87c912dfa469076a2cae (diff) | |
configure: check once for DRI3 dependencies
Currently we are having the XCB_DRI3 dependencies duplicated,
partially.
Just do a once-off check and add all of the respective CFLAGS/LIBS
where needed.
As a nice side effect this helps us solve a couple of FIXMEs.
DRI3 is not a thing w/o X11 so disable it in such cases.
Cc: [email protected]
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
(cherry picked from commit acf3d2afab0571b74c0c0d1aee0f631b33fdc7da)
Signed-off-by: Juan A. Suarez Romero <[email protected]>
squashed with:
configure.ac: add xcb-fixes to the XCB DRI3 list
The XCB module is used by the VL targets. Thus omitting it can lead to
link-time errors due to unresolved symbols.
Other DRI3 users such as the Vulkan WSI and the dri3 loader helper do
not use an update region in their xcb_present_pixmap() call. We will
look into that at a later stage.
Fixes: acf3d2afab0 ("configure: check once for DRI3 dependencies")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101110
Signed-off-by: Emil Velikov <[email protected]>
(cherry picked from commit 9a90d6a9d4ee1632aa357a2ac9be150e058e2c10)
Signed-off-by: Juan A. Suarez Romero <[email protected]>
squashed with:
configure.ac: s/xcb-fixes/xcb-xfixes/
Former is not a thing, even if I have a hacked xcb-fixes.pc on my system.
Thanks for spotting it Mark!
Fixes: 9a90d6a9d4e ("configure.ac: add xcb-fixes to the XCB DRI3 list")
Signed-off-by: Emil Velikov <[email protected]>
(cherry picked from commit 48cd1919ff1584c211ec7958864cac2e1cb347cf)
Signed-off-by: Juan A. Suarez Romero <[email protected]>
Diffstat (limited to 'src/vulkan')
| -rw-r--r-- | src/vulkan/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index bd66901255d..c48245c22c9 100644 --- a/src/vulkan/Makefile.am +++ b/src/vulkan/Makefile.am @@ -44,8 +44,7 @@ AM_CPPFLAGS += \ VULKAN_WSI_SOURCES += $(VULKAN_WSI_X11_FILES) -# FIXME: Use pkg-config for X11-xcb ldflags. -VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) -lX11-xcb +VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) endif BUILT_SOURCES += $(VULKAN_WSI_WAYLAND_GENERATED_FILES) |