Texture_Cache: Rebase Fixes

2019-07-15 08:40:41 +07:00 · 2019-07-15 08:40:41 +07:00 · 7826f0afd9
parent 8cdbfe69b1
commit 7826f0afd9
1 changed files with 0 additions and 6 deletions
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@ -272,15 +272,9 @@ protected:

    void ManageRenderTargetUnregister(TSurface& surface) {
        auto& maxwell3d = system.GPU().Maxwell3D();
-<<<<<<< HEAD
        const u32 index = surface->GetRenderTarget();
        if (index == DEPTH_RT) {
-            maxwell3d.dirty_flags.zeta_buffer = true;
-=======
-        u32 index = surface->GetRenderTarget();
-        if (index == 8) {
            maxwell3d.dirty.depth_buffer = true;
->>>>>>> Maxwell3D: Rework the dirty system to be more consistant and scaleable
        } else {
            maxwell3d.dirty.render_target[index] = true;
        }