diff options
| author | 2023-10-18 19:30:29 -0400 | |
|---|---|---|
| committer | 2023-10-18 19:30:29 -0400 | |
| commit | 134ecca9b0d3d6ec814c5ad850feaf917b1a347b (patch) | |
| tree | 45d6d91b419691b9dbafd678ffe54a10e1ce7149 | |
| parent | Merge pull request #11795 from Squall-Leonhart/D32FToOther (diff) | |
| parent | general: fix build failure on clang 17 (diff) | |
| download | yuzu-134ecca9b0d3d6ec814c5ad850feaf917b1a347b.tar.gz yuzu-134ecca9b0d3d6ec814c5ad850feaf917b1a347b.tar.xz yuzu-134ecca9b0d3d6ec814c5ad850feaf917b1a347b.zip | |
Merge pull request #11810 from liamwhite/clang-17
general: fix build failure on clang 17
Diffstat (limited to '')
| -rw-r--r-- | src/tests/common/unique_function.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_texture_cache.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tests/common/unique_function.cpp b/src/tests/common/unique_function.cpp index f7a23e876..42e6ade09 100644 --- a/src/tests/common/unique_function.cpp +++ b/src/tests/common/unique_function.cpp | |||
| @@ -46,8 +46,8 @@ TEST_CASE("UniqueFunction", "[common]") { | |||
| 46 | Noisy noisy; | 46 | Noisy noisy; |
| 47 | REQUIRE(noisy.state == "Default constructed"); | 47 | REQUIRE(noisy.state == "Default constructed"); |
| 48 | 48 | ||
| 49 | Common::UniqueFunction<void> func = [noisy = std::move(noisy)] { | 49 | Common::UniqueFunction<void> func = [noisy_inner = std::move(noisy)] { |
| 50 | REQUIRE(noisy.state == "Move constructed"); | 50 | REQUIRE(noisy_inner.state == "Move constructed"); |
| 51 | }; | 51 | }; |
| 52 | REQUIRE(noisy.state == "Moved away"); | 52 | REQUIRE(noisy.state == "Moved away"); |
| 53 | func(); | 53 | func(); |
| @@ -101,7 +101,7 @@ TEST_CASE("UniqueFunction", "[common]") { | |||
| 101 | }; | 101 | }; |
| 102 | Foo object{&num_destroyed}; | 102 | Foo object{&num_destroyed}; |
| 103 | { | 103 | { |
| 104 | Common::UniqueFunction<void> func = [object = std::move(object)] {}; | 104 | Common::UniqueFunction<void> func = [object_inner = std::move(object)] {}; |
| 105 | REQUIRE(num_destroyed == 0); | 105 | REQUIRE(num_destroyed == 0); |
| 106 | } | 106 | } |
| 107 | REQUIRE(num_destroyed == 1); | 107 | REQUIRE(num_destroyed == 1); |
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 80efd9517..de34f6d49 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp | |||
| @@ -2055,7 +2055,7 @@ void TextureCacheRuntime::TransitionImageLayout(Image& image) { | |||
| 2055 | }, | 2055 | }, |
| 2056 | }; | 2056 | }; |
| 2057 | scheduler.RequestOutsideRenderPassOperationContext(); | 2057 | scheduler.RequestOutsideRenderPassOperationContext(); |
| 2058 | scheduler.Record([barrier = barrier](vk::CommandBuffer cmdbuf) { | 2058 | scheduler.Record([barrier](vk::CommandBuffer cmdbuf) { |
| 2059 | cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, | 2059 | cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, |
| 2060 | VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, barrier); | 2060 | VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, barrier); |
| 2061 | }); | 2061 | }); |