zeus migration: vulkan: update recipe to v1.1.121
https://jira.digi.com/browse/DEL-7013 Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra
parent
175897fd34
commit
af5d129da0
|
|
@ -0,0 +1,68 @@
|
|||
From 58f576d6f240b08957a402960cdf06c74201ac7b Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Thu, 12 Dec 2019 22:16:15 -0800
|
||||
Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library
|
||||
|
||||
Use ASSIMP_LIB_INSTALL_DIR rather than hardcoded /lib to search library
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
assimpTargets-release.cmake.in | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
|
||||
index f3db8f1..b8a066a 100644
|
||||
--- a/assimpTargets-release.cmake.in
|
||||
+++ b/assimpTargets-release.cmake.in
|
||||
@@ -42,11 +42,11 @@ if(MSVC)
|
||||
# Import target "assimp::assimp" for configuration "Release"
|
||||
set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(assimp::assimp PROPERTIES
|
||||
- IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}"
|
||||
+ IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${importLibraryName}"
|
||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
|
||||
)
|
||||
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
|
||||
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
|
||||
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${importLibraryName}")
|
||||
list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
|
||||
else()
|
||||
set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
|
||||
@@ -54,10 +54,10 @@ if(MSVC)
|
||||
# Import target "assimp::assimp" for configuration "Release"
|
||||
set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(assimp::assimp PROPERTIES
|
||||
- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
|
||||
+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${staticLibraryName}"
|
||||
)
|
||||
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
|
||||
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
|
||||
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${staticLibraryName}")
|
||||
endif()
|
||||
|
||||
else()
|
||||
@@ -70,17 +70,17 @@ else()
|
||||
endif()
|
||||
set_target_properties(assimp::assimp PROPERTIES
|
||||
IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
|
||||
- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
|
||||
+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${sharedLibraryName}"
|
||||
)
|
||||
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
|
||||
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
|
||||
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${sharedLibraryName}" )
|
||||
else()
|
||||
set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
|
||||
set_target_properties(assimp::assimp PROPERTIES
|
||||
- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
|
||||
+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${staticLibraryName}"
|
||||
)
|
||||
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
|
||||
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
|
||||
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${staticLibraryName}" )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,23 @@
|
|||
DESCRIPTION = "Open Asset Import Library is a portable Open Source library to import \
|
||||
various well-known 3D model formats in a uniform manner."
|
||||
HOMEPAGE = "http://www.assimp.org/"
|
||||
SECTION = "devel"
|
||||
|
||||
LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=2119edef0916b0bd511cb3c731076271"
|
||||
|
||||
DEPENDS = "zlib"
|
||||
|
||||
SRC_URI = "git://github.com/assimp/assimp.git;branch=assimp_5.0_release \
|
||||
file://0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch \
|
||||
file://0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch \
|
||||
"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
|
||||
|
||||
SRCREV = "8f0c6b04b2257a520aaab38421b2e090204b69df"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit cmake
|
||||
|
||||
EXTRA_OECMAKE = "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_LIB_INSTALL_DIR=${baselib}"
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
From c512c6864080ff617afb422a3d04dd902809a6cf Mon Sep 17 00:00:00 2001
|
||||
From: Steven Perron <stevenperron@google.com>
|
||||
Date: Thu, 13 Dec 2018 15:03:28 -0500
|
||||
Subject: [PATCH] Avoid GCC8 warning in text_handler.cpp. (#2197)
|
||||
|
||||
In the function `AssemblyContext::binaryEncodeString`, we want to copy
|
||||
a nul terminated string to an instruction. When coping the string, we
|
||||
did not copy the nul at the end of the source. It was added by setting
|
||||
the entire last word to 0, which is mandated by the spir-v spec. This
|
||||
is not a bug, but it does trigger a warning in GCC8 when doing a release
|
||||
build.
|
||||
|
||||
To avoid the warning, we will copy the nul character at the end of the
|
||||
string too.
|
||||
|
||||
Fixes #1541.
|
||||
---
|
||||
source/text_handler.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/source/text_handler.cpp b/source/text_handler.cpp
|
||||
index 5f6e8c4..c31f34a 100644
|
||||
--- a/source/text_handler.cpp
|
||||
+++ b/source/text_handler.cpp
|
||||
@@ -313,7 +313,7 @@ spv_result_t AssemblyContext::binaryEncodeString(const char* value,
|
||||
pInst->words.back() = 0;
|
||||
|
||||
char* dest = (char*)&pInst->words[oldWordCount];
|
||||
- strncpy(dest, value, length);
|
||||
+ strncpy(dest, value, length + 1);
|
||||
|
||||
return SPV_SUCCESS;
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
From 03127fd5a6eff5ae2ebea2e9c6c01fbf1a0a421a Mon Sep 17 00:00:00 2001
|
||||
From: Ankit Navik <ankit.tarot@gmail.com>
|
||||
Date: Tue, 25 Dec 2018 14:34:09 +0530
|
||||
Subject: [PATCH] tools/lesspipe: Allow generic shell
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/KhronosGroup/SPIRV-Tools/pull/2255]
|
||||
Signed-off-by: Ankit Navik <ankit.tarot@gmail.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 81e3355..f955259 100644
|
||||
--- a/tools/lesspipe/spirv-lesspipe.sh
|
||||
+++ b/tools/lesspipe/spirv-lesspipe.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#!/usr/bin/env sh
|
||||
# Copyright (c) 2016 The Khronos Group Inc.
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -1,24 +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(-)
|
||||
|
||||
Index: git/tools/lesspipe/spirv-lesspipe.sh
|
||||
===================================================================
|
||||
--- git.orig/tools/lesspipe/spirv-lesspipe.sh 2018-05-01 13:37:34.294579393 -0500
|
||||
+++ git/tools/lesspipe/spirv-lesspipe.sh 2018-05-01 13:38:35.000000000 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#!/bin/sh
|
||||
# Copyright (c) 2016 The Khronos Group Inc.
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
|
|
@ -1,32 +1,25 @@
|
|||
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."
|
||||
SUMMARY = "The SPIR-V Tools project provides an API and commands for \
|
||||
processing SPIR-V modules"
|
||||
DESCRIPTION = "The project includes an assembler, binary module parser, \
|
||||
disassembler, validator, and optimizer for SPIR-V."
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
SECTION = "graphics"
|
||||
HOMEPAGE = "https://www.khronos.org/registry/spir-v"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
DEST_DIR = "${S}/external"
|
||||
SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \
|
||||
git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \
|
||||
"
|
||||
SRCREV_spirv-tools = "9b3cc3e05337358d0bd9fec1b7a51e3cbf55312b"
|
||||
SRCREV_spirv-headers = "38cafab379e5d16137cb97a485b9385191039b92"
|
||||
|
||||
inherit cmake python3native
|
||||
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
SPIRV_HEADERS_LOCATION = "${S}/external/spirv-headers"
|
||||
HEADERS_VERSION = "unified1"
|
||||
|
||||
SRCREV_spirv-tools = "9d699f6d4038f432c55310d5d0b4a6d507c1b686"
|
||||
SRCREV_spirv-headers = "2434b89345a50c018c84f42a310b0fad4f3fd94f"
|
||||
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://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
|
||||
install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/unified1/* ${D}/${includedir}/SPIRV
|
||||
}
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
FILES_${PN} += "${libdir}/libSPIRV*"
|
||||
INSANE_SKIP_${PN} = "dev-so"
|
||||
FILES_${PN} += "${libdir}/*.so"
|
||||
|
|
|
|||
|
|
@ -1,91 +0,0 @@
|
|||
From 55770fb07c42fe410cf8d09f8f5976babc89b9ef Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Tue, 4 Jul 2017 17:13:45 +0300
|
||||
Subject: [PATCH] Don't build demos with questionably licensed data
|
||||
|
||||
Some of the models don't have open source compatible licenses:
|
||||
don't build demos using those. Also don't build demos that need
|
||||
resources that are not included.
|
||||
|
||||
ssao:
|
||||
scenerendering:
|
||||
Sibenik model, no license found
|
||||
|
||||
deferred:
|
||||
deferredmultisampling:
|
||||
deferredshadows:
|
||||
armor model, CC-BY-3.0
|
||||
|
||||
vulkanscene:
|
||||
imgui:
|
||||
shadowmapping:
|
||||
vulkanscene model, no license found
|
||||
|
||||
indirectdraw:
|
||||
plant model, no license found
|
||||
|
||||
hdr:
|
||||
pbribl:
|
||||
pbrtexture:
|
||||
Require external Vulkan Asset Pack
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
---
|
||||
CMakeLists.txt | 13 -------------
|
||||
1 file changed, 13 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4958fff..0f9d3e4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -150,17 +150,11 @@ set(EXAMPLES
|
||||
computeparticles
|
||||
computeshader
|
||||
debugmarker
|
||||
- deferred
|
||||
- deferredmultisampling
|
||||
- deferredshadows
|
||||
displacement
|
||||
distancefieldfonts
|
||||
dynamicuniformbuffer
|
||||
gears
|
||||
geometryshader
|
||||
- hdr
|
||||
- imgui
|
||||
- indirectdraw
|
||||
instancing
|
||||
mesh
|
||||
multisampling
|
||||
@@ -170,20 +164,14 @@ set(EXAMPLES
|
||||
parallaxmapping
|
||||
particlefire
|
||||
pbrbasic
|
||||
- pbribl
|
||||
- pbrtexture
|
||||
pipelines
|
||||
pushconstants
|
||||
radialblur
|
||||
raytracing
|
||||
- scenerendering
|
||||
screenshot
|
||||
- shadowmapping
|
||||
- shadowmappingomni
|
||||
skeletalanimation
|
||||
specializationconstants
|
||||
sphericalenvmapping
|
||||
- ssao
|
||||
subpasses
|
||||
terraintessellation
|
||||
tessellation
|
||||
@@ -196,7 +184,6 @@ set(EXAMPLES
|
||||
texturesparseresidency
|
||||
triangle
|
||||
viewportarray
|
||||
- vulkanscene
|
||||
)
|
||||
|
||||
buildExamples()
|
||||
--
|
||||
2.13.2
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
From b0495efb6c3ea3a530fcbaddac86da57ecce5a66 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Mon, 10 Jul 2017 13:11:12 +0300
|
||||
Subject: [PATCH] Fix build on x86
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
| func_common.inl:193:51: error: wrong number of template arguments
|
||||
| (5, should be 6) struct compute_sign<T, P, vecType, false, Aligned>
|
||||
|
||||
The fix is backported from the upstream glm project.
|
||||
|
||||
Upstream-Status: Pending [https://github.com/SaschaWillems/Vulkan/issues/356]
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
---
|
||||
external/glm/glm/detail/func_common.inl | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/external/glm/glm/detail/func_common.inl b/external/glm/glm/detail/func_common.inl
|
||||
index cafaed5..2dd94e1 100644
|
||||
--- a/external/glm/glm/detail/func_common.inl
|
||||
+++ b/external/glm/glm/detail/func_common.inl
|
||||
@@ -190,12 +190,12 @@ namespace detail
|
||||
|
||||
# if GLM_ARCH == GLM_ARCH_X86
|
||||
template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
|
||||
- struct compute_sign<T, P, vecType, false, Aligned>
|
||||
+ struct compute_sign<L, T, P, vecType, false, Aligned>
|
||||
{
|
||||
GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
|
||||
{
|
||||
T const Shift(static_cast<T>(sizeof(T) * 8 - 1));
|
||||
- vecType<L, T, P> const y(vecType<typename make_unsigned<T>::type, P>(-x) >> typename make_unsigned<T>::type(Shift));
|
||||
+ vecType<L, T, P> const y(vecType<L, typename make_unsigned<T>::type, P>(-x) >> typename make_unsigned<T>::type(Shift));
|
||||
|
||||
return (x >> Shift) | y;
|
||||
}
|
||||
--
|
||||
2.1.4
|
||||
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
From edca667684764cfcc0460e448e834fadf623a887 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Mon, 3 Jul 2017 14:49:18 +0300
|
||||
Subject: [PATCH] Support installing demos, support out-of-tree builds
|
||||
|
||||
This is especially useful for cross-compile situation where testing
|
||||
happens on target.
|
||||
|
||||
-DRESOURCE_INSTALL_DIR=<path> decides where data is installed (and
|
||||
where the binaries will load the data from): if it's left empty,
|
||||
then nothing will be installed and binaries will load the data from
|
||||
CMAKE_SOURCE_DIR.
|
||||
|
||||
Binaries are now correctly built in CMAKE_BINARY_DIR.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/SaschaWillems/Vulkan/pull/352]
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
---
|
||||
CMakeLists.txt | 15 ++++++++++++++-
|
||||
base/vulkanexamplebase.cpp | 2 +-
|
||||
2 files changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b9886bc..4958fff 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -16,6 +16,8 @@ include_directories(base)
|
||||
OPTION(USE_D2D_WSI "Build the project using Direct to Display swapchain" OFF)
|
||||
OPTION(USE_WAYLAND_WSI "Build the project using Wayland swapchain" OFF)
|
||||
|
||||
+set(RESOURCE_INSTALL_DIR "" CACHE PATH "Path to install resources to (leave empty for running uninstalled)")
|
||||
+
|
||||
# Use FindVulkan module added with CMAKE 3.7
|
||||
if (NOT CMAKE_VERSION VERSION_LESS 3.7.0)
|
||||
message(STATUS "Using module to find Vulkan")
|
||||
@@ -108,6 +110,10 @@ function(buildExample EXAMPLE_NAME)
|
||||
add_executable(${EXAMPLE_NAME} ${MAIN_CPP} ${SOURCE} ${SHADERS})
|
||||
target_link_libraries(${EXAMPLE_NAME} ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
||||
endif(WIN32)
|
||||
+
|
||||
+ if(RESOURCE_INSTALL_DIR)
|
||||
+ install(TARGETS ${EXAMPLE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+ endif()
|
||||
endfunction(buildExample)
|
||||
|
||||
# Build all examples
|
||||
@@ -117,6 +123,13 @@ function(buildExamples)
|
||||
endforeach(EXAMPLE)
|
||||
endfunction(buildExamples)
|
||||
|
||||
+if(RESOURCE_INSTALL_DIR)
|
||||
+ add_definitions(-DVK_EXAMPLE_DATA_DIR=\"${RESOURCE_INSTALL_DIR}/\")
|
||||
+ install(DIRECTORY data/ DESTINATION ${RESOURCE_INSTALL_DIR}/)
|
||||
+else()
|
||||
+ add_definitions(-DVK_EXAMPLE_DATA_DIR=\"${CMAKE_SOURCE_DIR}/data/\")
|
||||
+endif()
|
||||
+
|
||||
# Compiler specific stuff
|
||||
IF(MSVC)
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
|
||||
@@ -128,7 +141,7 @@ ELSE(WIN32)
|
||||
link_libraries(${XCB_LIBRARIES} ${Vulkan_LIBRARY})
|
||||
ENDIF(WIN32)
|
||||
|
||||
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/")
|
||||
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/")
|
||||
|
||||
set(EXAMPLES
|
||||
bloom
|
||||
diff --git a/base/vulkanexamplebase.cpp b/base/vulkanexamplebase.cpp
|
||||
index 647368a..a0f28a5 100644
|
||||
--- a/base/vulkanexamplebase.cpp
|
||||
+++ b/base/vulkanexamplebase.cpp
|
||||
@@ -84,7 +84,7 @@ const std::string VulkanExampleBase::getAssetPath()
|
||||
#if defined(__ANDROID__)
|
||||
return "";
|
||||
#else
|
||||
- return "./../data/";
|
||||
+ return VK_EXAMPLE_DATA_DIR;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
--
|
||||
2.13.2
|
||||
|
||||
|
|
@ -1,20 +1,3 @@
|
|||
# Copyright (C) 2020 Digi International
|
||||
|
||||
# Use the sources in poky's sumo recipe
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=dcf473723faabf17baa9b5f2207599d0 \
|
||||
file://triangle/triangle.cpp;endline=12;md5=bccd1bf9cadd9e10086cf7872157e4fa"
|
||||
|
||||
SRC_URI = "git://github.com/SaschaWillems/Vulkan.git \
|
||||
file://0001-Support-installing-demos-support-out-of-tree-builds.patch \
|
||||
file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \
|
||||
file://0001-Fix-build-on-x86.patch \
|
||||
"
|
||||
SRCREV = "18df00c7b4677b0889486e16977857aa987947e2"
|
||||
|
||||
DEPENDS_remove = "vulkan"
|
||||
DEPENDS_append = " vulkan-headers vulkan-loader"
|
||||
|
||||
# The vulkan-validationlayers package is necessary for the demos to work
|
||||
RDEPENDS_${PN} = "vulkan-validationlayers"
|
||||
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ HOMEPAGE = "https://www.khronos.org/vulkan/"
|
|||
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.1.92 \
|
||||
SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.1.121 \
|
||||
"
|
||||
SRCREV = "114c3546e195819bd53a34b39f5194b2989a5b12"
|
||||
SRCREV = "5671d014bc1792a116d374792f8a6cfba2e6f512"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
SUMMARY = "3D graphics and compute API common loader"
|
||||
DESCRIPTION = "Vulkan is a new generation graphics and compute API \
|
||||
that provides efficient access to modern GPUs. These packages \
|
||||
provide only the common vendor-agnostic library loader, headers and \
|
||||
the vulkaninfo utility."
|
||||
HOMEPAGE = "https://www.khronos.org/vulkan/"
|
||||
BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader"
|
||||
SECTION = "libs"
|
||||
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
|
||||
SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-${PV}"
|
||||
SRCREV = "a34eada3197b96e46bea3ad4b83bfa4b4396e2ea"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "vulkan"
|
||||
|
||||
inherit cmake distro_features_check python3native lib_package
|
||||
ANY_OF_DISTRO_FEATURES = "x11 wayland"
|
||||
|
||||
DEPENDS += "vulkan-headers"
|
||||
|
||||
EXTRA_OECMAKE = "-DBUILD_TESTS=OFF"
|
||||
|
||||
# must choose x11 or wayland or both
|
||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
|
||||
|
||||
PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON -DDEMOS_WSI_SELECTION=XCB, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF -DDEMOS_WSI_SELECTION=WAYLAND, libxcb libx11 libxrandr"
|
||||
PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
SUMMARY = "Vulkan loader"
|
||||
DESCRIPTION = "Vulkan loader is responsible for working with the various \
|
||||
layers as well as supporting multiple GPUs and their drivers.The loader is \
|
||||
critical to managing the proper dispatching of Vulkan functions to the appropriate \
|
||||
set of layers and ICDs."
|
||||
HOMEPAGE = "https://www.khronos.org/vulkan/"
|
||||
BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader"
|
||||
SECTION = "libs"
|
||||
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57\
|
||||
file://loader/loader.c;endline=25;md5=151b392f46568aaedb4ad22b246237ec"
|
||||
SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.1.92 \
|
||||
"
|
||||
SRCREV = "4cd7e44fc1ca6c4d8361720b43a3588ddf9fc4b6"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "vulkan"
|
||||
|
||||
inherit cmake python3native lib_package distro_features_check
|
||||
ANY_OF_DISTRO_FEATURES = "x11 wayland"
|
||||
|
||||
DEPENDS = "vulkan-headers"
|
||||
|
||||
EXTRA_OECMAKE = "-DBUILD_TESTS=OFF"
|
||||
|
||||
# must choose x11 or wayland or both
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '' ,d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '' ,d)}"
|
||||
|
||||
PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON -DDEMOS_WSI_SELECTION=XCB, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF -DDEMOS_WSI_SELECTION=WAYLAND, libxcb libx11 libxrandr"
|
||||
PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
|
||||
|
|
@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
|||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRCREV = "9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e"
|
||||
SRCREV = "ea8f6f0a3cdfc79bddf3566bf3f4b8350436695b"
|
||||
SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-${PV} \
|
||||
"
|
||||
# must choose x11 or wayland or both
|
||||
|
|
@ -1,21 +1,22 @@
|
|||
From 23ed27a79b3c9afa3dcb2138abf89f466a308702 Mon Sep 17 00:00:00 2001
|
||||
From 1f2837e05ed090ec553a3fc4fccee5618cf26d12 Mon Sep 17 00:00:00 2001
|
||||
From: Neena Busireddy <neenareddy.busireddy@nxp.com>
|
||||
Date: Wed, 5 Dec 2018 13:33:10 -0600
|
||||
Date: Thu, 8 Aug 2019 11:27:01 -0500
|
||||
Subject: [PATCH] CMakeLists.txt: Change the installation path of JSON files
|
||||
|
||||
Also modify the library path in JSON files to /usr/lib/libVK*.so
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Neena Busireddy <neenareddy.busireddy@nxp.com>
|
||||
---
|
||||
layers/CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
|
||||
index 5fd5b44..c4a7810 100644
|
||||
index 5541816..579c8b8 100644
|
||||
--- a/layers/CMakeLists.txt
|
||||
+++ b/layers/CMakeLists.txt
|
||||
@@ -105,7 +105,7 @@ if(WIN32)
|
||||
@@ -98,7 +98,7 @@ if(BUILD_LAYERS)
|
||||
elseif(UNIX) # UNIX includes APPLE
|
||||
foreach(TARGET_NAME ${TARGET_NAMES})
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${TARGET_NAME}.json
|
||||
|
|
@ -23,8 +24,8 @@ index 5fd5b44..c4a7810 100644
|
|||
+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/vulkan/explicit_layer.d)
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
@@ -236,7 +236,7 @@ if(UNIX)
|
||||
endif()
|
||||
@@ -256,7 +256,7 @@ if(BUILD_LAYERS)
|
||||
-DVK_VERSION=1.1.${vk_header_version})
|
||||
# If this json file is not a metalayer, get the needed properties from that target
|
||||
if(TARGET ${TARGET_NAME})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"file_format_version": "1.0.0",
|
||||
"ICD": {
|
||||
"library_path": "/usr/lib/vulkan/libvulkan_VSI.so",
|
||||
"api_version": "1.0.30"
|
||||
"library_path": "/usr/lib/libvulkan_VSI.so",
|
||||
"api_version": "1.1.82"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers"
|
|||
SECTION = "libs"
|
||||
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
|
||||
SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;nobranch=1 \
|
||||
"
|
||||
SRCREV = "6e6da6ccab8931f7c30815966ef839b1155e5bec"
|
||||
SRCREV = "88fcbab512e449203649d984317ff7b9a9f80b9d"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
Loading…
Reference in New Issue