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

Merge branch 'master' into rpcn_1.4

Browse source
This commit is contained in:
Megamouse 2025-02-12 13:54:07 +01:00 • committed by GitHub
commit c6f6e1e595
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/CMakeLists.txt
View file

@ -114,6 +114,8 @@ target_link_libraries(rpcs3
3rdparty::fusion 3rdparty::fusion
${ADDITIONAL_LIBS}) ${ADDITIONAL_LIBS})
set_target_properties(rpcs3_emu PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
# Unix display manager # Unix display manager
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(rpcs3 PRIVATE X11::X11) target_link_libraries(rpcs3 PRIVATE X11::X11)

5
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -1630,7 +1630,10 @@ namespace rsx
layout.aa_factors[1] = aa_factor_v; layout.aa_factors[1] = aa_factor_v;
// Log this to frame stats // Log this to frame stats
m_frame_stats.framebuffer_stats.add(layout.width, layout.height, aa_mode); if (layout.target != rsx::surface_target::none)
{
m_frame_stats.framebuffer_stats.add(layout.width, layout.height, aa_mode);
}
// Check if anything has changed // Check if anything has changed
bool really_changed = false; bool really_changed = false;