rasterizer_cache: Bring back custom format parameter

* surface_params: Allow custom surface recycling

* rasterizer_cache: Cleanup

externals/CMakeLists.txt

@@ -201,6 +201,7 @@ target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
 
 if(ANDROID)
     add_subdirectory(android-ifaddrs)
+    target_link_libraries(httplib INTERFACE ifaddrs)
 endif()
 
 # cpp-jwt

src/citra_qt/CMakeLists.txt

@@ -341,10 +341,6 @@ if (USE_DISCORD_PRESENCE)
     target_compile_definitions(citra-qt PRIVATE -DUSE_DISCORD_PRESENCE)
 endif()
 
-if (ENABLE_WEB_SERVICE)
-    target_compile_definitions(citra-qt PRIVATE -DENABLE_WEB_SERVICE)
-endif()
-
 if(UNIX AND NOT APPLE)
     install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
 endif()

src/core/CMakeLists.txt

@@ -480,15 +480,11 @@ target_link_libraries(citra_core PUBLIC dds-ktx PRIVATE cryptopp fmt::fmt lodepn
 set_target_properties(citra_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})
 
 if (ENABLE_WEB_SERVICE)
-    target_compile_definitions(citra_core PRIVATE -DENABLE_WEB_SERVICE)
     target_link_libraries(citra_core PRIVATE web_service)
-    if (ANDROID)
-        target_link_libraries(citra_core PRIVATE ifaddrs)
-    endif()
 endif()
 
 if (ENABLE_SCRIPTING)
-    target_compile_definitions(citra_core PRIVATE -DENABLE_SCRIPTING)
+    target_compile_definitions(citra_core PUBLIC -DENABLE_SCRIPTING)
     target_sources(citra_core PRIVATE
         rpc/packet.cpp
         rpc/packet.h

src/dedicated_room/CMakeLists.txt

@@ -10,7 +10,6 @@ create_target_directory_groups(citra-room)
 
 target_link_libraries(citra-room PRIVATE citra_common network)
 if (ENABLE_WEB_SERVICE)
-    target_compile_definitions(citra-room PRIVATE -DENABLE_WEB_SERVICE)
     target_link_libraries(citra-room PRIVATE web_service)
 endif()
 

src/network/CMakeLists.txt

@@ -19,11 +19,7 @@ add_library(network STATIC
 create_target_directory_groups(network)
 
 if (ENABLE_WEB_SERVICE)
-    target_compile_definitions(network PRIVATE -DENABLE_WEB_SERVICE)
     target_link_libraries(network PRIVATE web_service)
-    if (ANDROID)
-        target_link_libraries(network PRIVATE ifaddrs)
-    endif()
 endif()
 
 target_link_libraries(network PRIVATE citra_common enet Boost::serialization httplib)

src/video_core/rasterizer_cache/rasterizer_cache.h

@@ -127,6 +127,29 @@ void RasterizerCache<T>::RemoveFramebuffers(SurfaceId surface_id) {
     }
 }
 
+template <class T>
+void RasterizerCache<T>::RemoveTextureCubeFace(SurfaceId surface_id) {
+    if (False(slot_surfaces[surface_id].flags & SurfaceFlagBits::Tracked)) {
+        return;
+    }
+
+    for (auto it = texture_cube_cache.begin(); it != texture_cube_cache.end();) {
+        TextureCube& cube = it->second;
+        for (SurfaceId& face_id : cube.face_ids) {
+            if (face_id == surface_id) {
+                face_id = SurfaceId{};
+            }
+        }
+        if (std::none_of(cube.face_ids.begin(), cube.face_ids.end(),
+                         [](SurfaceId id) { return id; })) {
+            sentenced.emplace_back(cube.surface_id, frame_tick);
+            it = texture_cube_cache.erase(it);
+        } else {
+            it++;
+        }
+    }
+}
+
 template <class T>
 bool RasterizerCache<T>::AccelerateTextureCopy(const GPU::Regs::DisplayTransferConfig& config) {
     const DebugScope scope{runtime, Common::Vec4f{0.f, 0.f, 1.f, 1.f},
@@ -866,39 +889,6 @@ SurfaceId RasterizerCache<T>::FindMatch(const SurfaceParams& params, ScaleMatch
     return match_id;
 }
 
-template <class T>
-void RasterizerCache<T>::DuplicateSurface(SurfaceId src_id, SurfaceId dst_id) {
-    Surface& src_surface = slot_surfaces[src_id];
-    Surface& dst_surface = slot_surfaces[dst_id];
-    ASSERT(dst_surface.addr <= src_surface.addr && dst_surface.end >= src_surface.end);
-
-    const auto src_rect = src_surface.GetScaledRect();
-    const auto dst_rect = dst_surface.GetScaledSubRect(src_surface);
-    ASSERT(src_rect.GetWidth() == dst_rect.GetWidth());
-
-    const TextureCopy copy = {
-        .src_level = 0,
-        .dst_level = 0,
-        .src_offset = {src_rect.left, src_rect.bottom},
-        .dst_offset = {dst_rect.left, dst_rect.bottom},
-        .extent = {src_rect.GetWidth(), src_rect.GetHeight()},
-    };
-    runtime.CopyTextures(src_surface, dst_surface, copy);
-
-    dst_surface.invalid_regions -= src_surface.GetInterval();
-    dst_surface.invalid_regions += src_surface.invalid_regions;
-
-    SurfaceRegions regions;
-    for (const auto& pair : RangeFromInterval(dirty_regions, src_surface.GetInterval())) {
-        if (pair.second == src_id) {
-            regions += pair.first;
-        }
-    }
-    for (const auto& interval : regions) {
-        dirty_regions.set({interval, dst_id});
-    }
-}
-
 template <class T>
 void RasterizerCache<T>::ValidateSurface(SurfaceId surface_id, PAddr addr, u32 size) {
     if (size == 0) [[unlikely]] {
@@ -1057,6 +1047,7 @@ bool RasterizerCache<T>::UploadCustomSurface(SurfaceId surface_id, SurfaceInterv
             const SurfaceBase old_surface{slot_surfaces[surface_id]};
             const SurfaceId old_id =
                 slot_surfaces.swap_and_insert(surface_id, runtime, old_surface, material);
+            slot_surfaces[old_id].flags &= ~SurfaceFlagBits::Registered;
             sentenced.emplace_back(old_id, frame_tick);
         }
         Surface& surface = slot_surfaces[surface_id];
@@ -1203,7 +1194,6 @@ void RasterizerCache<T>::ClearAll(bool flush) {
     cached_pages -= flush_interval;
     dirty_regions.clear();
     page_table.clear();
-    remove_surfaces.clear();
 }
 
 template <class T>
@@ -1232,7 +1222,7 @@ void RasterizerCache<T>::FlushRegion(PAddr addr, u32 size, SurfaceId flush_surfa
                                interval.lower(), interval.upper()};
 
         SCOPE_EXIT({ flushed_intervals += interval; });
-        if (surface.IsFill()) {
+        if (surface.type == SurfaceType::Fill) {
             DownloadFillSurface(surface, interval);
             continue;
         }
@@ -1274,6 +1264,7 @@ void RasterizerCache<T>::InvalidateRegion(PAddr addr, u32 size, SurfaceId region
         region_owner.MarkValid(invalid_interval);
     }
 
+    boost::container::small_vector<SurfaceId, 4> remove_surfaces;
     ForEachSurfaceInRegion(addr, size, [&](SurfaceId surface_id, Surface& surface) {
         if (surface_id == region_owner_id) {
             return;
@@ -1301,13 +1292,12 @@ void RasterizerCache<T>::InvalidateRegion(PAddr addr, u32 size, SurfaceId region
 
     for (const SurfaceId surface_id : remove_surfaces) {
         UnregisterSurface(surface_id);
-        if (!slot_surfaces[surface_id].IsFill()) {
+        if (slot_surfaces[surface_id].type != SurfaceType::Fill) {
             sentenced.emplace_back(surface_id, frame_tick);
         } else {
             slot_surfaces.erase(surface_id);
         }
     }
-    remove_surfaces.clear();
 }
 
 template <class T>
@@ -1367,25 +1357,7 @@ void RasterizerCache<T>::UnregisterSurface(SurfaceId surface_id) {
         surfaces.erase(vector_it);
     });
 
-    if (False(surface.flags & SurfaceFlagBits::Tracked)) {
-        return;
-    }
-
-    for (auto it = texture_cube_cache.begin(); it != texture_cube_cache.end();) {
-        TextureCube& cube = it->second;
-        for (SurfaceId& face_id : cube.face_ids) {
-            if (face_id == surface_id) {
-                face_id = SurfaceId{};
-            }
-        }
-        if (std::none_of(cube.face_ids.begin(), cube.face_ids.end(),
-                         [](SurfaceId id) { return id; })) {
-            sentenced.emplace_back(cube.surface_id, frame_tick);
-            it = texture_cube_cache.erase(it);
-        } else {
-            it++;
-        }
-    }
+    RemoveTextureCubeFace(surface_id);
 }
 
 template <class T>
@@ -1397,7 +1369,6 @@ void RasterizerCache<T>::UnregisterAll() {
         }
     }
     texture_cube_cache.clear();
-    remove_surfaces.clear();
 }
 
 template <class T>

src/video_core/rasterizer_cache/rasterizer_cache_base.h

@@ -165,8 +165,8 @@ private:
     /// Removes any framebuffers that reference the provided surface_id.
     void RemoveFramebuffers(SurfaceId surface_id);
 
-    /// Transfers ownership of a memory region from src_surface to dest_surface
-    void DuplicateSurface(SurfaceId src_id, SurfaceId dst_id);
+    /// Removes any references of the provided surface id from cached texture cubes.
+    void RemoveTextureCubeFace(SurfaceId surface_id);
 
     /// Computes the hash of the provided texture data.
     u64 ComputeHash(const SurfaceParams& load_info, std::span<u8> upload_data);
@@ -224,7 +224,6 @@ private:
     Common::SlotVector<Framebuffer> slot_framebuffers;
     SurfaceMap dirty_regions;
     PageMap cached_pages;
-    std::vector<SurfaceId> remove_surfaces;
     u32 resolution_scale_factor;
     u64 frame_tick{};
     FramebufferParams fb_params;

src/video_core/rasterizer_cache/surface_base.h

@@ -46,10 +46,6 @@ public:
     /// Returns true if the surface contains a custom material with a normal map.
     bool HasNormalMap() const noexcept;
 
-    bool IsFill() const noexcept {
-        return type == SurfaceType::Fill;
-    }
-
     bool Overlaps(PAddr overlap_addr, size_t overlap_size) const noexcept {
         const PAddr overlap_end = overlap_addr + static_cast<PAddr>(overlap_size);
         return addr < overlap_end && overlap_addr < end;

src/web_service/CMakeLists.txt

@@ -16,6 +16,7 @@ add_library(web_service STATIC
 
 create_target_directory_groups(web_service)
 
+target_compile_definitions(web_service PUBLIC -DENABLE_WEB_SERVICE)
 target_link_libraries(web_service PRIVATE citra_common network json-headers httplib cpp-jwt)
 target_link_libraries(web_service PUBLIC ${OPENSSL_LIBS})
 set_target_properties(web_service PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})