summaryrefslogtreecommitdiffstats
path: root/src/video_core/texture_cache
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-07-15 14:40:41 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-07-17 23:29:54 +0200
commit7826f0afd934cd24310778dabc5211872def2cd3 (patch)
treed7595acb92565326957f048337b5b1c16e1ecf19 /src/video_core/texture_cache
parentGL_Rasterizer: Corrections to Clearing. (diff)
downloadyuzu-7826f0afd934cd24310778dabc5211872def2cd3.tar
yuzu-7826f0afd934cd24310778dabc5211872def2cd3.tar.gz
yuzu-7826f0afd934cd24310778dabc5211872def2cd3.tar.bz2
yuzu-7826f0afd934cd24310778dabc5211872def2cd3.tar.lz
yuzu-7826f0afd934cd24310778dabc5211872def2cd3.tar.xz
yuzu-7826f0afd934cd24310778dabc5211872def2cd3.tar.zst
yuzu-7826f0afd934cd24310778dabc5211872def2cd3.zip
Diffstat (limited to 'src/video_core/texture_cache')
-rw-r--r--src/video_core/texture_cache/texture_cache.h6
1 files changed, 0 insertions, 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;
}