From 9e4bec8cec8cf07cc58b25e3441732b498f1e8d0 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Tue, 25 Aug 2020 21:18:52 +0300 Subject: [PATCH] vk: Fix some missing render target declarations --- rpcs3/Emu/RSX/VK/VKRenderTargets.h | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.h b/rpcs3/Emu/RSX/VK/VKRenderTargets.h index 0cb87a4d3f..060a067c7a 100644 --- a/rpcs3/Emu/RSX/VK/VKRenderTargets.h +++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.h @@ -42,7 +42,8 @@ namespace vk VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_TILING_OPTIMAL, usage, - 0)); + 0, + format_class())); resolve_surface->native_component_map = native_component_map; resolve_surface->change_layout(cmd, VK_IMAGE_LAYOUT_GENERAL); @@ -518,20 +519,13 @@ namespace vk const auto src_bpp = src_texture->get_bpp(); rsx::typeless_xfer typeless_info{}; - if (src_texture->info.format == info.format) [[likely]] + if (src_texture->aspect() != aspect() || + !formats_are_bitcast_compatible(this, src_texture)) { - verify(HERE), src_bpp == dst_bpp; - } - else - { - if (!formats_are_bitcast_compatible(format(), src_texture->format()) || - src_texture->aspect() != aspect()) - { - typeless_info.src_is_typeless = true; - typeless_info.src_context = rsx::texture_upload_context::framebuffer_storage; - typeless_info.src_native_format_override = static_cast(info.format); - typeless_info.src_scaling_hint = f32(src_bpp) / dst_bpp; - } + typeless_info.src_is_typeless = true; + typeless_info.src_context = rsx::texture_upload_context::framebuffer_storage; + typeless_info.src_native_format_override = static_cast(info.format); + typeless_info.src_scaling_hint = f32(src_bpp) / dst_bpp; } section.init_transfer(this); @@ -768,7 +762,8 @@ namespace rsx VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_TILING_OPTIMAL, ref->info.usage, - ref->info.flags); + ref->info.flags, + ref->format_class()); sink->add_ref(); sink->set_spp(ref->get_spp());