diff options
| author | James McDonnell <jmcdonnell@blackberry.com> | 2019-12-05 11:55:20 -0500 |
|---|---|---|
| committer | James McDonnell <jmcdonnell@blackberry.com> | 2019-12-06 13:35:38 -0500 |
| commit | e0ceb66ebb47f693051f079d30d2e5de72fbd5b3 (patch) | |
| tree | 7a2826bf6e7eea4ceb91b9bfde3ff61a8cf4e800 | |
| parent | 38313a188da3e1c644cca9826fb01b230bf8caa0 (diff) | |
Adjust the Wayland Vulkan configuration tests
Define VK_USE_PLATFORM_WAYLAND_KHR before the vulkan.h include so
the test will fail if the Wayland WSI header doesn't exist.
Require features.vulkan so that vulkan related code won't build
when --disable-vulkan is used.
Change-Id: I275efcb3e728b59c6f99598c235074b941f1fbf0
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| -rw-r--r-- | src/client/configure.json | 5 | ||||
| -rw-r--r-- | src/compositor/configure.json | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/client/configure.json b/src/client/configure.json index f49beaf70..94a1531d7 100644 --- a/src/client/configure.json +++ b/src/client/configure.json @@ -155,6 +155,9 @@ "label": "Vulkan Buffer Sharing", "type": "compile", "test": { + "head": [ + "#define VK_USE_PLATFORM_WAYLAND_KHR 1" + ], "include": [ "vulkan/vulkan.h" ], @@ -250,7 +253,7 @@ }, "wayland-vulkan-server-buffer": { "label": "Vulkan-based server buffer integration", - "condition": "features.wayland-client && features.opengl && features.egl && tests.vulkan-server-buffer", + "condition": "features.wayland-client && features.vulkan && features.opengl && features.egl && tests.vulkan-server-buffer", "output": [ "privateFeature" ] }, "wayland-shm-emulation-server-buffer": { diff --git a/src/compositor/configure.json b/src/compositor/configure.json index 5bbcec287..42df2ddf0 100644 --- a/src/compositor/configure.json +++ b/src/compositor/configure.json @@ -181,6 +181,9 @@ "label": "Vulkan Buffer Sharing", "type": "compile", "test": { + "head": [ + "#define VK_USE_PLATFORM_WAYLAND_KHR 1" + ], "include": [ "vulkan/vulkan.h" ], @@ -246,7 +249,7 @@ }, "wayland-vulkan-server-buffer": { "label": "Vulkan-based server buffer integration", - "condition": "features.wayland-server && features.opengl && features.egl && tests.vulkan-server-buffer", + "condition": "features.wayland-server && features.vulkan && features.opengl && features.egl && tests.vulkan-server-buffer", "output": [ "privateFeature" ] }, "wayland-shm-emulation-server-buffer": { |