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

Merge fd9da517f2 into 67f7119717

Browse source
This commit is contained in:
kd-11 2025-12-04 18:58:41 +01:00 committed by GitHub
parent 67f7119717 fd9da517f2
commit 1c72221cda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 40 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
rpcs3/Emu/RSX/NV47/HW/nv308a.cpp
View file

@ -89,27 +89,25 @@ namespace rsx
rsx::reservation_lock<true> rsx_lock(dst_address, data_length); rsx::reservation_lock<true> rsx_lock(dst_address, data_length);
if (RSX(ctx)->fifo_ctrl->last_cmd() & RSX_METHOD_NON_INCREMENT_CMD_MASK) [[unlikely]] if (RSX(ctx)->fifo_ctrl->last_cmd() & RSX_METHOD_NON_INCREMENT_CMD_MASK) [[unlikely]]
{
// Move last 32 bits
reinterpret_cast<u32*>(dst)[0] = reinterpret_cast<const u32*>(src)[count - 1];
RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, 4);
}
else
{ {
if (dst_dma & CELL_GCM_LOCATION_MAIN) // Move last 32 bits
{ reinterpret_cast<u32*>(dst)[0] = reinterpret_cast<const u32*>(src)[count - 1];
// May overlap RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, 4);
std::memmove(dst, src, data_length); return;
}
else
{
// Never overlaps
std::memcpy(dst, src, data_length);
}
RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, count * 4);
} }
if (dst_dma & CELL_GCM_LOCATION_MAIN)
{
// May overlap
std::memmove(dst, src, data_length);
}
else
{
// Never overlaps
std::memcpy(dst, src, data_length);
}
RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, count * 4);
break; break;
} }
case blit_engine::transfer_destination_format::r5g6b5: case blit_engine::transfer_destination_format::r5g6b5:
@ -129,33 +127,33 @@ namespace rsx
rsx::reservation_lock<true> rsx_lock(dst_address, data_length); rsx::reservation_lock<true> rsx_lock(dst_address, data_length);
auto convert = [](u32 input) -> u16 auto convert = [](u32 input) -> u16
{ {
// Input is considered to be ARGB8 // Input is considered to be ARGB8
u32 r = (input >> 16) & 0xFF; u32 r = (input >> 16) & 0xFF;
u32 g = (input >> 8) & 0xFF; u32 g = (input >> 8) & 0xFF;
u32 b = input & 0xFF; u32 b = input & 0xFF;
r = (r * 32) / 255; r = (r * 32) / 255;
g = (g * 64) / 255; g = (g * 64) / 255;
b = (b * 32) / 255; b = (b * 32) / 255;
return static_cast<u16>((r << 11) | (g << 5) | b); return static_cast<u16>((r << 11) | (g << 5) | b);
}; };
if (RSX(ctx)->fifo_ctrl->last_cmd() & RSX_METHOD_NON_INCREMENT_CMD_MASK) [[unlikely]] if (RSX(ctx)->fifo_ctrl->last_cmd() & RSX_METHOD_NON_INCREMENT_CMD_MASK) [[unlikely]]
{ {
// Move last 16 bits // Move last 16 bits
dst[0] = convert(src[count - 1]); dst[0] = convert(src[count - 1]);
RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, 2); RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, 2);
break;
}
for (u32 i = 0; i < count; i++)
{
dst[i] = convert(src[i]);
}
RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, count * 2);
break; break;
}
for (u32 i = 0; i < count; i++)
{
dst[i] = convert(src[i]);
}
RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, count * 2);
break;
} }
default: default:
{ {

2
rpcs3/Emu/RSX/VK/vkutils/device.cpp
View file

@ -99,7 +99,7 @@ namespace vk
multidraw_support.max_batch_size = 65536; multidraw_support.max_batch_size = 65536;
optional_features_support.barycentric_coords = !!shader_barycentric_info.fragmentShaderBarycentric; optional_features_support.barycentric_coords = !!shader_barycentric_info.fragmentShaderBarycentric;
optional_features_support.framebuffer_loops = !!fbo_loops_info.attachmentFeedbackLoopLayout; optional_features_support.framebuffer_loops = !!fbo_loops_info.attachmentFeedbackLoopLayout && get_driver_vendor() != driver_vendor::AMD;
optional_features_support.extended_device_fault = !!device_fault_info.deviceFault; optional_features_support.extended_device_fault = !!device_fault_info.deviceFault;
features = features2.features; features = features2.features;