From fe7fe4ec51ad2799d811f5440b116e84246343a7 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Fri, 30 Aug 2024 10:23:12 +0100 Subject: [PATCH] Remove from_compute parameter --- src/video_core/renderer_vulkan/vk_compute_pipeline.cpp | 4 ++-- src/video_core/texture_cache/texture_cache.cpp | 2 +- src/video_core/texture_cache/texture_cache.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp index 38efa2cd..87824f90 100644 --- a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp @@ -195,7 +195,7 @@ bool ComputePipeline::BindResources(VideoCore::BufferCache& buffer_cache, } const u32 size = vsharp.GetSize(); if (desc.is_written) { - texture_cache.InvalidateMemory(address, size, true); + texture_cache.InvalidateMemory(address, size); } const u32 alignment = is_storage ? instance.StorageMinAlignment() : instance.UniformMinAlignment(); @@ -235,7 +235,7 @@ bool ComputePipeline::BindResources(VideoCore::BufferCache& buffer_cache, } } if (desc.is_written && info->pgm_hash != 0xfefebf9f && info->pgm_hash != 0x3d5ebf4e) { - texture_cache.InvalidateMemory(address, size, true); + texture_cache.InvalidateMemory(address, size); } const u32 alignment = instance.TexelBufferMinAlignment(); const auto [vk_buffer, offset] = diff --git a/src/video_core/texture_cache/texture_cache.cpp b/src/video_core/texture_cache/texture_cache.cpp index 41fc0fc1..3354a8ec 100644 --- a/src/video_core/texture_cache/texture_cache.cpp +++ b/src/video_core/texture_cache/texture_cache.cpp @@ -34,7 +34,7 @@ TextureCache::TextureCache(const Vulkan::Instance& instance_, Vulkan::Scheduler& TextureCache::~TextureCache() = default; -void TextureCache::InvalidateMemory(VAddr address, size_t size, bool from_compute) { +void TextureCache::InvalidateMemory(VAddr address, size_t size) { std::unique_lock lock{mutex}; ForEachImageInRegion(address, size, [&](ImageId image_id, Image& image) { if (!image.Overlaps(address, size)) { diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 8af68424..31b1e393 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -38,7 +38,7 @@ public: ~TextureCache(); /// Invalidates any image in the logical page range. - void InvalidateMemory(VAddr address, size_t size, bool from_compute = false); + void InvalidateMemory(VAddr address, size_t size); /// Evicts any images that overlap the unmapped range. void UnmapMemory(VAddr cpu_addr, size_t size);