From eacd1b8f1365f6bda09abbda80afe1e5477ad93f Mon Sep 17 00:00:00 2001 From: eladash Date: Mon, 1 Oct 2018 07:57:12 +0300 Subject: [PATCH] rsx: Remove texture address hack --- rpcs3/Emu/RSX/Capture/rsx_capture.cpp | 4 ++-- rpcs3/Emu/RSX/Common/texture_cache.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/RSX/Capture/rsx_capture.cpp b/rpcs3/Emu/RSX/Capture/rsx_capture.cpp index 332d965c1b..620b4b0007 100644 --- a/rpcs3/Emu/RSX/Capture/rsx_capture.cpp +++ b/rpcs3/Emu/RSX/Capture/rsx_capture.cpp @@ -114,7 +114,7 @@ namespace rsx for (const auto& l : layout) texSize += l.data.size(); - if (!texaddr || !texSize) + if (!texSize) continue; frame_capture_data::memory_block block; @@ -141,7 +141,7 @@ namespace rsx for (const auto& l : layout) texSize += l.data.size(); - if (!texaddr || !texSize) + if (!texSize) continue; frame_capture_data::memory_block block; diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h index 5b132509c6..b4e08a0be2 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.h +++ b/rpcs3/Emu/RSX/Common/texture_cache.h @@ -1761,7 +1761,7 @@ namespace rsx const u32 format = tex.format() & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN); const bool is_compressed_format = (format == CELL_GCM_TEXTURE_COMPRESSED_DXT1 || format == CELL_GCM_TEXTURE_COMPRESSED_DXT23 || format == CELL_GCM_TEXTURE_COMPRESSED_DXT45); - if (!texaddr || !tex_size || !tex_range.valid()) + if (!tex_size || !tex_range.valid()) { LOG_ERROR(RSX, "Texture upload requested but texture not found, (address=0x%X, size=0x%X, w=%d, h=%d, p=%d, format=0x%X)", texaddr, tex_size, tex.width(), tex.height(), tex.pitch(), tex.format()); return {};