From 4f3cee2d872f91493f69e80c3119d44e91928f7b Mon Sep 17 00:00:00 2001
From: Stefanos Kornilios Mitsis Poiitidis <skmp@nillware.com>
Date: Fri, 2 May 2014 03:43:34 +0300
Subject: [PATCH] Improve async/mt rendering & sync logic.

Should fix texture staging issues for now, without degrading performance
Fixes #49 (mvsc2, sf3, etc sprites)
---
 core/hw/pvr/ta_ctx.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/hw/pvr/ta_ctx.h b/core/hw/pvr/ta_ctx.h
index 53156ddc9..b8fc77690 100644
--- a/core/hw/pvr/ta_ctx.h
+++ b/core/hw/pvr/ta_ctx.h
@@ -146,11 +146,7 @@ struct TA_context
 
 	void MarkRend()
 	{
-<<<<<<< HEAD
 		rend.proc_start = tad.thd_root;
-=======
-		rend.proc_start = rend.proc_end;
->>>>>>> Stored TA command stream persists on TA_LIST_INIT, until first actual write.
 		rend.proc_end = tad.End();
 	}
 	void Alloc()