spirv-tools: upgrade 2019.5 -> 2020.5

(From OE-Core rev: 2a6fe25769236ec7d5ead3c29864f2292ffb3fd5)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-11-02 17:47:49 +01:00
committed by Richard Purdie
parent 4a7ca52c9e
commit 5cf7c8c8b6
2 changed files with 2 additions and 53 deletions

View File

@@ -1,50 +0,0 @@
From 4fffcd275b50d08b54b0411679ead98970651bad Mon Sep 17 00:00:00 2001
From: David Neto <dneto@google.com>
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 <raj.khem@gmail.com>
---
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<std::vector<uint32_t>, 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 <typename PassT, typename... Args>
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

View File

@@ -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"