summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDrChat <arkolbed@gmail.com>2017-08-09 00:10:52 -0500
committerDrChat <arkolbed@gmail.com>2017-08-09 00:10:52 -0500
commit8b5eb1cd38f99d35363b9340fdb65412b89bd4be (patch)
treed518f9e53fee7a5f872e687a12315b54747591cd /src
parente9e23c02a20dc52e9df16819b407b120e3636c75 (diff)
Vulkan: Remove redundant format argument from DemandResolveTexture
Diffstat (limited to 'src')
-rw-r--r--src/xenia/gpu/vulkan/texture_cache.cc2
-rw-r--r--src/xenia/gpu/vulkan/texture_cache.h3
-rw-r--r--src/xenia/gpu/vulkan/vulkan_command_processor.cc6
3 files changed, 6 insertions, 5 deletions
diff --git a/src/xenia/gpu/vulkan/texture_cache.cc b/src/xenia/gpu/vulkan/texture_cache.cc
index a324c2b17..848171374 100644
--- a/src/xenia/gpu/vulkan/texture_cache.cc
+++ b/src/xenia/gpu/vulkan/texture_cache.cc
@@ -320,7 +320,7 @@ bool TextureCache::FreeTexture(Texture* texture) {
}
TextureCache::Texture* TextureCache::DemandResolveTexture(
- const TextureInfo& texture_info, TextureFormat format) {
+ const TextureInfo& texture_info) {
auto texture_hash = texture_info.hash();
for (auto it = textures_.find(texture_hash); it != textures_.end(); ++it) {
if (it->second->texture_info == texture_info) {
diff --git a/src/xenia/gpu/vulkan/texture_cache.h b/src/xenia/gpu/vulkan/texture_cache.h
index db96ec637..863d1a2b0 100644
--- a/src/xenia/gpu/vulkan/texture_cache.h
+++ b/src/xenia/gpu/vulkan/texture_cache.h
@@ -105,8 +105,7 @@ class TextureCache {
// Demands a texture for the purpose of resolving from EDRAM. This either
// creates a new texture or returns a previously created texture.
- Texture* DemandResolveTexture(const TextureInfo& texture_info,
- TextureFormat format);
+ Texture* DemandResolveTexture(const TextureInfo& texture_info);
// Clears all cached content.
void ClearCache();
diff --git a/src/xenia/gpu/vulkan/vulkan_command_processor.cc b/src/xenia/gpu/vulkan/vulkan_command_processor.cc
index 4d61202e4..09e03637a 100644
--- a/src/xenia/gpu/vulkan/vulkan_command_processor.cc
+++ b/src/xenia/gpu/vulkan/vulkan_command_processor.cc
@@ -887,6 +887,9 @@ bool VulkanCommandProcessor::IssueCopy() {
ColorFormatToTextureFormat(copy_regs->copy_dest_info.copy_dest_format);
// TODO: copy dest number / bias
+ // TODO: Issue with RDR - resolves k_16_16_16_16_FLOAT and samples
+ // k_16_16_16_16.
+
uint32_t copy_dest_base = copy_regs->copy_dest_base;
uint32_t copy_dest_pitch = copy_regs->copy_dest_pitch.copy_dest_pitch;
uint32_t copy_dest_height = copy_regs->copy_dest_pitch.copy_dest_height;
@@ -1015,8 +1018,7 @@ bool VulkanCommandProcessor::IssueCopy() {
dest_logical_width,
std::max(1u, dest_logical_height), &texture_info);
- auto texture =
- texture_cache_->DemandResolveTexture(texture_info, copy_dest_format);
+ auto texture = texture_cache_->DemandResolveTexture(texture_info);
assert_not_null(texture);
texture->in_flight_fence = current_batch_fence_;