artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #11859 from Kelebek1/compute_findbuffer

Browse source 
Add missing loop around compute FindBuffer calls
This commit is contained in:
liamwhite 2023-10-29 11:25:09 -04:00 committed by GitHub
parent 40c97c0549 68f25217b8
commit 1f9684eaf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/video_core/buffer_cache/buffer_cache.h
View file

@ -1067,8 +1067,7 @@ void BufferCache<P>::BindHostComputeTextureBuffers() {
template <class P> template <class P>
void BufferCache<P>::DoUpdateGraphicsBuffers(bool is_indexed) { void BufferCache<P>::DoUpdateGraphicsBuffers(bool is_indexed) {
do { BufferOperations([&]() {
channel_state->has_deleted_buffers = false;
if (is_indexed) { if (is_indexed) {
UpdateIndexBuffer(); UpdateIndexBuffer();
} }
@ -1082,14 +1081,16 @@ void BufferCache<P>::DoUpdateGraphicsBuffers(bool is_indexed) {
if (current_draw_indirect) { if (current_draw_indirect) {
UpdateDrawIndirect(); UpdateDrawIndirect();
} }
} while (channel_state->has_deleted_buffers); });
} }
template <class P> template <class P>
void BufferCache<P>::DoUpdateComputeBuffers() { void BufferCache<P>::DoUpdateComputeBuffers() {
UpdateComputeUniformBuffers(); BufferOperations([&]() {
UpdateComputeStorageBuffers(); UpdateComputeUniformBuffers();
UpdateComputeTextureBuffers(); UpdateComputeStorageBuffers();
UpdateComputeTextureBuffers();
});
} }
template <class P> template <class P>

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

@ -13,6 +13,7 @@
#include "common/microprofile.h" #include "common/microprofile.h"
#include "common/scope_exit.h" #include "common/scope_exit.h"
#include "common/settings.h" #include "common/settings.h"
#include "video_core/buffer_cache/buffer_cache.h"
#include "video_core/control/channel_state.h" #include "video_core/control/channel_state.h"
#include "video_core/engines/draw_manager.h" #include "video_core/engines/draw_manager.h"
#include "video_core/engines/kepler_compute.h" #include "video_core/engines/kepler_compute.h"
@ -285,6 +286,7 @@ void RasterizerVulkan::DrawTexture() {
query_cache.NotifySegment(true); query_cache.NotifySegment(true);
std::scoped_lock l{texture_cache.mutex};
texture_cache.SynchronizeGraphicsDescriptors(); texture_cache.SynchronizeGraphicsDescriptors();
texture_cache.UpdateRenderTargets(false); texture_cache.UpdateRenderTargets(false);