From 455dfeb39f15ea191d9000cc5960d5673bff0d66 Mon Sep 17 00:00:00 2001 From: DrChat Date: Fri, 9 Feb 2018 16:58:56 -0600 Subject: [PATCH] [Vulkan] Use a static function for texture invalidation callbacks --- src/xenia/gpu/vulkan/texture_cache.cc | 49 ++++++++++----------------- src/xenia/gpu/vulkan/texture_cache.h | 3 ++ 2 files changed, 21 insertions(+), 31 deletions(-) diff --git a/src/xenia/gpu/vulkan/texture_cache.cc b/src/xenia/gpu/vulkan/texture_cache.cc index aa049788f..2577b6774 100644 --- a/src/xenia/gpu/vulkan/texture_cache.cc +++ b/src/xenia/gpu/vulkan/texture_cache.cc @@ -364,6 +364,22 @@ bool TextureCache::FreeTexture(Texture* texture) { return true; } +void TextureCache::WatchCallback(void* context_ptr, void* data_ptr, + uint32_t address) { + auto self = reinterpret_cast(context_ptr); + auto touched_texture = reinterpret_cast(data_ptr); + // Clear watch handle first so we don't redundantly + // remove. + assert_not_zero(touched_texture->access_watch_handle); + touched_texture->access_watch_handle = 0; + touched_texture->pending_invalidation = true; + + // Add to pending list so Scavenge will clean it up. + self->invalidated_textures_mutex_.lock(); + self->invalidated_textures_->push_back(touched_texture); + self->invalidated_textures_mutex_.unlock(); +} + TextureCache::Texture* TextureCache::DemandResolveTexture( const TextureInfo& texture_info) { auto texture_hash = texture_info.hash(); @@ -411,22 +427,7 @@ TextureCache::Texture* TextureCache::DemandResolveTexture( // Setup an access watch. If this texture is touched, it is destroyed. texture->access_watch_handle = memory_->AddPhysicalAccessWatch( texture_info.guest_address, texture_info.input_length, - cpu::MMIOHandler::kWatchWrite, - [](void* context_ptr, void* data_ptr, uint32_t address) { - auto self = reinterpret_cast(context_ptr); - auto touched_texture = reinterpret_cast(data_ptr); - // Clear watch handle first so we don't redundantly - // remove. - assert_not_zero(touched_texture->access_watch_handle); - touched_texture->access_watch_handle = 0; - touched_texture->pending_invalidation = true; - - // Add to pending list so Scavenge will clean it up. - self->invalidated_textures_mutex_.lock(); - self->invalidated_textures_->push_back(touched_texture); - self->invalidated_textures_mutex_.unlock(); - }, - this, texture); + cpu::MMIOHandler::kWatchWrite, &WatchCallback, this, texture); textures_[texture_hash] = texture; return texture; @@ -486,21 +487,7 @@ TextureCache::Texture* TextureCache::Demand(const TextureInfo& texture_info, // guest. texture->access_watch_handle = memory_->AddPhysicalAccessWatch( texture_info.guest_address, texture_info.input_length, - cpu::MMIOHandler::kWatchWrite, - [](void* context_ptr, void* data_ptr, uint32_t address) { - auto self = reinterpret_cast(context_ptr); - auto touched_texture = reinterpret_cast(data_ptr); - // Clear watch handle first so we don't redundantly - // remove. - assert_not_zero(touched_texture->access_watch_handle); - touched_texture->access_watch_handle = 0; - touched_texture->pending_invalidation = true; - // Add to pending list so Scavenge will clean it up. - self->invalidated_textures_mutex_.lock(); - self->invalidated_textures_->push_back(touched_texture); - self->invalidated_textures_mutex_.unlock(); - }, - this, texture); + cpu::MMIOHandler::kWatchWrite, &WatchCallback, this, texture); if (!UploadTexture(command_buffer, completion_fence, texture, texture_info)) { FreeTexture(texture); diff --git a/src/xenia/gpu/vulkan/texture_cache.h b/src/xenia/gpu/vulkan/texture_cache.h index dcc9894ed..488924bb4 100644 --- a/src/xenia/gpu/vulkan/texture_cache.h +++ b/src/xenia/gpu/vulkan/texture_cache.h @@ -134,6 +134,9 @@ class TextureCache { VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT); bool FreeTexture(Texture* texture); + static void WatchCallback(void* context_ptr, void* data_ptr, + uint32_t address); + // Demands a texture. If command_buffer is null and the texture hasn't been // uploaded to graphics memory already, we will return null and bail. Texture* Demand(const TextureInfo& texture_info,