Skip to content

Commit

Permalink
[merge] Merge pull request #437 from inexorgame/hanni/fix_ci
Browse files Browse the repository at this point in the history
[ci] Update Vulkan SDK version and fix clang-tidy warnings
  • Loading branch information
IAmNotHanni committed Nov 6, 2021
2 parents cfea348 + 392410f commit 82b4265
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
1 change: 0 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/vulkan-renderer/io/byte_stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <>
Expand Down
4 changes: 2 additions & 2 deletions src/vulkan-renderer/world/cube.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -484,14 +484,14 @@ std::shared_ptr<Cube> 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<Cube>(child);
return {child};
}
child = child->m_children[toggle_bit(history.back())];
history.pop_back();
}

// We found a same-sized neighbor!
return std::shared_ptr<Cube>(child);
return {child};
}

std::shared_ptr<Cube> create_random_world(std::uint32_t max_depth, const glm::vec3 &position,
Expand Down

0 comments on commit 82b4265

Please sign in to comment.