mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-11 02:29:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Properly propagate surface properties on surface reuse.

Browse source
This commit is contained in:
kd-11 2024-01-18 02:43:09 +03:00 • committed by kd-11
commit 96d880839a
3 changed files with 65 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/RSX/Common/surface_store.h
View file

@ -452,7 +452,7 @@ namespace rsx
{ {
if (!pitch_compatible) if (!pitch_compatible)
{ {
Traits::invalidate_surface_contents(command_list, Traits::get(surface), address, pitch); Traits::invalidate_surface_contents(command_list, Traits::get(surface), format, address, pitch);
} }
Traits::notify_surface_persist(surface); Traits::notify_surface_persist(surface);
@ -512,7 +512,7 @@ namespace rsx
} }
new_surface = Traits::get(new_surface_storage); new_surface = Traits::get(new_surface_storage);
Traits::invalidate_surface_contents(command_list, new_surface, address, pitch); Traits::invalidate_surface_contents(command_list, new_surface, format, address, pitch);
Traits::prepare_surface_for_drawing(command_list, new_surface); Traits::prepare_surface_for_drawing(command_list, new_surface);
allocate_rsx_memory(new_surface); allocate_rsx_memory(new_surface);
break; break;

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

@ -271,7 +271,7 @@ struct gl_render_target_traits
} }
static static
void invalidate_surface_contents(gl::command_context&, gl::render_target *surface, u32 address, usz pitch) void int_invalidate_surface_contents(gl::command_context&, gl::render_target *surface, u32 address, usz pitch)
{ {
surface->set_rsx_pitch(static_cast<u32>(pitch)); surface->set_rsx_pitch(static_cast<u32>(pitch));
surface->queue_tag(address); surface->queue_tag(address);
@ -281,6 +281,34 @@ struct gl_render_target_traits
surface->raster_type = rsx::surface_raster_type::linear; surface->raster_type = rsx::surface_raster_type::linear;
} }
static
void invalidate_surface_contents(
gl::command_context& cmd,
gl::render_target* surface,
rsx::surface_color_format format,
u32 address,
usz pitch)
{
auto fmt = rsx::internals::surface_color_format_to_gl(format);
std::array<GLenum, 4> native_layout = { static_cast<GLenum>(fmt.swizzle.a), static_cast<GLenum>(fmt.swizzle.r), static_cast<GLenum>(fmt.swizzle.g), static_cast<GLenum>(fmt.swizzle.b) };
surface->set_native_component_layout(native_layout);
surface->set_format(format);
int_invalidate_surface_contents(cmd, surface, address, pitch);
}
static
void invalidate_surface_contents(
gl::command_context& cmd,
gl::render_target* surface,
rsx::surface_depth_format2 format,
u32 address,
usz pitch)
{
surface->set_format(format);
int_invalidate_surface_contents(cmd, surface, address, pitch);
}
static static
void notify_surface_invalidated(const std::unique_ptr<gl::render_target>& surface) void notify_surface_invalidated(const std::unique_ptr<gl::render_target>& surface)
{ {

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

@ -243,7 +243,7 @@ namespace vk
VMM_ALLOCATION_POOL_SURFACE_CACHE, VMM_ALLOCATION_POOL_SURFACE_CACHE,
RSX_FORMAT_CLASS_COLOR); RSX_FORMAT_CLASS_COLOR);
rtt->set_debug_name(fmt::format("RTV @0x%x", address)); rtt->set_debug_name(fmt::format("RTV @0x%x, fmt=0x%x", address, static_cast<int>(format)));
rtt->change_layout(cmd, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); rtt->change_layout(cmd, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
rtt->set_format(format); rtt->set_format(format);
@ -438,7 +438,11 @@ namespace vk
return surface->rsx_pitch == pitch; return surface->rsx_pitch == pitch;
} }
static void invalidate_surface_contents(vk::command_buffer& /*cmd*/, vk::render_target* surface, u32 address, usz pitch) static void int_invalidate_surface_contents(
vk::command_buffer& /*cmd*/,
vk::render_target* surface,
u32 address,
usz pitch)
{ {
surface->rsx_pitch = static_cast<u32>(pitch); surface->rsx_pitch = static_cast<u32>(pitch);
surface->queue_tag(address); surface->queue_tag(address);
@ -448,6 +452,34 @@ namespace vk
surface->raster_type = rsx::surface_raster_type::linear; surface->raster_type = rsx::surface_raster_type::linear;
} }
static void invalidate_surface_contents(
vk::command_buffer& cmd,
vk::render_target* surface,
rsx::surface_color_format format,
u32 address,
usz pitch)
{
const auto fmt = vk::get_compatible_surface_format(format);
surface->set_format(format);
surface->set_native_component_layout(fmt.second);
surface->set_debug_name(fmt::format("RTV @0x%x, fmt=0x%x", address, static_cast<int>(format)));
int_invalidate_surface_contents(cmd, surface, address, pitch);
}
static void invalidate_surface_contents(
vk::command_buffer& cmd,
vk::render_target* surface,
rsx::surface_depth_format2 format,
u32 address,
usz pitch)
{
surface->set_format(format);
surface->set_debug_name(fmt::format("DSV @0x%x", address));
int_invalidate_surface_contents(cmd, surface, address, pitch);
}
static void notify_surface_invalidated(const std::unique_ptr<vk::render_target>& surface) static void notify_surface_invalidated(const std::unique_ptr<vk::render_target>& surface)
{ {
surface->frame_tag = vk::get_current_frame_id(); surface->frame_tag = vk::get_current_frame_id();