Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsx: Remove texture address hack

Browse Source
This commit is contained in:
eladash
2018-10-01 07:57:12 +03:00
committed by kd-11
parent 1b740995a4
commit eacd1b8f13
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/Capture/rsx_capture.cpp
+2 -2
View File
@@ -114,7 +114,7 @@ namespace rsx
for (const auto& l : layout) for (const auto& l : layout)
texSize += l.data.size(); texSize += l.data.size();
if (!texaddr || !texSize) if (!texSize)
continue; continue;
frame_capture_data::memory_block block; frame_capture_data::memory_block block;
@@ -141,7 +141,7 @@ namespace rsx
for (const auto& l : layout) for (const auto& l : layout)
texSize += l.data.size(); texSize += l.data.size();
if (!texaddr || !texSize) if (!texSize)
continue; continue;
frame_capture_data::memory_block block; frame_capture_data::memory_block block;
rpcs3/Emu/RSX/Common/texture_cache.h
+1 -1
View File
@@ -1761,7 +1761,7 @@ namespace rsx
const u32 format = tex.format() & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN); 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); 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()); 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 {}; return {};