diff options
Diffstat (limited to 'meta-v1000')
21 files changed, 0 insertions, 596 deletions
diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/glslang/0002-spirv-do-not-install-conflicting-headers.patch b/meta-v1000/recipes-devtools/glslang/glslang/0002-spirv-do-not-install-conflicting-headers.patch index 69e64060..69e64060 100644 --- a/meta-v1000/recipes-graphics/lunarg-sdk/glslang/0002-spirv-do-not-install-conflicting-headers.patch +++ b/meta-v1000/recipes-devtools/glslang/glslang/0002-spirv-do-not-install-conflicting-headers.patch diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/glslang_git.bb b/meta-v1000/recipes-devtools/glslang/glslang_git.bb index bc749b40..bc749b40 100644 --- a/meta-v1000/recipes-graphics/lunarg-sdk/glslang_git.bb +++ b/meta-v1000/recipes-devtools/glslang/glslang_git.bb diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/spirv-tools/0002-spirv-lesspipe.sh-allow-using-generic-shells.patch b/meta-v1000/recipes-devtools/spirv/spirv-tools/0002-spirv-lesspipe.sh-allow-using-generic-shells.patch index 40bc477a..40bc477a 100644 --- a/meta-v1000/recipes-graphics/lunarg-sdk/spirv-tools/0002-spirv-lesspipe.sh-allow-using-generic-shells.patch +++ b/meta-v1000/recipes-devtools/spirv/spirv-tools/0002-spirv-lesspipe.sh-allow-using-generic-shells.patch diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/spirv-tools_git.bb b/meta-v1000/recipes-devtools/spirv/spirv-tools_git.bb index a4da04e2..a4da04e2 100644 --- a/meta-v1000/recipes-graphics/lunarg-sdk/spirv-tools_git.bb +++ b/meta-v1000/recipes-devtools/spirv/spirv-tools_git.bb diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-samples/0002-install-samples.patch b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-samples/0002-install-samples.patch deleted file mode 100644 index 5066dcfb..00000000 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-samples/0002-install-samples.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 397088b60fa8f8078d633a7924eb2d5978dc5067 Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Wed, 6 Dec 2017 18:29:32 +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 ebec4a092..7098045de 100644 ---- a/API-Samples/CMakeLists.txt -+++ b/API-Samples/CMakeLists.txt -@@ -70,6 +70,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 -@@ -83,6 +84,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 -@@ -149,6 +151,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} ${WAYLAND_CLIENT_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}) -@@ -170,6 +173,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 11e007eaa..a03b0d06c 100644 ---- a/Sample-Programs/Hologram/CMakeLists.txt -+++ b/Sample-Programs/Hologram/CMakeLists.txt -@@ -92,3 +92,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}) --- -2.11.1 - diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-samples/0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-samples/0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch deleted file mode 100644 index 202e0605..00000000 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-samples/0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch +++ /dev/null @@ -1,71 +0,0 @@ -From af1706e021e900f2cfb15e7bc0f9f68cdd1bd04c Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 4 Sep 2018 14:58:18 +0500 -Subject: [PATCH 3/4] CMakeLists.txt: use a fixed header for spirv_commit - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - CMakeLists.txt | 3 --- - spirv_tools_commit_id.h | 29 +++++++++++++++++++++++++++++ - 2 files changed, 29 insertions(+), 3 deletions(-) - create mode 100644 spirv_tools_commit_id.h - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5cf85d487..b0ec3cbaf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -343,7 +343,6 @@ add_custom_target(generate_helper_files DEPENDS - vk_dispatch_table_helper.h - vk_extension_helper.h - vk_typemap_helper.h -- spirv_tools_commit_id.h - ) - set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER}) - -@@ -358,8 +357,6 @@ run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h) - run_vk_xml_generate(helper_file_generator.py vk_object_types.h) - run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) - run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) --run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) -- - - - if(NOT WIN32) -diff --git a/include/vulkan/spirv_tools_commit_id.h b/include/vulkan/spirv_tools_commit_id.h -new file mode 100644 -index 000000000..ae588b33f ---- /dev/null -+++ b/include/vulkan/spirv_tools_commit_id.h -@@ -0,0 +1,29 @@ -+// *** THIS FILE IS GENERATED - DO NOT EDIT *** -+// See external_revision_generator.py for modifications -+ -+/*************************************************************************** -+ * -+ * Copyright (c) 2015-2017 The Khronos Group Inc. -+ * Copyright (c) 2015-2017 Valve Corporation -+ * Copyright (c) 2015-2017 LunarG, Inc. -+ * Copyright (c) 2015-2017 Google Inc. -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ * Author: Chris Forbes <chrisforbes@google.com> -+ * Author: Cort Stratton <cort@google.com> -+ * -+ ****************************************************************************/ -+#pragma once -+ -+#define SPIRV_TOOLS_COMMIT_ID "2651ccaec8170b3257642b3c438f50dc4f181fdd" --- -2.11.1 - diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-samples_1.1.70.bb b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-samples_1.1.70.bb deleted file mode 100644 index b002130e..00000000 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-samples_1.1.70.bb +++ /dev/null @@ -1,32 +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 glslang-native libxkbcommon" - -inherit cmake python3native - -REQUIRED_DISTRO_FEATURES = "x11" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156" - -S = "${WORKDIR}/git" - -SRCREV = "88089096a830841ea9523dc27cab733963479346" -SRC_URI = "git://github.com/LunarG/VulkanSamples;branch=sdk-${PV} \ - file://0002-install-samples.patch \ - file://0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch" - -EXTRA_OECMAKE = " \ - -DBUILD_LOADER=0 \ - -DBUILD_TESTS=0 \ - -DBUILD_LAYERS=0 \ - -DBUILD_DEMOS=0 \ - -DBUILD_VKJSON=0 \ - -DBUILD_WSI_MIR_SUPPORT=0 \ - -DBUILD_WSI_WAYLAND_SUPPORT=0 \ - -DINSTALL_LVL_FILES=0 \ - -DBUILD_ICD=0 \ -" diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0001-CMakeLists-add-include-paths-so-Xlib-and-XCB-are-fou.patch b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0001-CMakeLists-add-include-paths-so-Xlib-and-XCB-are-fou.patch deleted file mode 100644 index ecac1262..00000000 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0001-CMakeLists-add-include-paths-so-Xlib-and-XCB-are-fou.patch +++ /dev/null @@ -1,133 +0,0 @@ -From a6dc74817a8670155d06e6aec722e4219e789414 Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 4 Sep 2018 16:54:17 +0500 -Subject: [PATCH 1/2] CMakeLists: add include paths so Xlib and XCB are found - as needed - -All the targets including vk_platform.h or directly including -X11/Xlib.h or xcb.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 | 1 + - layer_factory/CMakeLists.txt | 1 + - layersvt/CMakeLists.txt | 1 + - vktrace/vktrace_common/CMakeLists.txt | 1 + - vktrace/vktrace_layer/CMakeLists.txt | 1 + - vktrace/vktrace_replay/CMakeLists.txt | 1 + - vktrace/vktrace_trace/CMakeLists.txt | 1 + - vktrace/vktrace_viewer/CMakeLists.txt | 5 +++++ - 8 files changed, 12 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e19817efa..5298766c9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,6 +57,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - - if (BUILD_WSI_XLIB_SUPPORT) - find_package(X11 REQUIRED) -+ find_path(X11_XLIB_INCLUDE_DIR X11/Xlib.h DOC "Path to X11/Xlib.h") - endif() - - if (BUILD_WSI_WAYLAND_SUPPORT) -diff --git a/layer_factory/CMakeLists.txt b/layer_factory/CMakeLists.txt -index e4355d8b2..88f2d8369 100644 ---- a/layer_factory/CMakeLists.txt -+++ b/layer_factory/CMakeLists.txt -@@ -11,6 +11,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") - - if (BUILD_WSI_XLIB_SUPPORT) - add_definitions(-DVK_USE_PLATFORM_XLIB_KHR -DVK_USE_PLATFORM_XLIB_KHX -DVK_USE_PLATFORM_XLIB_XRANDR_EXT) -+ include_directories(${X11_XLIB_INCLUDE_DIR}) - endif() - - if (BUILD_WSI_WAYLAND_SUPPORT) -diff --git a/layersvt/CMakeLists.txt b/layersvt/CMakeLists.txt -index d47f3c65a..9b780ce4d 100644 ---- a/layersvt/CMakeLists.txt -+++ b/layersvt/CMakeLists.txt -@@ -136,6 +136,7 @@ include_directories( - ${CMAKE_BINARY_DIR}/${V_LVL_RELATIVE_LOCATION} - ${PROJECT_SOURCE_DIR}/../glslang/SPIRV - ${JSONCPP_INCLUDE_DIR} -+ ${X11_XLIB_INCLUDE_DIR} - ) - - if (WIN32) -diff --git a/vktrace/vktrace_common/CMakeLists.txt b/vktrace/vktrace_common/CMakeLists.txt -index c9ad2ad8e..4c639c6d7 100644 ---- a/vktrace/vktrace_common/CMakeLists.txt -+++ b/vktrace/vktrace_common/CMakeLists.txt -@@ -9,6 +9,7 @@ include_directories( - ${SRC_DIR}/vktrace_common - ${SRC_DIR}/thirdparty - ${CMAKE_BINARY_DIR}/${V_LVL_RELATIVE_LOCATION} -+ ${X11_XLIB_INCLUDE_DIR} - ) - - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") -diff --git a/vktrace/vktrace_layer/CMakeLists.txt b/vktrace/vktrace_layer/CMakeLists.txt -index 5cf48b34c..ea419a7ee 100644 ---- a/vktrace/vktrace_layer/CMakeLists.txt -+++ b/vktrace/vktrace_layer/CMakeLists.txt -@@ -78,6 +78,7 @@ include_directories( - ${CMAKE_BINARY_DIR}/${V_LVL_RELATIVE_LOCATION} - ${V_LVL_ROOT_DIR}/include - ${V_LVL_ROOT_DIR}/include/vulkan -+ ${X11_XLIB_INCLUDE_DIR} - ) - - # copy/link layer json file into build/layersvt directory -diff --git a/vktrace/vktrace_replay/CMakeLists.txt b/vktrace/vktrace_replay/CMakeLists.txt -index 191af81a8..0912c7f1f 100644 ---- a/vktrace/vktrace_replay/CMakeLists.txt -+++ b/vktrace/vktrace_replay/CMakeLists.txt -@@ -70,6 +70,7 @@ include_directories( - ${VKTRACE_VULKAN_INCLUDE_DIR} - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/${V_LVL_RELATIVE_LOCATION} -+ ${X11_XLIB_INCLUDE_DIR} - ) - - -diff --git a/vktrace/vktrace_trace/CMakeLists.txt b/vktrace/vktrace_trace/CMakeLists.txt -index b1390d3fe..0dc0f5f8b 100644 ---- a/vktrace/vktrace_trace/CMakeLists.txt -+++ b/vktrace/vktrace_trace/CMakeLists.txt -@@ -24,6 +24,7 @@ include_directories( - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/${V_LVL_RELATIVE_LOCATION} - ${GENERATED_FILES_DIR} -+ ${X11_XLIB_INCLUDE_DIR} - ) - - if (NOT WIN32) -diff --git a/vktrace/vktrace_viewer/CMakeLists.txt b/vktrace/vktrace_viewer/CMakeLists.txt -index 316e9bdba..171be773e 100644 ---- a/vktrace/vktrace_viewer/CMakeLists.txt -+++ b/vktrace/vktrace_viewer/CMakeLists.txt -@@ -50,6 +50,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( -@@ -61,6 +64,8 @@ include_directories( - ${CMAKE_BINARY_DIR}/${V_LVL_RELATIVE_LOCATION} - ${CMAKE_BINARY_DIR} - ${Qt5Widgets_INCLUDE_DIRS} -+ ${X11_XLIB_INCLUDE_DIR} -+ ${XCB_INCLUDE_DIR} - ) - - set(SRC_LIST --- -2.11.1 - diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0001-vktrace-append-cxx-flags-to-support-cross-compilatio.patch b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0001-vktrace-append-cxx-flags-to-support-cross-compilatio.patch deleted file mode 100644 index c08bedec..00000000 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0001-vktrace-append-cxx-flags-to-support-cross-compilatio.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f6429960b48dab58643af33f70f0bc56aac1f5a7 Mon Sep 17 00:00:00 2001 -From: "Arsalan H. Awan" <Arsalan_Awan@mentor.com> -Date: Mon, 17 Sep 2018 19:43:49 +0500 -Subject: [PATCH 1/2] vktrace: append cxx flags to support cross compilation - -To support cross compilation, we need to set the variable -CMAKE_CXX_FLAGS_LIST such that the CXX flags set by user -for cross compilation are also included here. - -Signed-off-by: Arsalan H. Awan <Arsalan_Awan@mentor.com> ---- - vktrace/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vktrace/CMakeLists.txt b/vktrace/CMakeLists.txt -index 68bb642d8..00df0d1eb 100644 ---- a/vktrace/CMakeLists.txt -+++ b/vktrace/CMakeLists.txt -@@ -64,7 +64,7 @@ if(MSVC) - set(CMAKE_CXX_FLAGS_RELEASE_LIST "/O2 ${CMAKE_CXX_FLAGS_RELEASE_LIST} /DNDEBUG") - set(CMAKE_CXX_FLAGS_DEBUG_LIST "/Od /D_DEBUG") - else() -- set(CMAKE_CXX_FLAGS_LIST "-Wall -Wextra") -+ set(CMAKE_CXX_FLAGS_LIST "${CMAKE_CXX_FLAGS} -Wall -Wextra") - set(CMAKE_CXX_FLAGS_RELEASE_LIST "-O2 ${CMAKE_CXX_FLAGS_RELEASE_LIST} -DNDEBUG") - set(CMAKE_CXX_FLAGS_DEBUG_LIST "-g -O0 -D_DEBUG") - endif() --- -2.11.1 - diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0002-layersvt-append-cxx-flags-to-support-cross-compilati.patch b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0002-layersvt-append-cxx-flags-to-support-cross-compilati.patch deleted file mode 100644 index d7daed5f..00000000 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0002-layersvt-append-cxx-flags-to-support-cross-compilati.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4fc32cd19c64ebf92530c056db9b5870613950f5 Mon Sep 17 00:00:00 2001 -From: "Arsalan H. Awan" <Arsalan_Awan@mentor.com> -Date: Mon, 17 Sep 2018 19:52:02 +0500 -Subject: [PATCH 2/2] layersvt: append cxx flags to support cross compilation - -To support cross compilation, we need to set the variable -CMAKE_CXX_FLAGS such that the CXX flags set by user -for cross compilation are also included here. - -Signed-off-by: Arsalan H. Awan <Arsalan_Awan@mentor.com> ---- - layersvt/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/layersvt/CMakeLists.txt b/layersvt/CMakeLists.txt -index d47f3c65a..55da62700 100644 ---- a/layersvt/CMakeLists.txt -+++ b/layersvt/CMakeLists.txt -@@ -155,7 +154,7 @@ if (WIN32) - set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_CRT_SECURE_NO_WARNINGS") - endif() - else() -- set (CMAKE_CXX_FLAGS "-std=c++11") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpointer-arith") - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith") - endif() --- -2.11.1 - diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0002-layersvt-drop-device_sim-as-we-don-t-have-jsoncpp-fo.patch b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0002-layersvt-drop-device_sim-as-we-don-t-have-jsoncpp-fo.patch deleted file mode 100644 index 8a5efc12..00000000 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0002-layersvt-drop-device_sim-as-we-don-t-have-jsoncpp-fo.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 87edcb996897825ef5dbbf6a614e1f07cc5edb5c Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 4 Sep 2018 17:10:08 +0500 -Subject: [PATCH 2/2] layersvt: drop device_sim as we don't have jsoncpp for - now - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - layersvt/CMakeLists.txt | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/layersvt/CMakeLists.txt b/layersvt/CMakeLists.txt -index 9b780ce4d..42fd3c471 100644 ---- a/layersvt/CMakeLists.txt -+++ b/layersvt/CMakeLists.txt -@@ -46,7 +46,6 @@ set(LAYER_JSON_FILES - VkLayer_api_dump - VkLayer_monitor - VkLayer_screenshot -- VkLayer_device_simulation - ) - - set(VK_LAYER_RPATH /usr/lib/x86_64-linux-gnu/vulkan/layer:/usr/lib/i386-linux-gnu/vulkan/layer) -@@ -135,7 +134,6 @@ include_directories( - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/${V_LVL_RELATIVE_LOCATION} - ${PROJECT_SOURCE_DIR}/../glslang/SPIRV -- ${JSONCPP_INCLUDE_DIR} - ${X11_XLIB_INCLUDE_DIR} - ) - -@@ -168,6 +166,5 @@ run_vk_xml_generate(api_dump_generator.py api_dump_html.h) - - add_vk_layer(monitor monitor.cpp ${V_LVL_ROOT_DIR}/layers/vk_layer_table.cpp) - add_vk_layer(screenshot screenshot.cpp screenshot_parsing.h screenshot_parsing.cpp ${V_LVL_ROOT_DIR}/layers/vk_layer_table.cpp) --add_vk_layer(device_simulation device_simulation.cpp ${V_LVL_ROOT_DIR}/layers/vk_layer_table.cpp ${JSONCPP_SOURCE_DIR}/jsoncpp.cpp) - add_vk_layer(api_dump api_dump.cpp ${V_LVL_ROOT_DIR}/layers/vk_layer_table.cpp) - --- -2.11.1 - diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0002-vktrace-do-not-link-to-internal-loader.patch b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0002-vktrace-do-not-link-to-internal-loader.patch deleted file mode 100644 index 835e759f..00000000 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0002-vktrace-do-not-link-to-internal-loader.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5aae4f699578fd1c23970a0afd55fde94b2c21cb Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Thu, 1 Jun 2017 13:03:58 +0500 -Subject: [PATCH 2/5] 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/vktrace_extensions/vktracevulkan/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vktrace/vktrace_extensions/vktracevulkan/CMakeLists.txt b/vktrace/vktrace_extensions/vktracevulkan/CMakeLists.txt -index 60e4cc2d7..d961edfc7 100644 ---- a/vktrace/vktrace_extensions/vktracevulkan/CMakeLists.txt -+++ b/vktrace/vktrace_extensions/vktracevulkan/CMakeLists.txt -@@ -24,7 +24,7 @@ endif() - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR - ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" ) - set(VKTRACE_VULKAN_LIB -- ${CMAKE_BINARY_DIR}/loader/lib${API_LOWERCASE}.so -+ libvulkan.so - ) - - endif() --- -2.11.1 - diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch deleted file mode 100644 index 48a08bf4..00000000 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch +++ /dev/null @@ -1,71 +0,0 @@ -From af1706e021e900f2cfb15e7bc0f9f68cdd1bd04c Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 4 Sep 2018 14:58:18 +0500 -Subject: [PATCH 3/4] CMakeLists.txt: use a fixed header for spirv_commit - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - CMakeLists.txt | 3 --- - spirv_tools_commit_id.h | 29 +++++++++++++++++++++++++++++ - 2 files changed, 29 insertions(+), 3 deletions(-) - create mode 100644 spirv_tools_commit_id.h - -diff --git a/submodules/Vulkan-LoaderAndValidationLayers/CMakeLists.txt b/submodules/Vulkan-LoaderAndValidationLayers/CMakeLists.txt -index 5cf85d487..b0ec3cbaf 100644 ---- a/submodules/Vulkan-LoaderAndValidationLayers/CMakeLists.txt -+++ b/submodules/Vulkan-LoaderAndValidationLayers/CMakeLists.txt -@@ -343,7 +343,6 @@ add_custom_target(generate_helper_files DEPENDS - vk_dispatch_table_helper.h - vk_extension_helper.h - vk_typemap_helper.h -- spirv_tools_commit_id.h - ) - set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER}) - -@@ -358,8 +357,6 @@ run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h) - run_vk_xml_generate(helper_file_generator.py vk_object_types.h) - run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) - run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) --run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) -- - - - if(NOT WIN32) -diff --git a/submodules/Vulkan-LoaderAndValidationLayers/include/vulkan/spirv_tools_commit_id.h b/submodules/Vulkan-LoaderAndValidationLayers/include/vulkan/spirv_tools_commit_id.h -new file mode 100644 -index 000000000..ae588b33f ---- /dev/null -+++ b/submodules/Vulkan-LoaderAndValidationLayers/include/vulkan/spirv_tools_commit_id.h -@@ -0,0 +1,29 @@ -+// *** THIS FILE IS GENERATED - DO NOT EDIT *** -+// See external_revision_generator.py for modifications -+ -+/*************************************************************************** -+ * -+ * Copyright (c) 2015-2017 The Khronos Group Inc. -+ * Copyright (c) 2015-2017 Valve Corporation -+ * Copyright (c) 2015-2017 LunarG, Inc. -+ * Copyright (c) 2015-2017 Google Inc. -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ * Author: Chris Forbes <chrisforbes@google.com> -+ * Author: Cort Stratton <cort@google.com> -+ * -+ ****************************************************************************/ -+#pragma once -+ -+#define SPIRV_TOOLS_COMMIT_ID "2651ccaec8170b3257642b3c438f50dc4f181fdd" --- -2.11.1 - diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0005-vktrace_layer-force-linker-flags.patch b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0005-vktrace_layer-force-linker-flags.patch deleted file mode 100644 index f979828e..00000000 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools/0005-vktrace_layer-force-linker-flags.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6c57b7d8ed80f0f443d5cde6cc5294b8e05ccd3e Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Thu, 1 Jun 2017 12:58:31 +0500 -Subject: [PATCH 5/5] vktrace_layer: force linker flags - -This is OE specific in the sense that we use -CMAKE_CXX_LINK_FLAGS and CMAKE_C_LINK_FLAGS -separately whereas the build mechanism of -Vulkan Tools expects otherwise. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - vktrace/vktrace_layer/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/vktrace/vktrace_layer/CMakeLists.txt b/vktrace/vktrace_layer/CMakeLists.txt -index 4c586bf2d..bbc55cd6e 100644 ---- a/vktrace/vktrace_layer/CMakeLists.txt -+++ b/vktrace/vktrace_layer/CMakeLists.txt -@@ -110,6 +110,7 @@ add_dependencies(${PROJECT_NAME} generate_helper_files) - # Set Compiler Flags, Libraries - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(OS_TRACER_LIBS - -shared - -ldl --- -2.11.1 - diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools_1.1.70.bb b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools_1.1.70.bb deleted file mode 100644 index 7f071df1..00000000 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-tools_1.1.70.bb +++ /dev/null @@ -1,63 +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 xcb-util-keysyms" - -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 = "b94505e03c1169e745bc9a67697a8f6943c18c8f" -SRCREV_loader = "1fede1a6b8d6103cc9fcacb567747aa2af167849" -SRC_URI = "git://github.com/LunarG/VulkanTools;branch=sdk-${PV} \ - git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers;branch=sdk-${PV};name=loader;destsuffix=${S}/submodules/Vulkan-LoaderAndValidationLayers \ - file://0002-vktrace-do-not-link-to-internal-loader.patch \ - file://0005-vktrace_layer-force-linker-flags.patch \ - file://0001-CMakeLists-add-include-paths-so-Xlib-and-XCB-are-fou.patch \ - file://0002-layersvt-drop-device_sim-as-we-don-t-have-jsoncpp-fo.patch \ - file://0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch \ - file://0001-vktrace-append-cxx-flags-to-support-cross-compilatio.patch \ - file://0002-layersvt-append-cxx-flags-to-support-cross-compilati.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_WSI_WAYLAND_SUPPORT=0 \ - -DBUILD_WSI_MIR_SUPPORT=0 \ - -DBUILD_VIA=0 \ - -DINSTALL_LVL_FILES=0 \ - -DBUILD_ICD=0 \ -" -PACKAGES =+ "${PN}-layer-libs" -FILES_${PN}-layer-libs = "${libdir}/libVkLayer_*.so" - -INSANE_SKIP_${PN}-layer-libs = "ldflags" - -# 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 -} - diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch index 10337189..10337189 100644 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch +++ b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0002-demos-CMakeLists.txt-install-demos.patch b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers/0002-demos-CMakeLists.txt-install-demos.patch index 1ffc283e..1ffc283e 100644 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0002-demos-CMakeLists.txt-install-demos.patch +++ b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers/0002-demos-CMakeLists.txt-install-demos.patch diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers/0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch index c18441f5..c18441f5 100644 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch +++ b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers/0003-CMakeLists.txt-use-a-fixed-header-for-spirv_commit.patch diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0004-layer_validation_tests-include-math.h.patch b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers/0004-layer_validation_tests-include-math.h.patch index bd9713ea..bd9713ea 100644 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0004-layer_validation_tests-include-math.h.patch +++ b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers/0004-layer_validation_tests-include-math.h.patch diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0005-demos-cube-use-absolute-location-for-data-files.patch b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers/0005-demos-cube-use-absolute-location-for-data-files.patch index 85c15b89..85c15b89 100644 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0005-demos-cube-use-absolute-location-for-data-files.patch +++ b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers/0005-demos-cube-use-absolute-location-for-data-files.patch diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers_1.1.70.bb b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers_1.1.70.bb index 1acb3fe2..1acb3fe2 100644 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers_1.1.70.bb +++ b/meta-v1000/recipes-graphics/vulkan/vulkan-loader-layers_1.1.70.bb |