Texture_Cache: Rebase Fixes

This commit is contained in:
Fernando Sahmkow 2019-07-15 08:40:41 -04:00 committed by FernandoS27
parent 8cdbfe69b1
commit 7826f0afd9

View File

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