summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar Fernando Sahmkow2023-05-04 03:16:57 +0200
committerGravatar Fernando Sahmkow2023-05-07 23:46:12 +0200
commit6f90dff2938b5bd5e9311e924e8a29945f16ac18 (patch)
tree60d757ecc85615cf846b20a8d392261645a997ab /src/video_core
parentQuery cache: stop updating pages as it's not affected by cpu writes (diff)
downloadyuzu-6f90dff2938b5bd5e9311e924e8a29945f16ac18.tar.gz
yuzu-6f90dff2938b5bd5e9311e924e8a29945f16ac18.tar.xz
yuzu-6f90dff2938b5bd5e9311e924e8a29945f16ac18.zip
Address feedback, add CR notice, etc
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/fence_manager.h7
-rw-r--r--src/video_core/rasterizer_download_area.h3
-rw-r--r--src/video_core/renderer_vulkan/vk_rasterizer.cpp4
-rw-r--r--src/video_core/texture_cache/image_view_base.cpp3
4 files changed, 13 insertions, 4 deletions
diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h
index 850d6f27d..35d699bbf 100644
--- a/src/video_core/fence_manager.h
+++ b/src/video_core/fence_manager.h
@@ -55,7 +55,12 @@ public:
55 55
56 // Unlike other fences, this one doesn't 56 // Unlike other fences, this one doesn't
57 void SignalOrdering() { 57 void SignalOrdering() {
58 std::function<void()> do_nothing([]{}); 58 std::scoped_lock lock{buffer_cache.mutex};
59 buffer_cache.AccumulateFlushes();
60 }
61
62 void SignalReference() {
63 std::function<void()> do_nothing([] {});
59 SignalFence(std::move(do_nothing)); 64 SignalFence(std::move(do_nothing));
60 } 65 }
61 66
diff --git a/src/video_core/rasterizer_download_area.h b/src/video_core/rasterizer_download_area.h
index 771ce903d..2d7425c79 100644
--- a/src/video_core/rasterizer_download_area.h
+++ b/src/video_core/rasterizer_download_area.h
@@ -1,3 +1,6 @@
1// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
2// SPDX-License-Identifier: GPL-3.0-or-later
3
1#pragma once 4#pragma once
2 5
3#include "common/common_types.h" 6#include "common/common_types.h"
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
index bae4aa611..2beb0efea 100644
--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
@@ -621,7 +621,7 @@ void RasterizerVulkan::SignalSyncPoint(u32 value) {
621} 621}
622 622
623void RasterizerVulkan::SignalReference() { 623void RasterizerVulkan::SignalReference() {
624 fence_manager.SignalOrdering(); 624 fence_manager.SignalReference();
625} 625}
626 626
627void RasterizerVulkan::ReleaseFences() { 627void RasterizerVulkan::ReleaseFences() {
@@ -654,7 +654,7 @@ void RasterizerVulkan::WaitForIdle() {
654 cmdbuf.SetEvent(event, flags); 654 cmdbuf.SetEvent(event, flags);
655 cmdbuf.WaitEvents(event, flags, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, {}, {}, {}); 655 cmdbuf.WaitEvents(event, flags, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, {}, {}, {});
656 }); 656 });
657 SignalReference(); 657 fence_manager.SignalOrdering();
658} 658}
659 659
660void RasterizerVulkan::FragmentBarrier() { 660void RasterizerVulkan::FragmentBarrier() {
diff --git a/src/video_core/texture_cache/image_view_base.cpp b/src/video_core/texture_cache/image_view_base.cpp
index 30a7c11f5..c3b2b196d 100644
--- a/src/video_core/texture_cache/image_view_base.cpp
+++ b/src/video_core/texture_cache/image_view_base.cpp
@@ -26,7 +26,8 @@ ImageViewBase::ImageViewBase(const ImageViewInfo& info, const ImageInfo& image_i
26 ASSERT_MSG(VideoCore::Surface::IsViewCompatible(image_info.format, info.format, false, true), 26 ASSERT_MSG(VideoCore::Surface::IsViewCompatible(image_info.format, info.format, false, true),
27 "Image view format {} is incompatible with image format {}", info.format, 27 "Image view format {} is incompatible with image format {}", info.format,
28 image_info.format); 28 image_info.format);
29 const bool preemptive = !Settings::values.use_reactive_flushing.GetValue() && image_info.type == ImageType::Linear; 29 const bool preemptive =
30 !Settings::values.use_reactive_flushing.GetValue() && image_info.type == ImageType::Linear;
30 if (image_info.forced_flushed || preemptive) { 31 if (image_info.forced_flushed || preemptive) {
31 flags |= ImageViewFlagBits::PreemtiveDownload; 32 flags |= ImageViewFlagBits::PreemtiveDownload;
32 } 33 }