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

Vulkan: Remove redundant format argument from DemandResolveTexture

This commit is contained in:
DrChat 2017-08-09 00:10:52 -05:00
parent e9e23c02a2
commit 8b5eb1cd38
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,7 @@ bool TextureCache::FreeTexture(Texture* texture) {
} }
TextureCache::Texture* TextureCache::DemandResolveTexture( TextureCache::Texture* TextureCache::DemandResolveTexture(
const TextureInfo& texture_info, TextureFormat format) { const TextureInfo& texture_info) {
auto texture_hash = texture_info.hash(); auto texture_hash = texture_info.hash();
for (auto it = textures_.find(texture_hash); it != textures_.end(); ++it) { for (auto it = textures_.find(texture_hash); it != textures_.end(); ++it) {
if (it->second->texture_info == texture_info) { if (it->second->texture_info == texture_info) {

3
src/xenia/gpu/vulkan/texture_cache.h
View File

@ -105,8 +105,7 @@ class TextureCache {
// Demands a texture for the purpose of resolving from EDRAM. This either // Demands a texture for the purpose of resolving from EDRAM. This either
// creates a new texture or returns a previously created texture. // creates a new texture or returns a previously created texture.
Texture* DemandResolveTexture(const TextureInfo& texture_info, Texture* DemandResolveTexture(const TextureInfo& texture_info);
TextureFormat format);
// Clears all cached content. // Clears all cached content.
void ClearCache(); void ClearCache();

6
src/xenia/gpu/vulkan/vulkan_command_processor.cc
View File

@ -887,6 +887,9 @@ bool VulkanCommandProcessor::IssueCopy() {
ColorFormatToTextureFormat(copy_regs->copy_dest_info.copy_dest_format); ColorFormatToTextureFormat(copy_regs->copy_dest_info.copy_dest_format);
// TODO: copy dest number / bias // 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_base = copy_regs->copy_dest_base;
uint32_t copy_dest_pitch = copy_regs->copy_dest_pitch.copy_dest_pitch; 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; uint32_t copy_dest_height = copy_regs->copy_dest_pitch.copy_dest_height;
@ -1015,8 +1018,7 @@ bool VulkanCommandProcessor::IssueCopy() {
dest_logical_width, dest_logical_width,
std::max(1u, dest_logical_height), &texture_info); std::max(1u, dest_logical_height), &texture_info);
auto texture = auto texture = texture_cache_->DemandResolveTexture(texture_info);
texture_cache_->DemandResolveTexture(texture_info, copy_dest_format);
assert_not_null(texture); assert_not_null(texture);
texture->in_flight_fence = current_batch_fence_; texture->in_flight_fence = current_batch_fence_;