archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 14:01:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rsx: Fix bpp calculation taking resolution scaling into account

Browse source 
- Do not rely on image->width(), use surface_width() instead for unscaled values
- Refactor/clean GL rendertarget class a bit
This commit is contained in:
kd-11 2019-03-19 23:46:21 +03:00 • committed by kd-11
parent 03fca73cf4
commit b879b32271
3 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
View file

@ -613,8 +613,8 @@ void gl::render_target::memory_barrier(gl::command_context& cmd, bool force_init
return; return;
} }
auto src_bpp = src_texture->get_native_pitch() / src_texture->width(); auto src_bpp = src_texture->get_native_pitch() / src_texture->get_surface_width();
auto dst_bpp = get_native_pitch() / width(); auto dst_bpp = get_native_pitch() / get_surface_width();
rsx::typeless_xfer typeless_info{}; rsx::typeless_xfer typeless_info{};
const bool dst_is_depth = is_depth(get_internal_format()); const bool dst_is_depth = is_depth(get_internal_format());

26
rpcs3/Emu/RSX/GL/GLRenderTargets.h
View file

@ -54,8 +54,6 @@ namespace gl
u32 rsx_pitch = 0; u32 rsx_pitch = 0;
u16 native_pitch = 0; u16 native_pitch = 0;
u16 internal_width = 0;
u16 internal_height = 0;
u16 surface_height = 0; u16 surface_height = 0;
u16 surface_width = 0; u16 surface_width = 0;
u16 surface_pixel_size = 0; u16 surface_pixel_size = 0;
@ -86,7 +84,13 @@ namespace gl
return native_pitch; return native_pitch;
} }
// Rsx pitch void set_surface_dimensions(u16 w, u16 h, u16 pitch)
{
surface_width = w;
surface_height = h;
rsx_pitch = pitch;
}
void set_rsx_pitch(u16 pitch) void set_rsx_pitch(u16 pitch)
{ {
rsx_pitch = pitch; rsx_pitch = pitch;
@ -130,18 +134,10 @@ namespace gl
return id(); return id();
} }
void update_surface()
{
internal_width = width();
internal_height = height();
surface_width = rsx::apply_inverse_resolution_scale(internal_width, true);
surface_height = rsx::apply_inverse_resolution_scale(internal_height, true);
}
bool matches_dimensions(u16 _width, u16 _height) const bool matches_dimensions(u16 _width, u16 _height) const
{ {
//Use forward scaling to account for rounding and clamping errors //Use forward scaling to account for rounding and clamping errors
return (rsx::apply_resolution_scale(_width, true) == internal_width) && (rsx::apply_resolution_scale(_height, true) == internal_height); return (rsx::apply_resolution_scale(_width, true) == width()) && (rsx::apply_resolution_scale(_height, true) == height());
} }
void memory_barrier(gl::command_context& cmd, bool force_init = false); void memory_barrier(gl::command_context& cmd, bool force_init = false);
@ -176,14 +172,13 @@ struct gl_render_target_traits
std::unique_ptr<gl::render_target> result(new gl::render_target(rsx::apply_resolution_scale((u16)width, true), std::unique_ptr<gl::render_target> result(new gl::render_target(rsx::apply_resolution_scale((u16)width, true),
rsx::apply_resolution_scale((u16)height, true), (GLenum)internal_fmt)); rsx::apply_resolution_scale((u16)height, true), (GLenum)internal_fmt));
result->set_native_pitch((u16)width * format.channel_count * format.channel_size); result->set_native_pitch((u16)width * format.channel_count * format.channel_size);
result->set_rsx_pitch((u16)pitch); result->set_surface_dimensions(width, height, (u16)pitch);
std::array<GLenum, 4> native_layout = { (GLenum)format.swizzle.a, (GLenum)format.swizzle.r, (GLenum)format.swizzle.g, (GLenum)format.swizzle.b }; std::array<GLenum, 4> native_layout = { (GLenum)format.swizzle.a, (GLenum)format.swizzle.r, (GLenum)format.swizzle.g, (GLenum)format.swizzle.b };
result->set_native_component_layout(native_layout); result->set_native_component_layout(native_layout);
result->set_old_contents(old_surface); result->set_old_contents(old_surface);
result->set_cleared(false); result->set_cleared(false);
result->update_surface();
result->queue_tag(address); result->queue_tag(address);
return result; return result;
} }
@ -206,12 +201,11 @@ struct gl_render_target_traits
std::array<GLenum, 4> native_layout = { GL_RED, GL_RED, GL_RED, GL_RED }; std::array<GLenum, 4> native_layout = { GL_RED, GL_RED, GL_RED, GL_RED };
result->set_native_pitch(native_pitch); result->set_native_pitch(native_pitch);
result->set_rsx_pitch((u16)pitch); result->set_surface_dimensions(width, height, (u16)pitch);
result->set_native_component_layout(native_layout); result->set_native_component_layout(native_layout);
result->set_old_contents(old_surface); result->set_old_contents(old_surface);
result->set_cleared(false); result->set_cleared(false);
result->update_surface();
result->queue_tag(address); result->queue_tag(address);
return result; return result;
} }

4
rpcs3/Emu/RSX/VK/VKRenderTargets.h
View file

@ -106,8 +106,8 @@ namespace vk
return; return;
} }
auto src_bpp = src_texture->get_native_pitch() / src_texture->width(); auto src_bpp = src_texture->get_native_pitch() / src_texture->get_surface_width();
auto dst_bpp = get_native_pitch() / width(); auto dst_bpp = get_native_pitch() / get_surface_width();
rsx::typeless_xfer typeless_info{}; rsx::typeless_xfer typeless_info{};
const auto region = rsx::get_transferable_region(this); const auto region = rsx::get_transferable_region(this);