octocar/eden
1
0
Fork 0
forked from eden-emu/eden
Code Pull requests Activity

Merge pull request #11810 from liamwhite/clang-17

Browse source 
general: fix build failure on clang 17
This commit is contained in:
liamwhite 2023-10-18 19:30:29 -04:00 • committed by GitHub
commit 134ecca9b0
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/tests/common/unique_function.cpp
View file

@ -46,8 +46,8 @@ TEST_CASE("UniqueFunction", "[common]") {
Noisy noisy; Noisy noisy;
REQUIRE(noisy.state == "Default constructed"); REQUIRE(noisy.state == "Default constructed");
Common::UniqueFunction<void> func = [noisy = std::move(noisy)] { Common::UniqueFunction<void> func = [noisy_inner = std::move(noisy)] {
REQUIRE(noisy.state == "Move constructed"); REQUIRE(noisy_inner.state == "Move constructed");
}; };
REQUIRE(noisy.state == "Moved away"); REQUIRE(noisy.state == "Moved away");
func(); func();
@ -101,7 +101,7 @@ TEST_CASE("UniqueFunction", "[common]") {
}; };
Foo object{&num_destroyed}; 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 == 0);
} }
REQUIRE(num_destroyed == 1); REQUIRE(num_destroyed == 1);

2
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View file

@ -2055,7 +2055,7 @@ void TextureCacheRuntime::TransitionImageLayout(Image& image) {
}, },
}; };
scheduler.RequestOutsideRenderPassOperationContext(); scheduler.RequestOutsideRenderPassOperationContext();
scheduler.Record([barrier = barrier](vk::CommandBuffer cmdbuf) { scheduler.Record([barrier](vk::CommandBuffer cmdbuf) {
cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, barrier); VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, barrier);
}); });