From 54e9dc833885e3d65b95697f73ef4cf0f387e165 Mon Sep 17 00:00:00 2001
From: Flyinghead <raphael.jean@gmail.com>
Date: Fri, 8 Mar 2019 20:06:17 +0100
Subject: [PATCH] Do not scale clipping values with rtt-upscale if rendering to
 vram

Enable RTT-to-vram for Flag to Flag (rear view mirrors)
---
 core/nullDC.cpp           | 20 ++++++++++++--------
 core/rend/gles/gldraw.cpp |  2 +-
 core/rend/gles/gles.cpp   |  2 --
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/nullDC.cpp b/core/nullDC.cpp
index dd79c00db..242f666e5 100755
--- a/core/nullDC.cpp
+++ b/core/nullDC.cpp
@@ -169,7 +169,9 @@ void LoadSpecialSettings()
 			// Tony Hawk's Skateboarding
 			|| !strncmp("T40204D", reios_product_number, 7)
 			// Skies of Arcadia
-			|| !strncmp("MK-51052", reios_product_number, 8))
+			|| !strncmp("MK-51052", reios_product_number, 8)
+			// Flag to Flag
+			|| !strncmp("MK-51007", reios_product_number, 8))
 	{
 		settings.rend.RenderToTextureBuffer = 1;
 		rtt_to_buffer_game = true;
@@ -309,11 +311,18 @@ int reicast_init(int argc, char* argv[])
 	return 0;
 }
 
+#if HOST_OS != OS_DARWIN
+#define DATA_PATH "/data/"
+#else
+#define DATA_PATH "/"
+#endif
+
 bool game_started;
 
 int dc_start_game(const char *path)
 {
-	cfgSetVirtual("config", "image", path);
+	if (path != NULL)
+		cfgSetVirtual("config", "image", path);
 
 	if (init_done)
 	{
@@ -323,6 +332,7 @@ int dc_start_game(const char *path)
 		if (DiscSwap())
 			LoadCustom();
 #elif DC_PLATFORM == DC_PLATFORM_NAOMI || DC_PLATFORM == DC_PLATFORM_ATOMISWAVE
+		LoadRomFiles(get_readonly_data_path(DATA_PATH));
 		if (!naomi_cart_SelectFile(libPvr_GetRenderTarget()))
 			return -6;
 		LoadCustom();
@@ -340,12 +350,6 @@ int dc_start_game(const char *path)
 		return 0;
 	}
 
-#if HOST_OS != OS_DARWIN
-    #define DATA_PATH "/data/"
-#else
-    #define DATA_PATH "/"
-#endif
-
 	settings.dreamcast.RTC = GetRTC_now();	// FIXME This shouldn't be in settings anymore
 	if (settings.bios.UseReios || !LoadRomFiles(get_readonly_data_path(DATA_PATH)))
 	{
diff --git a/core/rend/gles/gldraw.cpp b/core/rend/gles/gldraw.cpp
index 94ec39aef..5ed09a66e 100644
--- a/core/rend/gles/gldraw.cpp
+++ b/core/rend/gles/gldraw.cpp
@@ -124,7 +124,7 @@ s32 SetTileClip(u32 val, GLint uniform)
 			csy = csy * dc2s_scale_h;
 			cey = cey * dc2s_scale_h;
 		}
-		else
+		else if (!settings.rend.RenderToTextureBuffer)
 		{
 			csx *= settings.rend.RenderToTextureUpscale;
 			csy *= settings.rend.RenderToTextureUpscale;
diff --git a/core/rend/gles/gles.cpp b/core/rend/gles/gles.cpp
index c9d52322d..26a7210a8 100644
--- a/core/rend/gles/gles.cpp
+++ b/core/rend/gles/gles.cpp
@@ -476,8 +476,6 @@ GLuint fogTextureId;
 			return false;
 		}
 
-		printf("Info: EGL version %d.%d\n",maj,min);
-
 		if (gl.setup.surface == 0)
 		{
 			EGLint pi32ConfigAttribs[]  = {