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

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Aug 6 23:07:04 UTC 2020


Module: Mesa
Branch: master
Commit: 21b47cbd9968035edff9069b0939151bc3ad8182
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=21b47cbd9968035edff9069b0939151bc3ad8182

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>

---

 src/amd/compiler/aco_ir.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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,



More information about the mesa-commit mailing list