Browse Source
Merge pull request #11810 from liamwhite/clang-17
general: fix build failure on clang 17
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
src/tests/common/unique_function.cpp
-
src/video_core/renderer_vulkan/vk_texture_cache.cpp
|
|
|
@ -46,8 +46,8 @@ TEST_CASE("UniqueFunction", "[common]") { |
|
|
|
Noisy noisy; |
|
|
|
REQUIRE(noisy.state == "Default constructed"); |
|
|
|
|
|
|
|
Common::UniqueFunction<void> func = [noisy = std::move(noisy)] { |
|
|
|
REQUIRE(noisy.state == "Move constructed"); |
|
|
|
Common::UniqueFunction<void> func = [noisy_inner = std::move(noisy)] { |
|
|
|
REQUIRE(noisy_inner.state == "Move constructed"); |
|
|
|
}; |
|
|
|
REQUIRE(noisy.state == "Moved away"); |
|
|
|
func(); |
|
|
|
@ -101,7 +101,7 @@ TEST_CASE("UniqueFunction", "[common]") { |
|
|
|
}; |
|
|
|
Foo object{&num_destroyed}; |
|
|
|
{ |
|
|
|
Common::UniqueFunction<void> func = [object = std::move(object)] {}; |
|
|
|
Common::UniqueFunction<void> func = [object_inner = std::move(object)] {}; |
|
|
|
REQUIRE(num_destroyed == 0); |
|
|
|
} |
|
|
|
REQUIRE(num_destroyed == 1); |
|
|
|
|
|
|
|
@ -2055,7 +2055,7 @@ void TextureCacheRuntime::TransitionImageLayout(Image& image) { |
|
|
|
}, |
|
|
|
}; |
|
|
|
scheduler.RequestOutsideRenderPassOperationContext(); |
|
|
|
scheduler.Record([barrier = barrier](vk::CommandBuffer cmdbuf) { |
|
|
|
scheduler.Record([barrier](vk::CommandBuffer cmdbuf) { |
|
|
|
cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, |
|
|
|
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, barrier); |
|
|
|
}); |
|
|
|
|