mirror of
https://git.yoctoproject.org/poky
synced 2026-05-01 06:32:11 +02:00
vulkan: update 1.3.216.0 -> 1.3.224.1
(From OE-Core rev: c9d245a78a22542ea4fb063370974ac1c85be74d) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
4515da64cc
commit
491c56d06c
@@ -1,4 +1,4 @@
|
||||
From 6692611126b40d499c94bbcc8e29604560262072 Mon Sep 17 00:00:00 2001
|
||||
From 7161916f69ae257ce06d9c9bf25abf9709bc55cc Mon Sep 17 00:00:00 2001
|
||||
From: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
Date: Sun, 7 Feb 2021 01:30:39 +0000
|
||||
Subject: [PATCH] generate glslang pkg-config
|
||||
@@ -16,21 +16,21 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
create mode 100644 glslang/glslang.pc.cmake.in
|
||||
|
||||
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
|
||||
index 1c7d22a2..10c1e841 100644
|
||||
index 45c9813a..cea13975 100644
|
||||
--- a/glslang/CMakeLists.txt
|
||||
+++ b/glslang/CMakeLists.txt
|
||||
@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL)
|
||||
EXPORT glslangTargets
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
endif()
|
||||
@@ -221,6 +221,8 @@ if(ENABLE_GLSLANG_INSTALL)
|
||||
endif()
|
||||
")
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
||||
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY)
|
||||
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
|
||||
install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
||||
|
||||
set(ALL_HEADERS
|
||||
${GLSLANG_HEADERS}
|
||||
diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in
|
||||
new file mode 100644
|
||||
index 00000000..64b6882d
|
||||
index 00000000..948a0952
|
||||
--- /dev/null
|
||||
+++ b/glslang/glslang.pc.cmake.in
|
||||
@@ -0,0 +1,11 @@
|
||||
|
||||
@@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
|
||||
LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3"
|
||||
|
||||
SRCREV = "adbf0d3106b26daa237b10b9bf72b1af7c31092d"
|
||||
SRCREV = "10423ec659d301a0ff2daac8bbf38980abf27590"
|
||||
SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \
|
||||
file://0001-generate-glslang-pkg-config.patch"
|
||||
PE = "1"
|
||||
@@ -1,34 +0,0 @@
|
||||
From a90ccc240501bf3362b23f67771f65b7dec2ccf9 Mon Sep 17 00:00:00 2001
|
||||
From: Jamie Madill <jmadill@chromium.org>
|
||||
Date: Fri, 29 Jul 2022 14:26:37 -0400
|
||||
Subject: [PATCH] Remove default copy constructor in header. (#4879)
|
||||
|
||||
A recent libc++ roll in Chrome warned of a deprecated copy. We're
|
||||
still looking if this is a bug in libc++ or a valid warning, but
|
||||
removing the redundant line is a safe workaround or fix in either
|
||||
case.
|
||||
|
||||
See discussion in https://crrev.com/c/3791771
|
||||
|
||||
Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Tools/pull/4879]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
source/opt/merge_return_pass.h | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/source/opt/merge_return_pass.h b/source/opt/merge_return_pass.h
|
||||
index a35cf269..d15db2f6 100644
|
||||
--- a/source/opt/merge_return_pass.h
|
||||
+++ b/source/opt/merge_return_pass.h
|
||||
@@ -118,8 +118,6 @@ class MergeReturnPass : public MemPass {
|
||||
StructuredControlState(Instruction* break_merge, Instruction* merge)
|
||||
: break_merge_(break_merge), current_merge_(merge) {}
|
||||
|
||||
- StructuredControlState(const StructuredControlState&) = default;
|
||||
-
|
||||
bool InBreakable() const { return break_merge_; }
|
||||
bool InStructuredFlow() const { return CurrentMergeId() != 0; }
|
||||
|
||||
--
|
||||
2.37.2
|
||||
|
||||
@@ -7,10 +7,8 @@ SECTION = "graphics"
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
|
||||
SRCREV = "c94501352d545e84c821ce031399e76d1af32d18"
|
||||
SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https \
|
||||
file://0001-Remove-default-copy-constructor-in-header.-4879.patch \
|
||||
"
|
||||
SRCREV = "5e61ea2098220059e89523f1f47b0bcd8c33b89a"
|
||||
SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https"
|
||||
PE = "1"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
|
||||
S = "${WORKDIR}/git"
|
||||
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
|
||||
|
||||
SRCREV = "3ef4c97fd6ea001d75a8e9da408ee473c180e456"
|
||||
SRCREV = "c896e2f920273bfee852da9cca2a356bc1c2031e"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -9,8 +9,8 @@ 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-1.3.216;protocol=https"
|
||||
SRCREV = "322f7e3212b4fd9d70d7f48972963c83d24d06e4"
|
||||
SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.224;protocol=https"
|
||||
SRCREV = "09afdf64210b11ec653a1001e013b5af4fce8559"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -7,7 +7,7 @@ SECTION = "libs"
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=master;protocol=https"
|
||||
SRCREV = "ef9db7a8ec52f6c56158d83f5d57ef388c1abec1"
|
||||
SRCREV = "497f232680b046db34ba9e9da065e6303a125851"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user