diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools')
5 files changed, 0 insertions, 360 deletions
diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch deleted file mode 100644 index 03ca271c..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 39e4eda52783cc3a78ad5d50765d9a2a605e8217 Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 30 Aug 2016 18:01:21 +0500 -Subject: [PATCH] CMakeLists: add include path so Xlib.h is found as needed - -All the targets including vk_platform.h or directly including -X11/Xlib.h require to know the directory for the installed -header. Add the directory to these so the requirements are -filled in properly. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - CMakeLists.txt | 2 ++ - layersvt/CMakeLists.txt | 1 + - vktrace/src/vktrace_extensions/vktracevulkan/vkreplay/CMakeLists.txt | 1 + - vktrace/src/vktrace_layer/CMakeLists.txt | 1 + - vktrace/src/vktrace_replay/CMakeLists.txt | 1 + - 5 files changed, 6 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 898b0f9..b99f1c3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -185,6 +185,8 @@ find_program(GLSLANG_VALIDATOR NAMES glslangValidator - "${GLSLANG_BINARY_ROOT}/StandAlone" - "${PROJECT_SOURCE_DIR}/external/${BINDATA_DIR}") - -+find_path(X11_XLIB_INCLUDE_DIR X11/Xlib.h DOC "Path to X11/Xlib.h") -+ - find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "${EXTERNAL_SOURCE_ROOT}/glslang" - "${CMAKE_SOURCE_DIR}/../glslang" - DOC "Path to SPIRV/spirv.hpp") -diff --git a/layersvt/CMakeLists.txt b/layersvt/CMakeLists.txt -index 32ee1c4..8595418 100644 ---- a/layersvt/CMakeLists.txt -+++ b/layersvt/CMakeLists.txt -@@ -95,6 +95,7 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan - ${CMAKE_CURRENT_BINARY_DIR} - ${PROJECT_SOURCE_DIR}/../glslang/SPIRV -+ ${X11_XLIB_INCLUDE_DIR} - ) - - if (WIN32) -diff --git a/vktrace/src/vktrace_extensions/vktracevulkan/vkreplay/CMakeLists.txt b/vktrace/src/vktrace_extensions/vktracevulkan/vkreplay/CMakeLists.txt -index a62dc69..209ecf5 100644 ---- a/vktrace/src/vktrace_extensions/vktracevulkan/vkreplay/CMakeLists.txt -+++ b/vktrace/src/vktrace_extensions/vktracevulkan/vkreplay/CMakeLists.txt -@@ -52,6 +52,7 @@ include_directories( - ${CODEGEN_VKTRACE_DIR} - ${VKTRACE_VULKAN_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../vulkan/codegen_utils -+ ${X11_XLIB_INCLUDE_DIR} - ) - # needed for vktraceviewer_vk library which is shared - if (NOT MSVC) -diff --git a/vktrace/src/vktrace_layer/CMakeLists.txt b/vktrace/src/vktrace_layer/CMakeLists.txt -index 88e15e8..864ec20 100644 ---- a/vktrace/src/vktrace_layer/CMakeLists.txt -+++ b/vktrace/src/vktrace_layer/CMakeLists.txt -@@ -82,6 +82,7 @@ include_directories( - ${VKTRACE_VULKAN_INCLUDE_DIR} - ${CODEGEN_UTILS_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/../../../layersvt -+ ${X11_XLIB_INCLUDE_DIR} - ) - # copy/link layer json file into build/layersvt directory - if (NOT WIN32) -diff --git a/vktrace/src/vktrace_replay/CMakeLists.txt b/vktrace/src/vktrace_replay/CMakeLists.txt -index 5bc1807..4fdeb19 100644 ---- a/vktrace/src/vktrace_replay/CMakeLists.txt -+++ b/vktrace/src/vktrace_replay/CMakeLists.txt -@@ -18,6 +18,7 @@ include_directories( - ${SRC_DIR}/vktrace_common - ${SRC_DIR}/thirdparty - ${CMAKE_CURRENT_SOURCE_DIR}/../vktrace_extensions/vktracevulkan/vkreplay/ -+ ${X11_XLIB_INCLUDE_DIR} - ) - - set (LIBRARIES vktrace_common vulkan_replay) -diff --git a/vktrace/src/vktrace_common/CMakeLists.txt b/vktrace/src/vktrace_common/CMakeLists.txt -index 07ffba7..8fcbb39 100644 ---- a/vktrace/src/vktrace_common/CMakeLists.txt -+++ b/vktrace/src/vktrace_common/CMakeLists.txt -@@ -6,6 +6,7 @@ include(${SRC_DIR}/build_options.cmake) - include_directories( - ${SRC_DIR}/vktrace_common - ${SRC_DIR}/thirdparty -+ ${X11_XLIB_INCLUDE_DIR} - ) - - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") -diff --git a/vktrace/src/vktrace_trace/CMakeLists.txt b/vktrace/src/vktrace_trace/CMakeLists.txt -index 63ba576..b1c56b3 100644 ---- a/vktrace/src/vktrace_trace/CMakeLists.txt -+++ b/vktrace/src/vktrace_trace/CMakeLists.txt -@@ -16,6 +16,7 @@ include_directories( - ${SRC_DIR} - ${SRC_DIR}/vktrace_common - ${SRC_DIR}/vktrace_trace -+ ${X11_XLIB_INCLUDE_DIR} - ) - - add_executable(${PROJECT_NAME} ${SRC_LIST}) --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0002-obey-CMAKE_INSTALL_LIBDIR.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0002-obey-CMAKE_INSTALL_LIBDIR.patch deleted file mode 100644 index 831b002c..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0002-obey-CMAKE_INSTALL_LIBDIR.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 37c8ca7031c2a70111b39c6d2b545946ee5dbb9d Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 30 Aug 2016 18:07:36 +0500 -Subject: [PATCH] obey CMAKE_INSTALL_LIBDIR - -The CMAKE_INSTALL_* directories provide a mechanism to -relocate installations so rather than doing this through -hardcoded variable they should be used whereever possible. -This fixes installation to required directory. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - layers/CMakeLists.txt | 4 ++-- - layersvt/CMakeLists.txt | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt -index 076b847..cfab1bf 100644 ---- a/layers/CMakeLists.txt -+++ b/layers/CMakeLists.txt -@@ -81,7 +81,7 @@ else() - target_link_Libraries(VkLayer_${target} VkLayer_utils) - add_dependencies(VkLayer_${target} generate_vk_layer_helpers) - set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic") -- install(TARGETS VkLayer_${target} DESTINATION ${PROJECT_BINARY_DIR}/install_staging) -+ install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endmacro() - endif() - -@@ -148,7 +148,7 @@ if (WIN32) - add_library(VkLayer_utils STATIC vk_layer_config.cpp vk_layer_extension_utils.cpp vk_layer_utils.cpp) - else() - add_library(VkLayer_utils SHARED vk_layer_config.cpp vk_layer_extension_utils.cpp vk_layer_utils.cpp) -- install(TARGETS VkLayer_utils DESTINATION ${PROJECT_BINARY_DIR}/install_staging) -+ install(TARGETS VkLayer_utils DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - add_vk_layer(core_validation core_validation.cpp vk_layer_table.cpp vk_safe_struct.cpp descriptor_sets.cpp) -diff --git a/layersvt/CMakeLists.txt b/layersvt/CMakeLists.txt -index 8595418..ae05d07 100644 ---- a/layersvt/CMakeLists.txt -+++ b/layersvt/CMakeLists.txt -@@ -84,7 +84,7 @@ else() - target_link_Libraries(VkLayer_${target} VkLayer_utilsvt) - add_dependencies(VkLayer_${target} generate_vt_helpers) - set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic") -- install(TARGETS VkLayer_${target} DESTINATION ${PROJECT_BINARY_DIR}/install_staging) -+ install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endmacro() - endif() - -@@ -166,7 +166,7 @@ if (WIN32) - add_library(VkLayer_utilsvt STATIC ../layers/vk_layer_config.cpp ../layers/vk_layer_extension_utils.cpp ../layers/vk_layer_utils.cpp) - else() - add_library(VkLayer_utilsvt SHARED ../layers/vk_layer_config.cpp ../layers/vk_layer_extension_utils.cpp ../layers/vk_layer_utils.cpp) -- install(TARGETS VkLayer_utilsvt DESTINATION ${PROJECT_BINARY_DIR}/install_staging) -+ install(TARGETS VkLayer_utilsvt DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - # VulkanTools layers --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0003-vktrace-do-not-link-to-internal-loader.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0003-vktrace-do-not-link-to-internal-loader.patch deleted file mode 100644 index 358476db..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0003-vktrace-do-not-link-to-internal-loader.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c4f0f4f404c1502489814b9ad0bf04571d0a4e1c Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 30 Aug 2016 18:25:09 +0500 -Subject: [PATCH] vktrace: do not link to internal loader - -The binaries are being linked to the internally -generated libvulkan.so which causes rpath issues -at the end. -We fix this by linking to the originally generated -lib through vulkan-loader-layers package. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - vktrace/src/vktrace_extensions/vktracevulkan/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vktrace/src/vktrace_extensions/vktracevulkan/CMakeLists.txt b/vktrace/src/vktrace_extensions/vktracevulkan/CMakeLists.txt -index a55ab31..9a2c4e9 100644 ---- a/vktrace/src/vktrace_extensions/vktracevulkan/CMakeLists.txt -+++ b/vktrace/src/vktrace_extensions/vktracevulkan/CMakeLists.txt -@@ -41,7 +41,7 @@ endif() - - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(VKTRACE_VULKAN_LIB -- ${CMAKE_BINARY_DIR}/loader/libvulkan.so -+ libvulkan.so - ) - - endif() --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0004-json-correct-layer-lib-paths.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0004-json-correct-layer-lib-paths.patch deleted file mode 100644 index 0abb46c0..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0004-json-correct-layer-lib-paths.patch +++ /dev/null @@ -1,123 +0,0 @@ -From aaff9ad0ed300f985e82028eafc107ddbb58abe8 Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Wed, 31 Aug 2016 15:27:06 +0500 -Subject: [PATCH] json: correct layer lib paths - -Rather than using a hardcoded ./ path for the libraries -we should use loose paths so the system could search -on its own when the library is required. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - layersvt/linux/VkLayer_api_dump.json | 2 +- - layersvt/linux/VkLayer_basic.json | 2 +- - layersvt/linux/VkLayer_basic_implicit.json | 2 +- - layersvt/linux/VkLayer_generic.json | 2 +- - layersvt/linux/VkLayer_multi.json | 4 ++-- - layersvt/linux/VkLayer_screenshot.json | 2 +- - vktrace/src/vktrace_layer/linux/VkLayer_vktrace_layer.json | 2 +- - 7 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/layersvt/linux/VkLayer_api_dump.json b/layersvt/linux/VkLayer_api_dump.json -index c8e9c8d..450be73 100644 ---- a/layersvt/linux/VkLayer_api_dump.json -+++ b/layersvt/linux/VkLayer_api_dump.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_LUNARG_api_dump", - "type": "GLOBAL", -- "library_path": "./libVkLayer_api_dump.so", -+ "library_path": "libVkLayer_api_dump.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG debug layer" -diff --git a/layersvt/linux/VkLayer_basic.json b/layersvt/linux/VkLayer_basic.json -index b298f10..5cb893a 100644 ---- a/layersvt/linux/VkLayer_basic.json -+++ b/layersvt/linux/VkLayer_basic.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_LUNARG_basic", - "type": "GLOBAL", -- "library_path": "./libVkLayer_basic.so", -+ "library_path": "libVkLayer_basic.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG Sample Layer", -diff --git a/layersvt/linux/VkLayer_basic_implicit.json b/layersvt/linux/VkLayer_basic_implicit.json -index 50e08c3..ca9014b 100644 ---- a/layersvt/linux/VkLayer_basic_implicit.json -+++ b/layersvt/linux/VkLayer_basic_implicit.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_LUNARG_basic", - "type": "GLOBAL", -- "library_path": "/etc/vulkan/implicit_layer.d/libVkLayer_basic.so", -+ "library_path": "libVkLayer_basic.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG Sample Layer", -diff --git a/layersvt/linux/VkLayer_generic.json b/layersvt/linux/VkLayer_generic.json -index df8fa17..8f3b993 100644 ---- a/layersvt/linux/VkLayer_generic.json -+++ b/layersvt/linux/VkLayer_generic.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_LUNARG_generic", - "type": "GLOBAL", -- "library_path": "./libVkLayer_generic.so", -+ "library_path": "libVkLayer_generic.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG Sample Layer" -diff --git a/layersvt/linux/VkLayer_multi.json b/layersvt/linux/VkLayer_multi.json -index 517ea7e..e81af70 100644 ---- a/layersvt/linux/VkLayer_multi.json -+++ b/layersvt/linux/VkLayer_multi.json -@@ -4,7 +4,7 @@ - { - "name": "VK_LAYER_LUNARG_multi1", - "type": "INSTANCE", -- "library_path": "./libVkLayer_multi.so", -+ "library_path": "libVkLayer_multi.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG Sample multiple layer per library", -@@ -16,7 +16,7 @@ - { - "name": "VK_LAYER_LUNARG_multi2", - "type": "INSTANCE", -- "library_path": "./libVkLayer_multi.so", -+ "library_path": "libVkLayer_multi.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG Sample multiple layer per library", -diff --git a/layersvt/linux/VkLayer_screenshot.json b/layersvt/linux/VkLayer_screenshot.json -index 28773b9..e9b21fb 100644 ---- a/layersvt/linux/VkLayer_screenshot.json -+++ b/layersvt/linux/VkLayer_screenshot.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_LUNARG_screenshot", - "type": "GLOBAL", -- "library_path": "./libVkLayer_screenshot.so", -+ "library_path": "libVkLayer_screenshot.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG image capture layer" -diff --git a/vktrace/src/vktrace_layer/linux/VkLayer_vktrace_layer.json b/vktrace/src/vktrace_layer/linux/VkLayer_vktrace_layer.json -index 0dcdc6b..9ba98e6 100644 ---- a/vktrace/src/vktrace_layer/linux/VkLayer_vktrace_layer.json -+++ b/vktrace/src/vktrace_layer/linux/VkLayer_vktrace_layer.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_LUNARG_vktrace", - "type": "GLOBAL", -- "library_path": "../vktrace/libVkLayer_vktrace_layer.so", -+ "library_path": "libVkLayer_vktrace_layer.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "Vktrace tracing library", --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch deleted file mode 100644 index d665785d..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 233ba185542405bc38ecb01d1dd90881056291cf Mon Sep 17 00:00:00 2001 -From: Ahsan Hussain <ahsan_hussain@mentor.com> -Date: Tue, 19 Sep 2017 13:59:27 +0500 -Subject: [PATCH 1/1] CMakeLists: add include paths for xcb and Xlib - ---- - vktrace/src/vktrace_viewer/CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/vktrace/src/vktrace_viewer/CMakeLists.txt b/vktrace/src/vktrace_viewer/CMakeLists.txt -index dfe2a48..7fbfa12 100644 ---- a/vktrace/src/vktrace_viewer/CMakeLists.txt -+++ b/vktrace/src/vktrace_viewer/CMakeLists.txt -@@ -22,6 +22,9 @@ else() - find_package(Threads REQUIRED) - find_package(X11 REQUIRED) - -+find_path(XCB_INCLUDE_DIR xcb/xcb.h DOC "Path to xcb/xcb.h") -+find_path(X11_XLIB_INCLUDE_DIR X11/Xlib.h DOC "Path to X11/Xlib.h") -+ - require_pthreads() - - include_directories( -@@ -33,6 +36,8 @@ include_directories( - ${SRC_DIR}/vktrace_viewer - ${CMAKE_CURRENT_BINARY_DIR} - ${Qt5Widgets_INCLUDE_DIRS} -+ ${X11_XLIB_INCLUDE_DIR} -+ ${XCB_INCLUDE_DIR} - ) - - set(SRC_LIST --- -2.11.1 - |