Remove Forced Flushing.

src/video_core/rasterizer_cache.h

@@ -104,7 +104,7 @@ protected:
     }
 
     /// Register an object into the cache
-    virtual void Register(const T& object) {
+    void Register(const T& object) {
         object->SetIsRegistered(true);
         interval_cache.add({GetInterval(object), ObjectSet{object}});
         map_cache.insert({object->GetAddr(), object});
@@ -112,7 +112,7 @@ protected:
     }
 
     /// Unregisters an object from the cache
-    virtual void Unregister(const T& object) {
+    void Unregister(const T& object) {
         object->SetIsRegistered(false);
         rasterizer.UpdatePagesCachedCount(object->GetAddr(), object->GetSizeInBytes(), -1);
         // Only flush if use_accurate_gpu_emulation is enabled, as it incurs a performance hit
@@ -129,15 +129,6 @@ protected:
         return ++modified_ticks;
     }
 
-    /// Flushes the specified object, updating appropriate cache state as needed
-    void FlushObject(const T& object) {
-        if (!object->IsDirty()) {
-            return;
-        }
-        object->Flush();
-        object->MarkAsModified(false, *this);
-    }
-
 private:
     /// Returns a list of cached objects from the specified memory region, ordered by access time
     std::vector<T> GetSortedObjectsFromRegion(VAddr addr, u64 size) {
@@ -163,6 +154,15 @@ private:
         return objects;
     }
 
+    /// Flushes the specified object, updating appropriate cache state as needed
+    void FlushObject(const T& object) {
+        if (!object->IsDirty()) {
+            return;
+        }
+        object->Flush();
+        object->MarkAsModified(false, *this);
+    }
+
     using ObjectSet = std::set<T>;
     using ObjectCache = std::unordered_map<VAddr, T>;
     using IntervalCache = boost::icl::interval_map<VAddr, ObjectSet>;

src/video_core/rasterizer_interface.h

@@ -66,7 +66,5 @@ public:
     /// Initialize disk cached resources for the game being emulated
     virtual void LoadDiskResources(const std::atomic_bool& stop_loading = false,
                                    const DiskResourceLoadCallback& callback = {}) {}
-    /// Notify rasterizer that dma push has finished.
-    virtual void SignalFinish() = 0;
 };
 } // namespace VideoCore

src/video_core/renderer_opengl/gl_rasterizer.cpp

@@ -1283,8 +1283,4 @@ void RasterizerOpenGL::CheckAlphaTests() {
     }
 }
 
-void RasterizerOpenGL::SignalFinish() {
-    res_cache.SignalFinish();
-}
-
 } // namespace OpenGL

src/video_core/renderer_opengl/gl_rasterizer.h

@@ -69,8 +69,6 @@ public:
     void LoadDiskResources(const std::atomic_bool& stop_loading,
                            const VideoCore::DiskResourceLoadCallback& callback) override;
 
-    void SignalFinish() override;
-
     /// Maximum supported size that a constbuffer can have in bytes.
     static constexpr std::size_t MaxConstbufferSize = 0x10000;
     static_assert(MaxConstbufferSize % sizeof(GLvec4) == 0,

src/video_core/renderer_opengl/gl_rasterizer_cache.cpp

@@ -198,7 +198,7 @@ std::size_t SurfaceParams::InnerMemorySize(bool force_gl, bool layer_only,
         params.width = config.width;
     } else {
         params.pitch = config.width;
-        u32 bpp = params.GetFormatBpp() / 8;
+        const u32 bpp = params.GetFormatBpp() / 8;
         params.width = params.pitch / bpp;
     }
     params.height = config.height;
@@ -697,13 +697,13 @@ void CachedSurface::LoadGLBuffer() {
         for (u32 i = 0; i < params.max_mip_level; i++)
             SwizzleFunc(MortonSwizzleMode::MortonToLinear, params, gl_buffer[i], i);
     } else {
-        u32 bpp = params.GetFormatBpp() / 8;
+        const u32 bpp = params.GetFormatBpp() / 8;
-        u32 copy_size = params.width * bpp;
+        const u32 copy_size = params.width * bpp;
         if (params.pitch == copy_size) {
             std::memcpy(gl_buffer[0].data(), Memory::GetPointer(params.addr),
                         params.size_in_bytes_gl);
         } else {
-            u8* start = Memory::GetPointer(params.addr);
+            const u8* start = Memory::GetPointer(params.addr);
             u8* write_to = gl_buffer[0].data();
             for (u32 h = params.height; h > 0; h--) {
                 std::memcpy(write_to, start, copy_size);
@@ -747,7 +747,19 @@ void CachedSurface::FlushGLBuffer() {
 
         SwizzleFunc(MortonSwizzleMode::LinearToMorton, params, gl_buffer[0], 0);
     } else {
-        std::memcpy(Memory::GetPointer(GetAddr()), gl_buffer[0].data(), GetSizeInBytes());
+        const u32 bpp = params.GetFormatBpp() / 8;
+        const u32 copy_size = params.width * bpp;
+        if (params.pitch == copy_size) {
+            std::memcpy(Memory::GetPointer(params.addr), gl_buffer[0].data(), GetSizeInBytes());
+        } else {
+            u8* start = Memory::GetPointer(params.addr);
+            const u8* read_to = gl_buffer[0].data();
+            for (u32 h = params.height; h > 0; h--) {
+                std::memcpy(start, read_to, copy_size);
+                start += params.pitch;
+                read_to += copy_size;
+            }
+        }
     }
 }
 
@@ -1133,10 +1145,4 @@ Surface RasterizerCacheOpenGL::TryGetReservedSurface(const SurfaceParams& params
     return {};
 }
 
-void RasterizerCacheOpenGL::SignalFinish() {
-    for (const auto& o : surfaces_to_flush) {
-        FlushObject(o);
-    }
-}
-
 } // namespace OpenGL

src/video_core/renderer_opengl/gl_rasterizer_cache.h

@@ -425,26 +425,6 @@ public:
     void FermiCopySurface(const Tegra::Engines::Fermi2D::Regs::Surface& src_config,
                           const Tegra::Engines::Fermi2D::Regs::Surface& dst_config);
 
-    void SignalFinish();
-
-protected:
-    void Register(const Surface& object) {
-        RasterizerCache<Surface>::Register(object);
-        const auto& params = object->GetSurfaceParams();
-        if (!params.is_tiled) {
-            surfaces_to_flush.insert(object);
-        }
-    }
-
-    /// Unregisters an object from the cache
-    void Unregister(const Surface& object) {
-        const auto& params = object->GetSurfaceParams();
-        if (!params.is_tiled) {
-            surfaces_to_flush.erase(object);
-        }
-        RasterizerCache<Surface>::Unregister(object);
-    }
-
 private:
     void LoadSurface(const Surface& surface);
     Surface GetSurface(const SurfaceParams& params, bool preserve_contents = true);
@@ -470,8 +450,6 @@ private:
     /// destroyed when used with different surface parameters.
     std::unordered_map<SurfaceReserveKey, Surface> surface_reserve;
 
-    std::unordered_set<Surface> surfaces_to_flush;
-
     OGLFramebuffer read_framebuffer;
     OGLFramebuffer draw_framebuffer;
 

src/video_core/renderer_opengl/renderer_opengl.cpp

@@ -142,7 +142,6 @@ void RendererOpenGL::SwapBuffers(
 
     // Restore the rasterizer state
     prev_state.Apply();
-    rasterizer->SignalFinish();
 }
 
 /**