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

rsx: Remove unused code (argb<->bgra modifier) and refactor a bit

Browse source
This commit is contained in:
kd-11 2023-08-07 23:41:27 +03:00 • committed by kd-11
parent 767979ea44
commit 58e9e54b7f
3 changed files with 16 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rpcs3/Emu/RSX/Common/texture_cache_helpers.h
View file

@ -11,8 +11,7 @@ namespace rsx
enum surface_transform : u32 enum surface_transform : u32
{ {
identity = 0, // Nothing identity = 0, // Nothing
argb_to_bgra = 1, // Swap ARGB to BGRA (endian swap) coordinate_transform = 1 // Incoming source coordinates may generated based on the format of the secondary (dest) surface. Recalculate them before use.
coordinate_transform = 2 // Incoming source coordinates may generated based on the format of the secondary (dest) surface. Recalculate them before use.
}; };
template<typename image_resource_type> template<typename image_resource_type>

13
rpcs3/Emu/RSX/GL/GLTextureCache.cpp
View file

@ -193,7 +193,9 @@ namespace gl
for (const auto &slice : sources) for (const auto &slice : sources)
{ {
if (!slice.src) if (!slice.src)
{
continue; continue;
}
const bool typeless = !formats_are_bitcast_compatible(slice.src, dst_image); const bool typeless = !formats_are_bitcast_compatible(slice.src, dst_image);
ensure(typeless || dst_aspect == slice.src->aspect()); ensure(typeless || dst_aspect == slice.src->aspect());
@ -262,19 +264,14 @@ namespace gl
const areai src_rect = { src_x, src_y, src_x + src_w, src_y + src_h }; const areai src_rect = { src_x, src_y, src_x + src_w, src_y + src_h };
const areai dst_rect = { slice.dst_x, slice.dst_y, slice.dst_x + slice.dst_w, slice.dst_y + slice.dst_h }; const areai dst_rect = { slice.dst_x, slice.dst_y, slice.dst_x + slice.dst_w, slice.dst_y + slice.dst_h };
gl::texture* _dst; gl::texture* _dst = dst_image;
if (src_image->get_internal_format() == dst_image->get_internal_format() && slice.level == 0 && slice.dst_z == 0) if (src_image->get_internal_format() != dst_image->get_internal_format() || slice.level != 0 || slice.dst_z != 0) [[ unlikely ]]
{
_dst = dst_image;
}
else
{ {
tmp = std::make_unique<texture>(GL_TEXTURE_2D, dst_rect.x2, dst_rect.y2, 1, 1, static_cast<GLenum>(slice.src->get_internal_format())); tmp = std::make_unique<texture>(GL_TEXTURE_2D, dst_rect.x2, dst_rect.y2, 1, 1, static_cast<GLenum>(slice.src->get_internal_format()));
_dst = tmp.get(); _dst = tmp.get();
} }
_blitter->scale_image(cmd, src_image, _dst, _blitter->scale_image(cmd, src_image, _dst, src_rect, dst_rect, false, {});
src_rect, dst_rect, false, {});
if (_dst != dst_image) if (_dst != dst_image)
{ {

78
rpcs3/Emu/RSX/VK/VKTextureCache.cpp
View file

@ -368,12 +368,9 @@ namespace vk
} }
ensure(src_image->current_layout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL || src_image->current_layout == VK_IMAGE_LAYOUT_GENERAL); ensure(src_image->current_layout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL || src_image->current_layout == VK_IMAGE_LAYOUT_GENERAL);
ensure(transform == rsx::surface_transform::identity);
// Final aspect mask of the 'final' transfer source if (src_w == section.dst_w && src_h == section.dst_h) [[likely]]
const auto new_src_aspect = src_image->aspect();
const bool require_scaling = src_w != section.dst_w || src_h != section.dst_h;
if (!require_scaling && transform == rsx::surface_transform::identity) [[likely]]
{ {
const auto copy_rgn = get_output_region(src_x, src_y, src_w, src_h, src_image); const auto copy_rgn = get_output_region(src_x, src_y, src_w, src_h, src_image);
vkCmdCopyImage(cmd, src_image->value, src_image->current_layout, dst->value, dst->current_layout, 1, &copy_rgn); vkCmdCopyImage(cmd, src_image->value, src_image->current_layout, dst->value, dst->current_layout, 1, &copy_rgn);
@ -381,18 +378,11 @@ namespace vk
else else
{ {
u16 dst_x = section.dst_x, dst_y = section.dst_y; u16 dst_x = section.dst_x, dst_y = section.dst_y;
vk::image* _dst; vk::image* _dst = dst;
// Check for best-case scenario - we write directly to the output in this case if (src_image->info.format != dst->info.format || section.level != 0 || section.dst_z != 0) [[ unlikely ]]
if (src_image->info.format == dst->info.format &&
section.level == 0 &&
section.dst_z == 0) [[likely]]
{ {
_dst = dst; // Either a bitcast is required or a scale+copy to mipmap level / layer
}
else
{
// Either a bitcast is required or a scale+copy to mipmap level
const u32 requested_width = dst->width(); const u32 requested_width = dst->width();
const u32 requested_height = src_y + src_h + section.dst_h; const u32 requested_height = src_y + src_h + section.dst_h;
_dst = vk::get_typeless_helper(src_image->format(), src_image->format_class(), requested_width, requested_height); _dst = vk::get_typeless_helper(src_image->format(), src_image->format_class(), requested_width, requested_height);
@ -407,59 +397,11 @@ namespace vk
dst_y = src_y + src_h; dst_y = src_y + src_h;
} }
if (transform == rsx::surface_transform::identity) vk::copy_scaled_image(cmd, src_image, _dst,
{ coordi{ { src_x, src_y }, { src_w, src_h } },
vk::copy_scaled_image(cmd, src_image, _dst, coordi{ { dst_x, dst_y }, { section.dst_w, section.dst_h } },
coordi{ { src_x, src_y }, { src_w, src_h } }, 1, src_image->format() == _dst->format(),
coordi{ { dst_x, dst_y }, { section.dst_w, section.dst_h } }, VK_FILTER_NEAREST);
1, src_image->format() == _dst->format(),
VK_FILTER_NEAREST);
}
else if (transform == rsx::surface_transform::argb_to_bgra)
{
VkBufferImageCopy copy{};
copy.imageExtent = { src_w, src_h, 1 };
copy.imageOffset = { src_x, src_y, 0 };
copy.imageSubresource = { src_image->aspect(), 0, 0, 1 };
const auto mem_length = src_w * src_h * dst_bpp;
auto scratch_buf = vk::get_scratch_buffer(cmd, mem_length);
vkCmdCopyImageToBuffer(cmd, src_image->value, src_image->current_layout, scratch_buf->value, 1, &copy);
vk::insert_buffer_memory_barrier(cmd, scratch_buf->value, 0, mem_length, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
auto shuffle_kernel = vk::get_compute_task<vk::cs_shuffle_32>();
shuffle_kernel->run(cmd, scratch_buf, mem_length);
vk::insert_buffer_memory_barrier(cmd, scratch_buf->value, 0, mem_length, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
auto tmp = vk::get_typeless_helper(src_image->format(), src_image->format_class(), section.dst_w, section.dst_h);
tmp->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
dst_x = dst_y = 0;
copy.imageOffset = { 0, 0, 0 };
vkCmdCopyBufferToImage(cmd, scratch_buf->value, tmp->value, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &copy);
if (require_scaling)
{
// Optionally scale if needed
vk::copy_scaled_image(cmd, tmp, _dst,
areai{ 0, 0, src_w, static_cast<s32>(src_h) },
coordi{ { dst_x, dst_y }, { section.dst_w, section.dst_h } },
1, tmp->info.format == _dst->info.format,
VK_FILTER_NEAREST);
}
else
{
_dst = tmp;
}
}
else
{
fmt::throw_exception("Unreachable");
}
if (_dst != dst) [[unlikely]] if (_dst != dst) [[unlikely]]
{ {