1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust the Wayland Vulkan configuration tests

Browse Source 
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>
This commit is contained in:
James McDonnell 2019-12-05 11:55:20 -05:00
parent 72ff196c47
commit 7b3936cd06
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/wayland/configure.json
View File

@ -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": {