Mesa (staging/20.2): aco: fix C++11/C++14 compilation

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: 20663891c1d71a67a4e0267fcde3426d3e0a1aaa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=20663891c1d71a67a4e0267fcde3426d3e0a1aaa

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Thu Aug  6 23:21:47 2020 +0100

aco: fix C++11/C++14 compilation

static_assert without a message is only available since C++17.

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Fixes: d1f992f3c2d ('aco: rework barriers and replace can_reorder')
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3374
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6216>
(cherry picked from commit 21b47cbd9968035edff9069b0939151bc3ad8182)

---

 .pick_status.json         | 2 +-
 src/amd/compiler/aco_ir.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 43c32501b12..35d2e0a82fa 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -382,7 +382,7 @@
         "description": "aco: fix C++11/C++14 compilation",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "d1f992f3c2d138faa0c89a2486c4252a06886106"
     },
diff --git a/src/amd/compiler/aco_ir.h b/src/amd/compiler/aco_ir.h
index 9dda1ffb723..1d6220ef928 100644
--- a/src/amd/compiler/aco_ir.h
+++ b/src/amd/compiler/aco_ir.h
@@ -174,7 +174,7 @@ struct memory_sync_info {
       return (!storage || (semantics & semantic_can_reorder)) && !(semantics & semantic_volatile);
    }
 };
-static_assert(sizeof(memory_sync_info) == 3);
+static_assert(sizeof(memory_sync_info) == 3, "Unexpected padding");
 
 enum fp_round {
    fp_round_ne = 0,