summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDrChat <arkolbed@gmail.com>2018-02-07 18:40:12 -0600
committerDrChat <arkolbed@gmail.com>2018-02-07 18:40:12 -0600
commit7ea33816999e3f217c3a0d1663162d39712aade1 (patch)
tree895295fbbdd1f161d9107de62a08a9eed234577c /src
parent26212bffb0468a6dfe91ec759f901aff5df71779 (diff)
[Vulkan] texture_bindings_ -> texture_sets_
Diffstat (limited to 'src')
-rw-r--r--src/xenia/gpu/vulkan/texture_cache.cc7
-rw-r--r--src/xenia/gpu/vulkan/texture_cache.h2
2 files changed, 4 insertions, 5 deletions
diff --git a/src/xenia/gpu/vulkan/texture_cache.cc b/src/xenia/gpu/vulkan/texture_cache.cc
index 3a684bb5e..e8fe61181 100644
--- a/src/xenia/gpu/vulkan/texture_cache.cc
+++ b/src/xenia/gpu/vulkan/texture_cache.cc
@@ -1329,8 +1329,7 @@ VkDescriptorSet TextureCache::PrepareTextureSet(
HashTextureBindings(&hash_state, fetch_mask, vertex_bindings);
HashTextureBindings(&hash_state, fetch_mask, pixel_bindings);
uint64_t hash = XXH64_digest(&hash_state);
- for (auto it = texture_bindings_.find(hash); it != texture_bindings_.end();
- ++it) {
+ for (auto it = texture_sets_.find(hash); it != texture_sets_.end(); ++it) {
// TODO(DrChat): We need to compare the bindings and ensure they're equal.
return it->second;
}
@@ -1378,7 +1377,7 @@ VkDescriptorSet TextureCache::PrepareTextureSet(
update_set_info->image_writes, 0, nullptr);
}
- texture_bindings_[hash] = descriptor_set;
+ texture_sets_[hash] = descriptor_set;
return descriptor_set;
}
@@ -1515,7 +1514,7 @@ void TextureCache::Scavenge() {
// Free unused descriptor sets
// TODO(DrChat): These sets could persist across frames, we just need a smart
// way to detect if they're unused and free them.
- texture_bindings_.clear();
+ texture_sets_.clear();
descriptor_pool_->Scavenge();
staging_buffer_.Scavenge();
diff --git a/src/xenia/gpu/vulkan/texture_cache.h b/src/xenia/gpu/vulkan/texture_cache.h
index 483b88bd2..dcc9894ed 100644
--- a/src/xenia/gpu/vulkan/texture_cache.h
+++ b/src/xenia/gpu/vulkan/texture_cache.h
@@ -188,7 +188,7 @@ class TextureCache {
std::unique_ptr<xe::ui::vulkan::CommandBufferPool> wb_command_pool_ = nullptr;
std::unique_ptr<xe::ui::vulkan::DescriptorPool> descriptor_pool_ = nullptr;
- std::unordered_map<uint64_t, VkDescriptorSet> texture_bindings_;
+ std::unordered_map<uint64_t, VkDescriptorSet> texture_sets_;
VkDescriptorSetLayout texture_descriptor_set_layout_ = nullptr;
VmaAllocator mem_allocator_ = nullptr;