From 2a6fe25769236ec7d5ead3c29864f2292ffb3fd5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 2 Nov 2020 17:47:49 +0100 Subject: [PATCH] spirv-tools: upgrade 2019.5 -> 2020.5 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...0001-Avoid-pessimizing-std-move-3124.patch | 50 ------------------- ...-tools_2019.5.bb => spirv-tools_2020.5.bb} | 5 +- 2 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch rename meta/recipes-graphics/spir/{spirv-tools_2019.5.bb => spirv-tools_2020.5.bb} (89%) diff --git a/meta/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch b/meta/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch deleted file mode 100644 index 9b48cdcd09..0000000000 --- a/meta/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4fffcd275b50d08b54b0411679ead98970651bad Mon Sep 17 00:00:00 2001 -From: David Neto -Date: Fri, 27 Dec 2019 12:05:58 -0500 -Subject: [PATCH] Avoid pessimizing std::move (#3124) - -Should fix a warning - -Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Tools/commit/8aa423930db37e37086665efcc55944d577c06e5] -Signed-off-by: Khem Raj ---- - test/opt/pass_fixture.h | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/test/opt/pass_fixture.h b/test/opt/pass_fixture.h -index 53fb206f..64c089d8 100644 ---- a/test/opt/pass_fixture.h -+++ b/test/opt/pass_fixture.h -@@ -60,8 +60,7 @@ class PassTest : public TestT { - // from pass Process() function. - std::tuple, Pass::Status> OptimizeToBinary( - Pass* pass, const std::string& original, bool skip_nop) { -- context_ = -- std::move(BuildModule(env_, consumer_, original, assemble_options_)); -+ context_ = BuildModule(env_, consumer_, original, assemble_options_); - EXPECT_NE(nullptr, context()) << "Assembling failed for shader:\n" - << original << std::endl; - if (!context()) { -@@ -197,8 +196,7 @@ class PassTest : public TestT { - // messages. - template - void SinglePassRunAndFail(const std::string& original, Args&&... args) { -- context_ = -- std::move(BuildModule(env_, consumer_, original, assemble_options_)); -+ context_ = BuildModule(env_, consumer_, original, assemble_options_); - EXPECT_NE(nullptr, context()) << "Assembling failed for shader:\n" - << original << std::endl; - std::ostringstream errs; -@@ -235,8 +233,7 @@ class PassTest : public TestT { - void RunAndCheck(const std::string& original, const std::string& expected) { - assert(manager_->NumPasses()); - -- context_ = -- std::move(BuildModule(env_, nullptr, original, assemble_options_)); -+ context_ = BuildModule(env_, nullptr, original, assemble_options_); - ASSERT_NE(nullptr, context()); - - context()->set_preserve_bindings(OptimizerOptions()->preserve_bindings_); --- -2.24.1 - diff --git a/meta/recipes-graphics/spir/spirv-tools_2019.5.bb b/meta/recipes-graphics/spir/spirv-tools_2020.5.bb similarity index 89% rename from meta/recipes-graphics/spir/spirv-tools_2019.5.bb rename to meta/recipes-graphics/spir/spirv-tools_2020.5.bb index 0b54706974..5e42987240 100644 --- a/meta/recipes-graphics/spir/spirv-tools_2019.5.bb +++ b/meta/recipes-graphics/spir/spirv-tools_2020.5.bb @@ -14,10 +14,9 @@ SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch;destsuffix=${DEST_DIR}/effcee \ - file://0001-Avoid-pessimizing-std-move-3124.patch \ " -SRCREV_spirv-tools = "c413b982c316b14e784f50d941814fc737b55b4a" -SRCREV_spirv-headers = "af64a9e826bf5bb5fcd2434dd71be1e41e922563" +SRCREV_spirv-tools = "b27e039c68dd9eb959bb9249fcb2c9a54841474b" +SRCREV_spirv-headers = "3fdabd0da2932c276b25b9b4a988ba134eba1aa6" SRCREV_effcee = "cd25ec17e9382f99a895b9ef53ff3c277464d07d" SRCREV_re2 = "5bd613749fd530b576b890283bfb6bc6ea6246cb" SRCREV_googletest = "f2fb48c3b3d79a75a88a99fba6576b25d42ec528" -- 2.40.1