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

gl/vk: Support swizzled data for RCB/RDB

Browse source
This commit is contained in:
kd-11 2020-09-07 21:53:45 +03:00 • committed by kd-11
parent 85e5b077f7
commit 6d2cb94e3e
2 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -453,6 +453,7 @@ void gl::render_target::clear_memory(gl::command_context& cmd)
void gl::render_target::load_memory(gl::command_context& cmd) void gl::render_target::load_memory(gl::command_context& cmd)
{ {
const bool is_swizzled = (raster_type == rsx::surface_raster_type::swizzle);
const u32 gcm_format = is_depth_surface() ? const u32 gcm_format = is_depth_surface() ?
get_compatible_gcm_format(format_info.gcm_depth_format).first : get_compatible_gcm_format(format_info.gcm_depth_format).first :
get_compatible_gcm_format(format_info.gcm_color_format).first; get_compatible_gcm_format(format_info.gcm_color_format).first;
@ -467,12 +468,12 @@ void gl::render_target::load_memory(gl::command_context& cmd)
// TODO: MSAA support // TODO: MSAA support
if (g_cfg.video.resolution_scale_percent == 100 && spp == 1) [[likely]] if (g_cfg.video.resolution_scale_percent == 100 && spp == 1) [[likely]]
{ {
gl::upload_texture(this, gcm_format, false, { subres }); gl::upload_texture(this, gcm_format, is_swizzled, { subres });
} }
else else
{ {
auto tmp = std::make_unique<gl::texture>(GL_TEXTURE_2D, subres.width_in_block, subres.height_in_block, 1, 1, static_cast<GLenum>(get_internal_format())); auto tmp = std::make_unique<gl::texture>(GL_TEXTURE_2D, subres.width_in_block, subres.height_in_block, 1, 1, static_cast<GLenum>(get_internal_format()));
gl::upload_texture(tmp.get(), gcm_format, false, { subres }); gl::upload_texture(tmp.get(), gcm_format, is_swizzled, { subres });
gl::g_hw_blitter->scale_image(cmd, tmp.get(), this, gl::g_hw_blitter->scale_image(cmd, tmp.get(), this,
{ 0, 0, subres.width_in_block, subres.height_in_block }, { 0, 0, subres.width_in_block, subres.height_in_block },

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

@ -234,15 +234,10 @@ namespace vk
{ {
auto& upload_heap = *vk::get_upload_heap(); auto& upload_heap = *vk::get_upload_heap();
u32 gcm_format; const bool is_swizzled = (raster_type == rsx::surface_raster_type::swizzle);
if (is_depth_surface()) const u32 gcm_format = is_depth_surface() ?
{ get_compatible_gcm_format(format_info.gcm_depth_format).first :
gcm_format = get_compatible_gcm_format(format_info.gcm_depth_format).first; get_compatible_gcm_format(format_info.gcm_color_format).first;
}
else
{
gcm_format = get_compatible_gcm_format(format_info.gcm_color_format).first;
}
rsx::subresource_layout subres{}; rsx::subresource_layout subres{};
subres.width_in_block = subres.width_in_texel = surface_width * samples_x; subres.width_in_block = subres.width_in_texel = surface_width * samples_x;
@ -254,7 +249,7 @@ namespace vk
if (g_cfg.video.resolution_scale_percent == 100 && spp == 1) [[likely]] if (g_cfg.video.resolution_scale_percent == 100 && spp == 1) [[likely]]
{ {
push_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); push_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
vk::copy_mipmaped_image_using_buffer(cmd, this, { subres }, gcm_format, false, 1, aspect(), upload_heap, rsx_pitch); vk::copy_mipmaped_image_using_buffer(cmd, this, { subres }, gcm_format, is_swizzled, 1, aspect(), upload_heap, rsx_pitch);
pop_layout(cmd); pop_layout(cmd);
} }
else else
@ -279,7 +274,7 @@ namespace vk
} }
// Load Cell data into temp buffer // Load Cell data into temp buffer
vk::copy_mipmaped_image_using_buffer(cmd, content, { subres }, gcm_format, false, 1, aspect(), upload_heap, rsx_pitch); vk::copy_mipmaped_image_using_buffer(cmd, content, { subres }, gcm_format, is_swizzled, 1, aspect(), upload_heap, rsx_pitch);
// Write into final image // Write into final image
if (content != final_dst) if (content != final_dst)