mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-16 17:43:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsx/texture_cache: Remove hacks; it has been proven that in offsets are in x16 fixed point

Browse Source
This commit is contained in:
kd-11 2018-01-18 16:59:55 +03:00
parent 0a2992839b
commit 6828fbf658
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rpcs3/Emu/RSX/Common/texture_cache.h
View File

@ -1525,8 +1525,6 @@ namespace rsx
const u32 src_address = (u32)((u64)src.pixels - (u64)vm::base(0)); const u32 src_address = (u32)((u64)src.pixels - (u64)vm::base(0));
const u32 dst_address = (u32)((u64)dst.pixels - (u64)vm::base(0)); const u32 dst_address = (u32)((u64)dst.pixels - (u64)vm::base(0));
u32 framebuffer_src_address = src_address;
float scale_x = dst.scale_x; float scale_x = dst.scale_x;
float scale_y = dst.scale_y; float scale_y = dst.scale_y;
@ -1535,17 +1533,6 @@ namespace rsx
const u16 src_w = (const u16)((f32)dst.clip_width / scale_x); const u16 src_w = (const u16)((f32)dst.clip_width / scale_x);
const u16 src_h = (const u16)((f32)dst.clip_height / scale_y); const u16 src_h = (const u16)((f32)dst.clip_height / scale_y);
//Correct for tile compression
//TODO: Investigate whether DST compression also affects alignment
if (src.compressed_x || src.compressed_y)
{
const u32 x_bytes = src_is_argb8 ? (src.offset_x * 4) : (src.offset_x * 2);
const u32 y_bytes = src.pitch * src.offset_y;
if (src.offset_x <= 16 && src.offset_y <= 16)
framebuffer_src_address -= (x_bytes + y_bytes);
}
//Check if src/dst are parts of render targets //Check if src/dst are parts of render targets
auto dst_subres = m_rtts.get_surface_subresource_if_applicable(dst_address, dst.width, dst.clip_height, dst.pitch, true, false, false); auto dst_subres = m_rtts.get_surface_subresource_if_applicable(dst_address, dst.width, dst.clip_height, dst.pitch, true, false, false);
dst_is_render_target = dst_subres.surface != nullptr; dst_is_render_target = dst_subres.surface != nullptr;
@ -1559,7 +1546,7 @@ namespace rsx
} }
//TODO: Handle cases where src or dst can be a depth texture while the other is a color texture - requires a render pass to emulate //TODO: Handle cases where src or dst can be a depth texture while the other is a color texture - requires a render pass to emulate
auto src_subres = m_rtts.get_surface_subresource_if_applicable(framebuffer_src_address, src_w, src_h, src.pitch, true, false, false); auto src_subres = m_rtts.get_surface_subresource_if_applicable(src_address, src_w, src_h, src.pitch, true, false, false);
src_is_render_target = src_subres.surface != nullptr; src_is_render_target = src_subres.surface != nullptr;
if (src_is_render_target && src_subres.surface->get_native_pitch() != src.pitch) if (src_is_render_target && src_subres.surface->get_native_pitch() != src.pitch)