From ff7b280321d8793bf93ebb025e5b7466e0e17daa Mon Sep 17 00:00:00 2001
From: freakdave <freakdave@hotmail.com>
Date: Sun, 15 Jul 2012 20:49:34 +0200
Subject: [PATCH] (Xbox 1) Fixed debug output not showing correctly on HDTV's
 (Xbox 1) Fixed debug output in debug mode not showing the second line
 (FPS/Frames)

---
 msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj |  6 +++---
 xbox1/xdk_d3d8.cpp                          | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
index a0736faea7..463b0679ef 100644
--- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
+++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
@@ -19,18 +19,18 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="3"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;"
 				PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;PACKAGE_VERSION=\&quot;0.9.6\&quot;;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_RARCH_MAIN_WRAP;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DEFAULT_RETROPAD_INPUT;HAVE_CONFIGFILE;HAVE_VID_CONTEXT;HAVE_DSOUND;HAVE_D3D8"
 				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="0"
 				RuntimeLibrary="1"
 				EnableEnhancedInstructionSet="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/xbox1/xdk_d3d8.cpp b/xbox1/xdk_d3d8.cpp
index ddbbd258b9..26a192c16b 100644
--- a/xbox1/xdk_d3d8.cpp
+++ b/xbox1/xdk_d3d8.cpp
@@ -32,6 +32,7 @@
 #endif
 
 wchar_t strw_buffer[128];
+unsigned font_x, font_y;
 
 static void check_window(xdk_d3d_video_t *d3d)
 {
@@ -131,6 +132,9 @@ static void xdk_d3d_set_viewport(bool force_full)
    vp.MaxZ   = m_zFar;
    d3d->d3d_render_device->SetViewport(&vp);
 
+   font_x = vp.X;
+   font_y = vp.Y;
+
    //if(gl->overscan_enable && !force_full)
    //{
    //	m_left = -gl->overscan_amount/2;
@@ -346,6 +350,9 @@ static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **inpu
    d3d->debug_font->SetBkColor(D3DCOLOR_ARGB(100,0,0,0));
    d3d->debug_font->SetTextHeight(14);
    d3d->debug_font->SetTextAntialiasLevel(d3d->debug_font->GetTextAntialiasLevel());
+
+   font_x = 0;
+   font_y = 0;
 #endif
 
    return d3d;
@@ -448,10 +455,10 @@ static bool xdk_d3d_frame(void *data, const void *frame,
    bool ret = false;
    sprintf(buf, "%.2f MB free / %.2f MB total", stat.dwAvailPhys/(1024.0f*1024.0f), stat.dwTotalPhys/(1024.0f*1024.0f));
    rarch_convert_char_to_wchar(strw_buffer, buf, sizeof(strw_buffer));
-   d3d->debug_font->TextOut(d3d->pFrontBuffer, strw_buffer, (unsigned)-1, 30, 50 );
-   d3d->debug_font->TextOut(d3d->pBackBuffer, strw_buffer, (unsigned)-1, 30, 50 );
+   d3d->debug_font->TextOut(d3d->pFrontBuffer, strw_buffer, (unsigned)-1, font_x + 30, font_y + 50 );
+   d3d->debug_font->TextOut(d3d->pBackBuffer, strw_buffer, (unsigned)-1, font_x + 30, font_y + 50 );
 
-   if(ret = gfx_window_title(buf2, sizeof(buf2)) || buf_fps_last)
+   if(ret = gfx_window_title(buf2, sizeof(buf2)) || sizeof(buf_fps_last))
    {
       if(ret)
       {
@@ -459,10 +466,12 @@ static bool xdk_d3d_frame(void *data, const void *frame,
          rarch_convert_char_to_wchar(strw_buffer, buf2, sizeof(strw_buffer));
       }
       else if(buf_fps_last)
+      {
          rarch_convert_char_to_wchar(strw_buffer, buf_fps_last, sizeof(strw_buffer));
+      }
 
-      d3d->debug_font->TextOut(d3d->pFrontBuffer, strw_buffer, (unsigned)-1, 30, 70 );
-      d3d->debug_font->TextOut(d3d->pBackBuffer, strw_buffer, (unsigned)-1, 30, 70 );
+      d3d->debug_font->TextOut(d3d->pFrontBuffer, strw_buffer, (unsigned)-1, font_x + 30, font_y + 70 );
+      d3d->debug_font->TextOut(d3d->pBackBuffer, strw_buffer, (unsigned)-1, font_x + 30, font_y + 70 );
       d3d->pFrontBuffer->Release();
       d3d->pBackBuffer->Release();
    }