From 94f16bf1cb1d72cbd56c8784c68eca4a07e73878 Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Sat, 6 Nov 2021 15:33:01 +0100 Subject: [PATCH 1/3] [ci] Update Vulkan SDK version --- .github/workflows/build.yml | 2 +- .github/workflows/static_analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47cf3bd20..f36eeb258 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: [push, pull_request] env: inexor_build_type: "Release" - inexor_vulkan_version: "1.2.131.1" + inexor_vulkan_version: "1.2.189.0" inexor_vulkan_sdk: "$GITHUB_WORKSPACE/../vulkan_sdk/" jobs: diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 6b07cac05..7381652ff 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -2,7 +2,7 @@ name: Static Analysis on: [push, pull_request] env: - inexor_vulkan_version: "1.2.131.1" + inexor_vulkan_version: "1.2.189.0" inexor_vulkan_sdk: "$GITHUB_WORKSPACE/../vulkan_sdk/" jobs: From 0782f50240458726fcc47855a32bccfbb47621b8 Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Sat, 6 Nov 2021 15:52:47 +0100 Subject: [PATCH 2/3] [byte-stream|cube] Fix clang-tidy warnings --- src/vulkan-renderer/io/byte_stream.cpp | 2 +- src/vulkan-renderer/world/cube.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vulkan-renderer/io/byte_stream.cpp b/src/vulkan-renderer/io/byte_stream.cpp index 0f15557a9..cb1387d77 100644 --- a/src/vulkan-renderer/io/byte_stream.cpp +++ b/src/vulkan-renderer/io/byte_stream.cpp @@ -55,7 +55,7 @@ std::string ByteStreamReader::read(const std::size_t &size) { check_end(size); auto start = m_iter; std::advance(m_iter, size); - return std::string(start, m_iter); + return {start, m_iter}; } template <> diff --git a/src/vulkan-renderer/world/cube.cpp b/src/vulkan-renderer/world/cube.cpp index 635dcdfd9..afc0e3d41 100644 --- a/src/vulkan-renderer/world/cube.cpp +++ b/src/vulkan-renderer/world/cube.cpp @@ -484,14 +484,14 @@ std::shared_ptr Cube::neighbor(const NeighborAxis axis, const NeighborDire while (!history.empty()) { if (child->m_type != Type::OCTANT) { // The neighbor is larger but still a neighbor! - return std::shared_ptr(child); + return {child}; } child = child->m_children[toggle_bit(history.back())]; history.pop_back(); } // We found a same-sized neighbor! - return std::shared_ptr(child); + return {child}; } std::shared_ptr create_random_world(std::uint32_t max_depth, const glm::vec3 &position, From 392410f7feb9af94129526df0c62a2dfdab5c0ae Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Sat, 6 Nov 2021 16:04:36 +0100 Subject: [PATCH 3/3] [clang-tidy] Ignore portability-simd-intrinsics --- .clang-tidy | 1 - 1 file changed, 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index 56d860d87..87b66ae39 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -290,7 +290,6 @@ Checks: > performance-unnecessary-copy-initialization, performance-unnecessary-value-param, portability-restrict-system-includes, - portability-simd-intrinsics, readability-avoid-const-params-in-decls, readability-braces-around-statements, readability-const-return-type,