Module: Mesa Branch: staging/21.2 Commit: b4bde3da44b05782d18ddde9a789fcbd33bd5d9a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b4bde3da44b05782d18ddde9a789fcbd33bd5d9a
Author: Vinson Lee <[email protected]> Date: Mon Aug 9 15:48:25 2021 -0700 freedreno: Require C++17. Commit 3a772be026c ("freedreno: Add perfetto renderpass support") uses C++17 init-statement feature. GCC ../src/gallium/drivers/freedreno/freedreno_perfetto.cc: In lambda function: ../src/gallium/drivers/freedreno/freedreno_perfetto.cc:148:11: warning: init-statement in selection statements only available with ‘-std=c++17’ or ‘-std=gnu++17’ 148 | if (auto state = tctx.GetIncrementalState(); state->was_cleared) { | ^~~~ Clang ../src/gallium/drivers/freedreno/freedreno_perfetto.cc:148:11: warning: 'if' initialization statements are a C++17 extension [-Wc++17-extensions] if (auto state = tctx.GetIncrementalState(); state->was_cleared) { ^ Intel C++ Compiler ../src/gallium/drivers/freedreno/freedreno_perfetto.cc(148): error: expected a ")" if (auto state = tctx.GetIncrementalState(); state->was_cleared) { ^ Fixes: 3a772be026c ("freedreno: Add perfetto renderpass support") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5193 Suggested-by: Erik Faye-Lund <[email protected]> Signed-off-by: Vinson Lee <[email protected]> Acked-by: Rob Clark <[email protected]> Acked-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12293> (cherry picked from commit 4fc2a6cbdb6fab868a2ee4ee753caa2e83cf6666) --- .pick_status.json | 2 +- src/gallium/drivers/freedreno/meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 7c2f17999c3..8a11640f839 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -193,7 +193,7 @@ "description": "freedreno: Require C++17.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3a772be026c16161d96e29c10b94ee7fbc279c68" }, diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build index 9f1747646e1..eac04aa4d97 100644 --- a/src/gallium/drivers/freedreno/meson.build +++ b/src/gallium/drivers/freedreno/meson.build @@ -273,6 +273,7 @@ libfreedreno = static_library( cpp_args : [freedreno_cpp_args], gnu_symbol_visibility : 'hidden', dependencies : libfreedreno_dependencies, + override_options : ['cpp_std=c++17'], ) driver_freedreno = declare_dependency(
