ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Vulkan] Disable texture mipmap watches by default.

This commit is contained in:
gibbed 2018-05-31 23:00:11 -05:00
parent 79f8fe9f37
commit 0d429fc7d7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/gpu/vulkan/texture_cache.cc
View File

@ -27,6 +27,8 @@ namespace vulkan {
using xe::ui::vulkan::CheckResult; using xe::ui::vulkan::CheckResult;
DEFINE_bool(enable_mip_watches, false, "Enable mipmap watches");
constexpr uint32_t kMaxTextureSamplers = 32; constexpr uint32_t kMaxTextureSamplers = 32;
constexpr VkDeviceSize kStagingBufferSize = 64 * 1024 * 1024; constexpr VkDeviceSize kStagingBufferSize = 64 * 1024 * 1024;
@ -321,9 +323,9 @@ void TextureCache::WatchCallback(void* context_ptr, void* data_ptr,
return; return;
} }
assert_not_zero(touched_texture->access_watch_handle);
// Clear watch handle first so we don't redundantly // Clear watch handle first so we don't redundantly
// remove. // remove.
assert_not_zero(touched_texture->access_watch_handle);
touched_texture->access_watch_handle = 0; touched_texture->access_watch_handle = 0;
touched_texture->pending_invalidation = true; touched_texture->pending_invalidation = true;
@ -383,7 +385,7 @@ TextureCache::Texture* TextureCache::DemandResolveTexture(
get_dimension_name(texture_info.dimension))); get_dimension_name(texture_info.dimension)));
// Setup an access watch. If this texture is touched, it is destroyed. // Setup an access watch. If this texture is touched, it is destroyed.
if (!texture_info.memory.mip_address) { if (!FLAGS_enable_mip_watches || !texture_info.memory.mip_address) {
texture->access_watch_handle = memory_->AddPhysicalAccessWatch( texture->access_watch_handle = memory_->AddPhysicalAccessWatch(
texture_info.memory.base_address, texture_info.memory.base_size, texture_info.memory.base_address, texture_info.memory.base_size,
cpu::MMIOHandler::kWatchWrite, &WatchCallback, this, texture); cpu::MMIOHandler::kWatchWrite, &WatchCallback, this, texture);
@ -494,7 +496,7 @@ TextureCache::Texture* TextureCache::Demand(const TextureInfo& texture_info,
// Okay. Put a writewatch on it to tell us if it's been modified from the // Okay. Put a writewatch on it to tell us if it's been modified from the
// guest. // guest.
if (!texture_info.memory.mip_address) { if (!FLAGS_enable_mip_watches || !texture_info.memory.mip_address) {
texture->access_watch_handle = memory_->AddPhysicalAccessWatch( texture->access_watch_handle = memory_->AddPhysicalAccessWatch(
texture_info.memory.base_address, texture_info.memory.base_size, texture_info.memory.base_address, texture_info.memory.base_size,
cpu::MMIOHandler::kWatchWrite, &WatchCallback, this, texture); cpu::MMIOHandler::kWatchWrite, &WatchCallback, this, texture);