Fix layer installation code #1940
Conversation
|
CI VulkanTools build queued with queue ID 83288. |
|
CI VulkanTools build # 2837 running. |
|
CI VulkanTools build # 2837 failed. |
| file(COPY ${IMAGES} DESTINATION ${CMAKE_BINARY_DIR}/layersvt/images) | ||
|
|
||
| if(CMAKE_SYSTEM_NAME STREQUAL "Windows") | ||
| add_definitions(-DVK_USE_PLATFORM_WIN32_KHR -DVK_USE_PLATFORM_WIN32_KHX -DWIN32_LEAN_AND_MEAN -DNOMINMAX) |
There was a problem hiding this comment.
VK_USE_PLATFORM_WIN32_KHX doesn't exist.
| file(COPY ${IMAGES} DESTINATION ${CMAKE_BINARY_DIR}/layersvt/images) | ||
|
|
||
| if(CMAKE_SYSTEM_NAME STREQUAL "Windows") | ||
| add_definitions(-DVK_USE_PLATFORM_WIN32_KHR -DVK_USE_PLATFORM_WIN32_KHX -DWIN32_LEAN_AND_MEAN -DNOMINMAX) | ||
| set(DisplayServer Win32) |
There was a problem hiding this comment.
DisplayServer isn't / wasn't used anywhere.
| add_compile_definitions(VK_USE_PLATFORM_ANDROID_KHR) | ||
| elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD|DragonFly|GNU") | ||
| option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) | ||
| option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON) |
There was a problem hiding this comment.
XLIB wasn't used anywhere. Only XCB for the monitor layer.
layersvt/VkLayer_basic.def
Outdated
There was a problem hiding this comment.
This file wasn't used anywhere and did nothing.
| "library_path": "@JSON_LIBRARY_PATH@", | ||
| "api_version": "@JSON_VERSION@", |
There was a problem hiding this comment.
This matches what the vulkan extension layers currently do.
| # If the target doesn't exist continue. | ||
| if (NOT TARGET "VkLayer_${test_item}") | ||
| continue() | ||
| endif() |
There was a problem hiding this comment.
Much more robust check.
| DEPENDS ${VULKAN_REGISTRY}/vk.xml ${VULKAN_REGISTRY}/generator.py ${VULKANTOOLS_SCRIPTS_DIR}/${dependency} ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py ${VULKAN_REGISTRY}/reg.py | ||
| ) | ||
| endfunction() | ||
| if(BUILD_APIDUMP) |
There was a problem hiding this comment.
Moved all the API dump code inside this block which makes it MUCH clearer what is happening.
|
CI VulkanTools build queued with queue ID 83299. |
|
CI VulkanTools build # 2838 running. |
|
CI VulkanTools build # 2838 failed. |
|
CI VulkanTools build queued with queue ID 83307. |
|
CI VulkanTools build # 2839 running. |
|
CI VulkanTools build # 2839 passed. |
CI passed. Had to fix generating PDBs on release builds. I also learned vkvia doesn't work if you set WIN32_LEAN_AND_MEAN since it uses functionality from that Windows.h |
These layers don't compile/support Apple at the moment and will fail. Just turn it off to avoid issues. |
Layers now install properly for WIN32. With PDBs for Release builds. closes #1923
|
CI VulkanTools build queued with queue ID 83335. |
|
CI VulkanTools build # 2840 running. |
| if(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD|DragonFly|GNU") | ||
| target_compile_definitions(VkLayer_api_dump PRIVATE VK_USE_PLATFORM_XLIB_KHR) | ||
|
|
||
| # Add Wayland API dump support | ||
| # target_compile_definitions(VkLayer_api_dump PRIVATE VK_USE_PLATFORM_XLIB_KHR) | ||
| endif() |
There was a problem hiding this comment.
|
CI VulkanTools build # 2840 passed. |
|
As a sanity check layer testing still works. |
closes #1923