From 7826f0afd934cd24310778dabc5211872def2cd3 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Mon, 15 Jul 2019 08:40:41 -0400 Subject: Texture_Cache: Rebase Fixes --- src/video_core/texture_cache/texture_cache.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 8225022a9..a3a3770a7 100644 --- 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; } -- cgit v1.2.3