diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-graphics/lunarg-sdk')
22 files changed, 0 insertions, 1481 deletions
diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/glslang/0001-CMakeLists.txt-obey-CMAKE_INSTALL_LIBDIR.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/glslang/0001-CMakeLists.txt-obey-CMAKE_INSTALL_LIBDIR.patch deleted file mode 100644 index cef3e8e6..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/glslang/0001-CMakeLists.txt-obey-CMAKE_INSTALL_LIBDIR.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 372422ed8ce32e1085cd524156c687df65095237 Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 25 Oct 2016 14:44:20 +0500 -Subject: [PATCH] CMakeLists.txt: obey CMAKE_INSTALL_LIBDIR - -Not using the exact path that is set through cmake -will end up in a mixed configuration setup where -files are installed on hard-coded locations. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - OGLCompilersDLL/CMakeLists.txt | 2 +- - SPIRV/CMakeLists.txt | 2 +- - glslang/CMakeLists.txt | 2 +- - glslang/OSDependent/Unix/CMakeLists.txt | 2 +- - glslang/OSDependent/Windows/CMakeLists.txt | 2 +- - hlsl/CMakeLists.txt | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt -index 4954db9..6b518d9 100644 ---- a/OGLCompilersDLL/CMakeLists.txt -+++ b/OGLCompilersDLL/CMakeLists.txt -@@ -8,4 +8,4 @@ if(WIN32) - endif(WIN32) - - install(TARGETS OGLCompiler -- ARCHIVE DESTINATION lib) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index 48a6c46..c657d56 100755 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -41,4 +41,4 @@ if(WIN32) - endif(WIN32) - - install(TARGETS SPIRV SPVRemapper -- ARCHIVE DESTINATION lib) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index ff91135..efb7f15 100644 ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -89,4 +89,4 @@ if(WIN32) - endif(WIN32) - - install(TARGETS glslang -- ARCHIVE DESTINATION lib) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt -index 174cc91..d98057b 100644 ---- a/glslang/OSDependent/Unix/CMakeLists.txt -+++ b/glslang/OSDependent/Unix/CMakeLists.txt -@@ -2,4 +2,4 @@ add_library(OSDependent STATIC ossource.cpp ../osinclude.h) - set_property(TARGET OSDependent PROPERTY FOLDER glslang) - - install(TARGETS OSDependent -- ARCHIVE DESTINATION lib) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt -index 399760c..744bcbb 100644 ---- a/glslang/OSDependent/Windows/CMakeLists.txt -+++ b/glslang/OSDependent/Windows/CMakeLists.txt -@@ -14,4 +14,4 @@ if(WIN32) - endif(WIN32) - - install(TARGETS OSDependent -- ARCHIVE DESTINATION lib) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt -index c7537e2..5111661 100755 ---- a/hlsl/CMakeLists.txt -+++ b/hlsl/CMakeLists.txt -@@ -23,4 +23,4 @@ if(WIN32) - endif(WIN32) - - install(TARGETS HLSL -- ARCHIVE DESTINATION lib) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/glslang_git.bb b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/glslang_git.bb deleted file mode 100644 index 15852cac..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/glslang_git.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "An OpenGL and OpenGL ES shader front end and validator." -DESCRIPTION = "Glslang is the official reference compiler front end \ - for the OpenGL ES and OpenGL shading languages. It \ - implements a strict interpretation of the specifications \ - for these languages. It is open and free for anyone to use, \ - either from a command line or programmatically." -SECTION = "graphics" -HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" - -inherit cmake - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://glslang/Include/Types.h;beginline=1;endline=36;md5=6639a5f9543e833d71e2f4e4ff52f34b" - -S = "${WORKDIR}/git" - -SRCREV = "81cd764b5ffc475bc73f1fb35f75fd1171bb2343" -SRC_URI = "git://github.com/KhronosGroup/glslang \ - file://0001-CMakeLists.txt-obey-CMAKE_INSTALL_LIBDIR.patch" - -FILES_${PN} += "${libdir}/*" - -BBCLASSEXTEND = "native nativesdk" - -do_install_append() { - # Some of the vulkan samples/test require these headers - install -d ${D}${includedir}/SPIRV - cp -f ${S}/SPIRV/GlslangToSpv.h ${D}${includedir}/SPIRV - cp -f ${S}/SPIRV/Logger.h ${D}${includedir}/SPIRV - cp -f ${S}/SPIRV/SPVRemapper.h ${D}${includedir}/SPIRV - cp -f ${S}/SPIRV/spvIR.h ${D}${includedir}/SPIRV - - install -d ${D}${includedir}/glslang/Include - cp -f ${S}/glslang/Include/*.h ${D}${includedir}/glslang/Include - install -d ${D}${includedir}/glslang/Public - cp -f ${S}/glslang/Public/*.h ${D}${includedir}/glslang/Public - install -d ${D}${includedir}/glslang/MachineIndependent - cp -f ${S}/glslang/MachineIndependent/Versions.h ${D}${includedir}/glslang/MachineIndependent -} diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/spirv-tools/0001-obey-CMAKE_INSTALL_LIBDIR.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/spirv-tools/0001-obey-CMAKE_INSTALL_LIBDIR.patch deleted file mode 100644 index d1f0f3b1..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/spirv-tools/0001-obey-CMAKE_INSTALL_LIBDIR.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a6b250054e5bc27b87414c860c9b808a4beef552 Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 16 Aug 2016 16:07:45 +0500 -Subject: [PATCH] obey CMAKE_INSTALL_LIBDIR - -If the path to CMAKE_INSTALL_LIBDIR is not followed appropriately -the installation will not work correctly on a multilib platofrm. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - source/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index de227d6..73672a1 100644 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -198,5 +198,5 @@ target_include_directories(${SPIRV_TOOLS} - - install(TARGETS ${SPIRV_TOOLS} - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/spirv-tools/0002-spirv-lesspipe.sh-allow-using-generic-shells.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/spirv-tools/0002-spirv-lesspipe.sh-allow-using-generic-shells.patch deleted file mode 100644 index 2d51f2fd..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/spirv-tools/0002-spirv-lesspipe.sh-allow-using-generic-shells.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 93a770330aa21c91a9b7fce798b73d31cad8f16a Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 25 Oct 2016 16:12:08 +0500 -Subject: [PATCH] spirv-lesspipe.sh: allow using generic shells - -The script is harmless for any type of shell and -shouldn't be tied with bash to allow catering -more possibilities. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - tools/lesspipe/spirv-lesspipe.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/lesspipe/spirv-lesspipe.sh b/tools/lesspipe/spirv-lesspipe.sh -index 05831d1..4e98fee 100644 ---- a/tools/lesspipe/spirv-lesspipe.sh -+++ b/tools/lesspipe/spirv-lesspipe.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # Copyright (c) 2016 The Khronos Group Inc. - # --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/spirv-tools_git.bb b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/spirv-tools_git.bb deleted file mode 100644 index f9563366..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/spirv-tools_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "SPIR-V Tools" -DESCRIPTION = "SPIR-V is a binary intermediate language for representing \ - graphical-shader stages and compute kernels for multiple \ - Khronos APIs, such as OpenCL, OpenGL, and Vulkan." -SECTION = "graphics" -HOMEPAGE = "https://www.khronos.org/registry/spir-v" - -inherit cmake python3native - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ce523927d7bcd789d6c3af579d03ad73" - -S = "${WORKDIR}/git" -SPIRV_HEADERS_LOCATION = "${S}/external/spirv-headers" -HEADERS_VERSION = "1.1" - -SRCREV_spirv-tools = "923a4596b44831a07060df45caacb522613730c9" -SRCREV_spirv-headers = "33d41376d378761ed3a4c791fc4b647761897f26" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools;protocol=http;name=spirv-tools \ - git://github.com/KhronosGroup/SPIRV-Headers;name=spirv-headers;destsuffix=${SPIRV_HEADERS_LOCATION} \ - file://0001-obey-CMAKE_INSTALL_LIBDIR.patch \ - file://0002-spirv-lesspipe.sh-allow-using-generic-shells.patch" - -do_install_append() { - if test -d ${SPIRV_HEADERS_LOCATION}/include/spirv/${HEADERS_VERSION}; then - install -d ${D}/${includedir}/SPIRV - install -m 0644 ${SPIRV_HEADERS_LOCATION}/include/spirv/${HEADERS_VERSION}/* ${D}/${includedir}/SPIRV - fi -} diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch deleted file mode 100644 index 05fbd360..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 32f2777c9cc8f7dfc8b1e0c6894191167e76d5c4 Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 16 Aug 2016 19:35:35 +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 ++ - demos/CMakeLists.txt | 2 +- - layers/CMakeLists.txt | 1 + - libs/vkjson/CMakeLists.txt | 1 + - loader/CMakeLists.txt | 1 + - 5 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 263002e..20e9fd6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -190,6 +190,8 @@ find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "${EXTERNAL_SOURC - "${EXTERNAL_SOURCE_ROOT}/source/spirv-tools/external/include" - DOC "Path to spirv-tools/libspirv.h") - -+find_path(X11_XLIB_INCLUDE_DIR X11/Xlib.h DOC "Path to X11/Xlib.h") -+ - find_library(GLSLANG_LIB NAMES glslang - HINTS ${GLSLANG_SEARCH_PATH} ) - -diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt -index 26e86fb..9fdabf8 100644 ---- a/demos/CMakeLists.txt -+++ b/demos/CMakeLists.txt -@@ -92,7 +92,7 @@ if(NOT WIN32) - link_libraries(${XCB_LIBRARIES}) - endif() - if(BUILD_WSI_XLIB_SUPPORT) -- include_directories(${X11_INCLUDE_DIRS}) -+ include_directories(${X11_INCLUDE_DIRS} ${X11_XLIB_INCLUDE_DIR}) - link_libraries(${X11_LIBRARIES}) - endif() - if(BUILD_WSI_WAYLAND_SUPPORT) -diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt -index 076b847..b384803 100644 ---- a/layers/CMakeLists.txt -+++ b/layers/CMakeLists.txt -@@ -90,6 +90,7 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../loader - ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan - ${CMAKE_CURRENT_BINARY_DIR} -+ ${X11_XLIB_INCLUDE_DIR} - ) - - if (WIN32) -diff --git a/libs/vkjson/CMakeLists.txt b/libs/vkjson/CMakeLists.txt -index fc69bb6..fe5e814 100644 ---- a/libs/vkjson/CMakeLists.txt -+++ b/libs/vkjson/CMakeLists.txt -@@ -26,6 +26,7 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../../loader - ${CMAKE_CURRENT_SOURCE_DIR}/../../include/vulkan -+ ${X11_XLIB_INCLUDE_DIR} - ) - - add_library(vkjson STATIC vkjson.cc vkjson_instance.cc ../../loader/cJSON.c) -diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt -index a4d2b21..227162c 100644 ---- a/loader/CMakeLists.txt -+++ b/loader/CMakeLists.txt -@@ -1,6 +1,7 @@ - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -+ ${X11_XLIB_INCLUDE_DIR} - ) - - if (WIN32) --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0003-obey-CMAKE_INSTALL_LIBDIR.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0003-obey-CMAKE_INSTALL_LIBDIR.patch deleted file mode 100644 index 3ede3bac..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0003-obey-CMAKE_INSTALL_LIBDIR.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 52231c657cb1241cee099ca2626c1eebcc944e4e Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Wed, 17 Aug 2016 13:25:36 +0500 -Subject: [PATCH 1/2] 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 ++-- - tests/layers/CMakeLists.txt | 2 +- - 2 files changed, 3 insertions(+), 3 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/tests/layers/CMakeLists.txt b/tests/layers/CMakeLists.txt -index 87d7793..f62e054 100644 ---- a/tests/layers/CMakeLists.txt -+++ b/tests/layers/CMakeLists.txt -@@ -49,7 +49,7 @@ else() - add_library(VkLayer_${target} SHARED ${ARGN}) - 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() - --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0004-install-the-vulkan-loader.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0004-install-the-vulkan-loader.patch deleted file mode 100644 index 68026245..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0004-install-the-vulkan-loader.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d30812f7afc355269df0edd5d4f030d470192cad Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Wed, 17 Aug 2016 13:28:32 +0500 -Subject: [PATCH 2/2] install the vulkan loader - -The vulkan loader is an essential component so it should -be installed to the directory that is intended to be -pushed to the target. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - loader/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt -index a4d2b21..2790faa 100644 ---- a/loader/CMakeLists.txt -+++ b/loader/CMakeLists.txt -@@ -84,4 +84,5 @@ else() - add_library(vulkan SHARED ${LOADER_SRCS}) - set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "1.0.26") - target_link_libraries(vulkan -ldl -lpthread -lm) -+ install(TARGETS vulkan DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0005-install-demos.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0005-install-demos.patch deleted file mode 100644 index 08f0f8f0..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0005-install-demos.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 15f3a15ce6d65714f7901eab118a13d9d70a9a3b Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 30 Aug 2016 15:17:55 +0500 -Subject: [PATCH] install demos - -Install demos to the target. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - demos/CMakeLists.txt | 2 ++ - demos/smoke/CMakeLists.txt | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt -index 9fdabf8..42e5499 100644 ---- a/demos/CMakeLists.txt -+++ b/demos/CMakeLists.txt -@@ -136,5 +136,8 @@ else() - target_link_libraries(cube ${LIBRARIES} ) - endif() - -+install(TARGETS cube DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(TARGETS tri DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(TARGETS vulkaninfo DESTINATION ${CMAKE_INSTALL_BINDIR}) - add_subdirectory(smoke) - -diff --git a/demos/smoke/CMakeLists.txt b/demos/smoke/CMakeLists.txt -index 4dc90cd..415ac2f 100644 ---- a/demos/smoke/CMakeLists.txt -+++ b/demos/smoke/CMakeLists.txt -@@ -85,3 +85,5 @@ add_executable(smoketest ${sources}) - target_compile_definitions(smoketest ${definitions}) - target_include_directories(smoketest ${includes}) - target_link_libraries(smoketest ${libraries}) -+ -+install(TARGETS smoketest DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/libs/vkjson/CMakeLists.txt b/libs/vkjson/CMakeLists.txt -index 4c0aef8..9b03d3d 100644 ---- a/libs/vkjson/CMakeLists.txt -+++ b/libs/vkjson/CMakeLists.txt -@@ -32,6 +32,8 @@ if(UNIX) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare") - add_executable(vkjson_unittest vkjson_unittest.cc) - add_executable(vkjson_info vkjson_info.cc) -+ install(TARGETS vkjson_unittest DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS vkjson_info DESTINATION ${CMAKE_INSTALL_BINDIR}) - else() - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") - add_executable(vkjson_unittest vkjson_unittest.cc) --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0006-json-correct-layer-lib-paths.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0006-json-correct-layer-lib-paths.patch deleted file mode 100644 index 54d092ba..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0006-json-correct-layer-lib-paths.patch +++ /dev/null @@ -1,114 +0,0 @@ -From e66538f44c606d9f6c2ada9d78b310343e4386da Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Wed, 31 Aug 2016 15:13:28 +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> ---- - layers/linux/VkLayer_core_validation.json | 2 +- - layers/linux/VkLayer_image.json | 2 +- - layers/linux/VkLayer_object_tracker.json | 2 +- - layers/linux/VkLayer_parameter_validation.json | 2 +- - layers/linux/VkLayer_swapchain.json | 2 +- - layers/linux/VkLayer_threading.json | 2 +- - layers/linux/VkLayer_unique_objects.json | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/layers/linux/VkLayer_core_validation.json b/layers/linux/VkLayer_core_validation.json -index 3f2162d..c0ef9b7 100644 ---- a/layers/linux/VkLayer_core_validation.json -+++ b/layers/linux/VkLayer_core_validation.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_LUNARG_core_validation", - "type": "GLOBAL", -- "library_path": "./libVkLayer_core_validation.so", -+ "library_path": "libVkLayer_core_validation.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG Validation Layer", -diff --git a/layers/linux/VkLayer_image.json b/layers/linux/VkLayer_image.json -index 97a250e..6fa3bbd 100644 ---- a/layers/linux/VkLayer_image.json -+++ b/layers/linux/VkLayer_image.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_LUNARG_image", - "type": "GLOBAL", -- "library_path": "./libVkLayer_image.so", -+ "library_path": "libVkLayer_image.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG Validation Layer", -diff --git a/layers/linux/VkLayer_object_tracker.json b/layers/linux/VkLayer_object_tracker.json -index 1c5d79b..49e5a29 100644 ---- a/layers/linux/VkLayer_object_tracker.json -+++ b/layers/linux/VkLayer_object_tracker.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_LUNARG_object_tracker", - "type": "GLOBAL", -- "library_path": "./libVkLayer_object_tracker.so", -+ "library_path": "libVkLayer_object_tracker.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG Validation Layer", -diff --git a/layers/linux/VkLayer_parameter_validation.json b/layers/linux/VkLayer_parameter_validation.json -index 899ea88..6df74f8 100644 ---- a/layers/linux/VkLayer_parameter_validation.json -+++ b/layers/linux/VkLayer_parameter_validation.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_LUNARG_parameter_validation", - "type": "GLOBAL", -- "library_path": "./libVkLayer_parameter_validation.so", -+ "library_path": "libVkLayer_parameter_validation.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG Validation Layer", -diff --git a/layers/linux/VkLayer_swapchain.json b/layers/linux/VkLayer_swapchain.json -index 5fe0ef8..6d0b500 100644 ---- a/layers/linux/VkLayer_swapchain.json -+++ b/layers/linux/VkLayer_swapchain.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_LUNARG_swapchain", - "type": "GLOBAL", -- "library_path": "./libVkLayer_swapchain.so", -+ "library_path": "libVkLayer_swapchain.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "LunarG Validation Layer", -diff --git a/layers/linux/VkLayer_threading.json b/layers/linux/VkLayer_threading.json -index 59feb59..fd6bedf 100644 ---- a/layers/linux/VkLayer_threading.json -+++ b/layers/linux/VkLayer_threading.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_GOOGLE_threading", - "type": "GLOBAL", -- "library_path": "./libVkLayer_threading.so", -+ "library_path": "libVkLayer_threading.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "Google Validation Layer", -diff --git a/layers/linux/VkLayer_unique_objects.json b/layers/linux/VkLayer_unique_objects.json -index 59e1f89..72b77ee 100644 ---- a/layers/linux/VkLayer_unique_objects.json -+++ b/layers/linux/VkLayer_unique_objects.json -@@ -3,7 +3,7 @@ - "layer" : { - "name": "VK_LAYER_GOOGLE_unique_objects", - "type": "GLOBAL", -- "library_path": "./libVkLayer_unique_objects.so", -+ "library_path": "libVkLayer_unique_objects.so", - "api_version": "1.0.26", - "implementation_version": "1", - "description": "Google Validation Layer" --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0008-demos-make-shader-location-relative.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0008-demos-make-shader-location-relative.patch deleted file mode 100644 index 16409b57..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0008-demos-make-shader-location-relative.patch +++ /dev/null @@ -1,261 +0,0 @@ -From 4e68da29ebc45a41845d7127979878930b4c170b Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Mon, 5 Sep 2016 15:47:16 +0500 -Subject: [PATCH 1/2] demos: make shader location relative - -The demo binaries expect the shader (frag/vert.spv) -location to be PWD so a user has to cd to /usr/bin -if the binaries are installed there in order to -run them correctly. -This patch tries to find the location of the binary -and then assumes that the shaders are located in the -same location as the binary so a user can install -everything to a single dir and that will work. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - demos/cube.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------ - demos/tri.c | 49 ++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 105 insertions(+), 8 deletions(-) - -diff --git a/demos/cube.c b/demos/cube.c -index 6017444..f79bc59 100644 ---- a/demos/cube.c -+++ b/demos/cube.c -@@ -29,6 +29,7 @@ - #include <stdbool.h> - #include <assert.h> - #include <signal.h> -+#include <unistd.h> - #if defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_XCB_KHR) - #include <X11/Xutil.h> - #endif -@@ -415,6 +416,8 @@ struct demo { - - uint32_t current_buffer; - uint32_t queue_count; -+ -+ char bin_path[255]; - }; - - VKAPI_ATTR VkBool32 VKAPI_CALL -@@ -1206,18 +1209,25 @@ static void demo_prepare_textures(struct demo *demo) { - const VkFormat tex_format = VK_FORMAT_R8G8B8A8_UNORM; - VkFormatProperties props; - uint32_t i; -+ char tex_file[255]; - - vkGetPhysicalDeviceFormatProperties(demo->gpu, tex_format, &props); - - for (i = 0; i < DEMO_TEXTURE_COUNT; i++) { - VkResult U_ASSERT_ONLY err; -- -+ if (strlen(demo->bin_path) > 0) { -+ strcpy(tex_file, demo->bin_path); -+ strcat(tex_file, "/"); -+ strcat(tex_file, tex_files[i]); -+ } -+ else -+ strcpy(tex_file, tex_files[i]); - if ((props.linearTilingFeatures & - VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT) && - !demo->use_staging_buffer) { - /* Device can texture using linear textures */ - demo_prepare_texture_image( -- demo, tex_files[i], &demo->textures[i], VK_IMAGE_TILING_LINEAR, -+ demo, tex_file, &demo->textures[i], VK_IMAGE_TILING_LINEAR, - VK_IMAGE_USAGE_SAMPLED_BIT, - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | - VK_MEMORY_PROPERTY_HOST_COHERENT_BIT); -@@ -1228,13 +1238,13 @@ static void demo_prepare_textures(struct demo *demo) { - - memset(&staging_texture, 0, sizeof(staging_texture)); - demo_prepare_texture_image( -- demo, tex_files[i], &staging_texture, VK_IMAGE_TILING_LINEAR, -+ demo, tex_file, &staging_texture, VK_IMAGE_TILING_LINEAR, - VK_IMAGE_USAGE_TRANSFER_SRC_BIT, - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | - VK_MEMORY_PROPERTY_HOST_COHERENT_BIT); - - demo_prepare_texture_image( -- demo, tex_files[i], &demo->textures[i], VK_IMAGE_TILING_OPTIMAL, -+ demo, tex_file, &demo->textures[i], VK_IMAGE_TILING_OPTIMAL, - (VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT), - VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); - -@@ -1557,8 +1567,16 @@ static VkShaderModule demo_prepare_vs(struct demo *demo) { - #else - void *vertShaderCode; - size_t size; -+ char fname[255]; -+ if (strlen(demo->bin_path) > 0) { -+ strcpy(fname, demo->bin_path); -+ strcat(fname, "/"); -+ strcat(fname, "cube-vert.spv"); -+ } -+ else -+ strcpy(fname, "cube-vert.spv"); - -- vertShaderCode = demo_read_spv("cube-vert.spv", &size); -+ vertShaderCode = demo_read_spv(fname, &size); - - demo->vert_shader_module = - demo_prepare_shader_module(demo, vertShaderCode, size); -@@ -1582,8 +1600,16 @@ static VkShaderModule demo_prepare_fs(struct demo *demo) { - #else - void *fragShaderCode; - size_t size; -+ char fname[255]; -+ if (strlen(demo->bin_path) > 0) { -+ strcpy(fname, demo->bin_path); -+ strcat(fname, "/"); -+ strcat(fname, "cube-frag.spv"); -+ } -+ else -+ strcpy(fname, "cube-frag.spv"); - -- fragShaderCode = demo_read_spv("cube-frag.spv", &size); -+ fragShaderCode = demo_read_spv(fname, &size); - - demo->frag_shader_module = - demo_prepare_shader_module(demo, fragShaderCode, size); -@@ -3034,6 +3060,30 @@ static void demo_init_connection(struct demo *demo) { - #endif - } - -+static void find_bin_path(char *in_arg, char *ret_path) { -+ char *ptr = getenv("PATH"); -+ char *pch_temp; -+ char pch[255]; -+ -+ if (access(in_arg, F_OK ) == 0) { -+ pch_temp = strrchr(in_arg, '/'); -+ strncpy(ret_path, in_arg, strlen(in_arg) - strlen(pch_temp)); -+ } else if (in_arg[0] != '/') { -+ pch_temp = strtok(ptr, ":"); -+ while (pch_temp != NULL) { -+ strcpy(pch, pch_temp); -+ strcat(pch, "/"); -+ strcat(pch, in_arg); -+ if ((access(pch, F_OK ) == 0)) { -+ strcpy(ret_path, pch_temp); -+ break; -+ } -+ else -+ pch_temp = strtok(NULL, ":"); -+ } -+ } -+} -+ - static void demo_init(struct demo *demo, int argc, char **argv) { - vec3 eye = {0.0f, 3.0f, 5.0f}; - vec3 origin = {0, 0, 0}; -@@ -3053,6 +3053,8 @@ static void demo_init(struct demo *demo, int argc, char **argv) { - mat4x4_identity(demo->model_matrix); - - demo->projection_matrix[1][1]*=-1; //Flip projection matrix from GL to Vulkan orientation. -+ -+ find_bin_path(argv[0], demo->bin_path); - } - - #if defined(VK_USE_PLATFORM_WIN32_KHR) -diff --git a/demos/tri.c b/demos/tri.c -index 35d33f2..77ee5a1 100644 ---- a/demos/tri.c -+++ b/demos/tri.c -@@ -39,6 +39,7 @@ - #include <stdbool.h> - #include <assert.h> - #include <signal.h> -+#include <unistd.h> - - #ifdef _WIN32 - #pragma comment(linker, "/subsystem:windows") -@@ -262,6 +263,8 @@ struct demo { - bool quit; - uint32_t current_buffer; - uint32_t queue_count; -+ -+ char bin_path[255]; - }; - - VKAPI_ATTR VkBool32 VKAPI_CALL -@@ -1288,8 +1291,16 @@ static VkShaderModule demo_prepare_vs(struct demo *demo) { - #else - void *vertShaderCode; - size_t size = 0; -+ char fname[255]; -+ if (strlen(demo->bin_path) > 0) { -+ strcpy(fname, demo->bin_path); -+ strcat(fname, "/"); -+ strcat(fname, "tri-vert.spv"); -+ } -+ else -+ strcpy(fname, "tri-vert.spv"); - -- vertShaderCode = demo_read_spv("tri-vert.spv", &size); -+ vertShaderCode = demo_read_spv(fname, &size); - - demo->vert_shader_module = - demo_prepare_shader_module(demo, vertShaderCode, size); -@@ -1313,8 +1324,16 @@ static VkShaderModule demo_prepare_fs(struct demo *demo) { - #else - void *fragShaderCode; - size_t size; -+ char fname[255]; -+ if (strlen(demo->bin_path) > 0) { -+ strcpy(fname, demo->bin_path); -+ strcat(fname, "/"); -+ strcat(fname, "tri-frag.spv"); -+ } -+ else -+ strcpy(fname, "tri-frag.spv"); - -- fragShaderCode = demo_read_spv("tri-frag.spv", &size); -+ fragShaderCode = demo_read_spv(fname, &size); - - demo->frag_shader_module = - demo_prepare_shader_module(demo, fragShaderCode, size); -@@ -2447,6 +2466,30 @@ static void demo_init_connection(struct demo *demo) { - #endif // _WIN32 - } - -+static void find_bin_path(const char *in_arg, char *ret_path) { -+ char *ptr = getenv("PATH"); -+ char *pch_temp; -+ char pch[255]; -+ -+ if (access(in_arg, F_OK ) == 0) { -+ pch_temp = strrchr(in_arg, '/'); -+ strncpy(ret_path, in_arg, strlen(in_arg) - strlen(pch_temp)); -+ } else if (in_arg[0] != '/') { -+ pch_temp = strtok(ptr, ":"); -+ while (pch_temp != NULL) { -+ strcpy(pch, pch_temp); -+ strcat(pch, "/"); -+ strcat(pch, in_arg); -+ if ((access(pch, F_OK ) == 0)) { -+ strcpy(ret_path, pch_temp); -+ break; -+ } -+ else -+ pch_temp = strtok(NULL, ":"); -+ } -+ } -+} -+ - static void demo_init(struct demo *demo, const int argc, const char *argv[]) - { - memset(demo, 0, sizeof(*demo)); -@@ -2490,6 +2533,8 @@ static void demo_init(struct demo *demo, const int argc, const char *argv[]) - demo->height = 300; - demo->depthStencil = 1.0; - demo->depthIncrement = -0.01f; -+ -+ find_bin_path(argv[0], demo->bin_path); - } - - static void demo_cleanup(struct demo *demo) { --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0009-vulkaninfo.c-fix-segfault-when-DISPLAY-is-not-set.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0009-vulkaninfo.c-fix-segfault-when-DISPLAY-is-not-set.patch deleted file mode 100644 index 25785ffb..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0009-vulkaninfo.c-fix-segfault-when-DISPLAY-is-not-set.patch +++ /dev/null @@ -1,67 +0,0 @@ -From b73227e97086116e596206b22ce0356bfc9b0a2c Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Fri, 11 Nov 2016 14:48:54 +0500 -Subject: [PATCH] vulkaninfo.c: fix segfault when DISPLAY is not set - -Both xlib and xcb interfaces expect the DISPLAY environment -variable to be set before creation of a window and the -display creation mechanism would segfault if that is -not the case and won't provide the user with details on -what has to be done to correct the problem. -We now handle such scenarios and exit cleanly after -providing the user with some details. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - demos/vulkaninfo.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c -index 324720c..da0a7c3 100644 ---- a/demos/vulkaninfo.c -+++ b/demos/vulkaninfo.c -@@ -900,6 +900,9 @@ static void app_create_xlib_window(struct app_instance *inst) { - long visualMask = VisualScreenMask; - int numberOfVisuals; - -+ if (inst->xlib_display == NULL) -+ return; -+ - XVisualInfo vInfoTemplate={}; - vInfoTemplate.screen = DefaultScreen(inst->xlib_display); - XVisualInfo *visualInfo = XGetVisualInfo(inst->xlib_display, visualMask, -@@ -1488,6 +1491,12 @@ int main(int argc, char **argv) { - app_destroy_win32_window(&inst); - } - #endif -+#if defined(VK_USE_PLATFORM_XCB_KHR) || defined(VK_USE_PLATFORM_XLIB_KHR) -+ if (getenv("DISPLAY") == NULL) { -+ printf("'DISPLAY' environment variable not set... Exiting!\n"); -+ goto out; -+ } -+#endif - //--XCB-- - #ifdef VK_USE_PLATFORM_XCB_KHR - if (has_extension(VK_KHR_XCB_SURFACE_EXTENSION_NAME, -@@ -1508,6 +1517,10 @@ int main(int argc, char **argv) { - if (has_extension(VK_KHR_XLIB_SURFACE_EXTENSION_NAME, - inst.global_extension_count, inst.global_extensions)) { - app_create_xlib_window(&inst); -+ if (inst.xlib_display == NULL) { -+ printf("'DISPLAY' variable not set correctly. Exiting!\n'"); -+ goto out; -+ } - for (i = 0; i < gpu_count; i++) { - app_create_xlib_surface(&inst); - printf("GPU id : %u (%s)\n", i, gpus[i].props.deviceName); -@@ -1528,6 +1541,7 @@ int main(int argc, char **argv) { - printf("\n\n"); - } - -+out: - for (i = 0; i < gpu_count; i++) - app_gpu_destroy(&gpus[i]); - --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers_1.0.26.bb b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers_1.0.26.bb deleted file mode 100644 index e8ea2605..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers_1.0.26.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Vulkan Ecosystem Components - Loader and Validation Layers" -DESCRIPTION = "Vulkan is a new generation graphics and compute API that \ - provides high-efficiency, cross-platform access to modern \ - GPUs used in a wide variety of devices from PCs and \ - consoles to mobile phones and embedded platforms." -SECTION = "graphics" -HOMEPAGE = "https://www.khronos.org/vulkan" -DEPENDS = "bison-native libx11 libxcb glslang glslang-native spirv-tools \ - libice libxext libsm" - -RDEPENDS_${PN} = "${PN}-layer-libs libxcb-sync libxcb-present libxcb-dri3" - -inherit cmake python3native - -REQUIRED_DISTRO_FEATURES = "x11" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156" - -S = "${WORKDIR}/git" - -SRCREV = "ebf46deb849a2d4cab3382c606a9fe36699dfa78" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers;branch=sdk-${PV} \ - file://0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch \ - file://0003-obey-CMAKE_INSTALL_LIBDIR.patch \ - file://0004-install-the-vulkan-loader.patch \ - file://0005-install-demos.patch \ - file://0006-json-correct-layer-lib-paths.patch \ - file://0008-demos-make-shader-location-relative.patch \ - file://0009-vulkaninfo.c-fix-segfault-when-DISPLAY-is-not-set.patch" - -EXTRA_OECMAKE = " \ - -DCUSTOM_GLSLANG_BIN_ROOT=1 \ - -DGLSLANG_BINARY_ROOT=${STAGING_DIR_HOST}/usr \ - -DCUSTOM_SPIRV_TOOLS_BIN_ROOT=1 \ - -DSPIRV_TOOLS_BINARY_ROOT=${STAGING_DIR_HOST}/usr \ - -DBUILD_TESTS=1 \ -" - -PACKAGES =+ "${PN}-layer-libs" -FILES_${PN}-layer-libs = "${libdir}/libVkLayer_*.so" - -FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/libvulkan.so" -INSANE_SKIP_${PN} = "dev-so" - -do_install_append() { - cp -f ${B}/demos/*.spv ${D}${bindir} - cp -f ${B}/demos/*.ppm ${D}${bindir} - mv ${D}${bindir}/tri ${D}${bindir}/tri-vulkan - mv ${D}${bindir}/cube ${D}${bindir}/cube-vulkan - - install -d ${D}${sysconfdir}/vulkan/explicit_layer.d - cp -f ${B}/layers/*.json ${D}${sysconfdir}/vulkan/explicit_layer.d - - install -d ${D}${includedir} - cp -rf ${S}/include/vulkan ${D}${includedir} -} diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-samples/0001-Layer-Samples-fix-build-without-BUILD_LAYERS.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-samples/0001-Layer-Samples-fix-build-without-BUILD_LAYERS.patch deleted file mode 100644 index d9b59309..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-samples/0001-Layer-Samples-fix-build-without-BUILD_LAYERS.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6488c60f7bb9a8d0f956e51a9f7657db9027c5fe Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Wed, 31 Aug 2016 11:36:38 +0500 -Subject: [PATCH] Layer-Samples: fix build without BUILD_LAYERS - -Some of the layer samples require layer utils to be -built and these fail when BUILD_LAYERS is disabled. -We fix this by providing the required dependencies -even when the BUILD_LAYERS is disabled. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - Layer-Samples/Overlay/CMakeLists.txt | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/Layer-Samples/Overlay/CMakeLists.txt b/Layer-Samples/Overlay/CMakeLists.txt -index 26f9b3a..a26664c 100644 ---- a/Layer-Samples/Overlay/CMakeLists.txt -+++ b/Layer-Samples/Overlay/CMakeLists.txt -@@ -40,6 +40,18 @@ add_library(VKLayer_overlay SHARED overlay.cpp - ${SHADER_DIR}/overlay-frag.spv - overlay.json) - -+if(NOT BUILD_LAYERS) -+add_custom_command(OUTPUT vk_dispatch_table_helper.h -+ COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py ${DisplayServer} dispatch-table-ops layer > ${LAYERS_LOC}/layers/vk_dispatch_table_helper.h -+ DEPENDS ${PROJECT_SOURCE_DIR}/vk-generate.py ${PROJECT_SOURCE_DIR}/vulkan.py) -+ -+add_custom_target(generate_vk_layer_helpers DEPENDS -+ vk_dispatch_table_helper.h -+) -+ -+add_dependencies(VKLayer_overlay generate_vk_layer_helpers) -+endif() -+ - if (WIN32) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-samples/0002-install-samples.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-samples/0002-install-samples.patch deleted file mode 100644 index 4b6c01cb..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-samples/0002-install-samples.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 66ccfc283f7d3bf4cf065c18a25e4edd8b981c0b Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Wed, 31 Aug 2016 13:11:09 +0500 -Subject: [PATCH] install samples - -The samples are built but not installed correctly. This -fixes the issues and deploys all the built samples as -necessary. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - API-Samples/CMakeLists.txt | 4 ++++ - Sample-Programs/Hologram/CMakeLists.txt | 1 + - 2 files changed, 5 insertions(+) - -diff --git a/API-Samples/CMakeLists.txt b/API-Samples/CMakeLists.txt -index fedad5d..73916e0 100644 ---- a/API-Samples/CMakeLists.txt -+++ b/API-Samples/CMakeLists.txt -@@ -31,6 +31,7 @@ function(sampleExtGLSLShaders SNAME) - endforeach(SFILE) - add_executable(${SAMPLE_NAME} ${SAMPLE_NAME}/${SAMPLE_NAME}.cpp ${SHADER_FILES}) - target_link_libraries(${SAMPLE_NAME} ${VULKAN_LOADER} ${UTILS_NAME} ${GLSLANG_LIBRARIES} ${PTHREAD}) -+ install(TARGETS ${SAMPLE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endfunction(sampleExtGLSLShaders) - - # function to build a single-source-file sample that uses spirv shaders -@@ -44,6 +45,7 @@ function(sampleExtSPIRVShaders SNAME) - endforeach(SFILE) - add_executable(${SAMPLE_NAME} ${SAMPLE_NAME}/${SAMPLE_NAME}.cpp ${SHADER_FILES}) - target_link_libraries(${SAMPLE_NAME} ${VULKAN_LOADER} ${UTILS_NAME} ${GLSLANG_LIBRARIES} ${PTHREAD}) -+ install(TARGETS ${SAMPLE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endfunction(sampleExtSPIRVShaders) - - # function to build a simple single-source-file sample -@@ -127,6 +129,7 @@ function(sampleWithSingleFile) - elseif(UNIX) - add_executable(${SAMPLE_NAME} ${SAMPLE_NAME}/${SAMPLE_NAME}.cpp) - target_link_libraries(${SAMPLE_NAME} ${UTILS_NAME} ${GLSLANG_LIBRARIES} ${XCB_LIBRARIES} ${VULKAN_LOADER} ${PTHREAD} ${SPIRV_TOOLS_LIBRARIES}) -+ install(TARGETS ${SAMPLE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) - else() - add_executable(${SAMPLE_NAME} WIN32 ${SAMPLE_NAME}/${SAMPLE_NAME}.cpp) - target_link_libraries(${SAMPLE_NAME} ${UTILS_NAME} ${GLSLANG_LIBRARIES} ${VULKAN_LOADER} ${WINLIBS} ${SPIRV_TOOLS_LIBRARIES}) -@@ -148,6 +151,7 @@ function(sampleInlineGLSLShaders) - if(UNIX) - add_executable(${SAMPLE_NAME} ${SAMPLE_NAME}/${SAMPLE_NAME}.cpp) - target_link_libraries(${SAMPLE_NAME} ${GLSLANG_LIBRARIES} ${XCB_LIBRARIES} ${VULKAN_LOADER} ${PTHREAD}) -+ install(TARGETS ${SAMPLE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) - else() - add_executable(${SAMPLE_NAME} WIN32 ${SAMPLE_NAME}/${SAMPLE_NAME}.cpp) - target_link_libraries(${SAMPLE_NAME} ${GLSLANG_LIBRARIES} ${VULKAN_LOADER} ${WINLIBS}) -diff --git a/Sample-Programs/Hologram/CMakeLists.txt b/Sample-Programs/Hologram/CMakeLists.txt -index 779ecb8..ab04b44 100644 ---- a/Sample-Programs/Hologram/CMakeLists.txt -+++ b/Sample-Programs/Hologram/CMakeLists.txt -@@ -83,3 +83,4 @@ add_executable(Hologram ${sources}) - target_compile_definitions(Hologram ${definitions}) - target_include_directories(Hologram ${includes}) - target_link_libraries(Hologram ${libraries}) -+install(TARGETS Hologram DESTINATION ${CMAKE_INSTALL_BINDIR}) --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-samples_1.0.26.bb b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-samples_1.0.26.bb deleted file mode 100644 index c8dd2756..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-samples_1.0.26.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Vulkan Samples" -DESCRIPTION = "This project is a collection \ - of Vulkan C++ sample applications." -SECTION = "graphics" -HOMEPAGE = "https://github.com/LunarG/VulkanSamples" -DEPENDS = "vulkan-loader-layers glslang" - -inherit cmake python3native - -REQUIRED_DISTRO_FEATURES = "x11" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156" - -S = "${WORKDIR}/git" - -SRCREV = "8a3afccb56cfc03d4afb06819f2b8db4bbf3364d" -SRC_URI = "git://github.com/LunarG/VulkanSamples;branch=sdk-${PV} \ - file://0001-Layer-Samples-fix-build-without-BUILD_LAYERS.patch \ - file://0002-install-samples.patch" - -EXTRA_OECMAKE = " \ - -DBUILD_LOADER=0 \ - -DBUILD_TESTS=0 \ - -DBUILD_LAYERS=0 \ - -DBUILD_DEMOS=0 \ - -DBUILD_VKJSON=0 \ -" 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 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb deleted file mode 100644 index fe8fb10b..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "Vulkan Tools" -DESCRIPTION = "This project provides vktrace capture/replay \ - tool, Intel Ilo sample driver and other layer \ - tools and driver tests." -SECTION = "graphics" -HOMEPAGE = "https://github.com/LunarG/VulkanTools" -DEPENDS = "vulkan-loader-layers" - -RDEPENDS_${PN} = "${PN}-layer-libs" - -inherit cmake python3native - -REQUIRED_DISTRO_FEATURES = "x11" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156" - -S = "${WORKDIR}/git" - -SRCREV = "a60e7c2f366e213ef85a71b84946a342386fd863" -SRC_URI = "git://github.com/LunarG/VulkanTools;branch=sdk-${PV} \ - file://0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch \ - file://0002-obey-CMAKE_INSTALL_LIBDIR.patch \ - file://0003-vktrace-do-not-link-to-internal-loader.patch\ - file://0004-json-correct-layer-lib-paths.patch \ - file://0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch \ -" - -EXTRA_OECMAKE = " \ - -DBUILD_LOADER=0 \ - -DBUILD_TESTS=0 \ - -DBUILD_LAYERS=0 \ - -DBUILD_LAYERSVT=1 \ - -DBUILD_DEMOS=0 \ - -DBUILD_VKTRACE=1 \ - -DBUILD_VKJSON=0 \ - -DBUILD_ICD=0 \ -" -PACKAGES =+ "${PN}-layer-libs" -FILES_${PN}-layer-libs = "${libdir}/libVkLayer_*.so" - -INSANE_SKIP_${PN}-layer-libs = "ldflags" - -do_install_append() { - install -d ${D}${bindir} - cp -f ${B}/vktrace/vktrace ${D}${bindir} - cp -f ${B}/vktrace/vkreplay ${D}${bindir} - - install -d ${D}${libdir} - cp -f ${B}/vktrace/libVkLayer_vktrace_layer.so ${D}${libdir} - - install -d ${D}${sysconfdir}/vulkan/explicit_layer.d - cp -f ${S}/layersvt/${HOST_OS}/*.json ${D}${sysconfdir}/vulkan/explicit_layer.d - cp -f ${S}/vktrace/src/vktrace_layer/${HOST_OS}/*.json ${D}${sysconfdir}/vulkan/explicit_layer.d -} - -# Conditional building of vktraceviewer -QTBITS ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'cmake_qt5', '',d)}" -inherit ${QTBITS} -DEPENDS += "${@oe.utils.conditional('QTBITS', '', '', 'libxcb qtsvg', d)}" -RDEPENDS_${PN}_append = " ${@oe.utils.conditional('QTBITS', '', '', 'qtsvg', d)}" -do_install_append() { - if [ "${QTBITS}" != "" ] - then - install ${B}/vktrace/vktraceviewer ${D}${bindir} - fi -} |