From 39449568897c3266d13828b1f8d89b4c742fe530 Mon Sep 17 00:00:00 2001
From: Swizzy <swizzy@xeupd.com>
Date: Thu, 8 Jan 2015 01:08:10 +0100
Subject: [PATCH 1/2] (XDK360) Align the UI elements perfectly and make them
 share the same space

---
 media/360/rarch_scene_skin.xui | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/media/360/rarch_scene_skin.xui b/media/360/rarch_scene_skin.xui
index 3eeff16b95..c6717ee1e9 100644
--- a/media/360/rarch_scene_skin.xui
+++ b/media/360/rarch_scene_skin.xui
@@ -16331,10 +16331,10 @@
 <XuiText>
 <Properties>
 <Id>LeftText</Id>
-<Width>174.697693</Width>
-<Height>26.651360</Height>
+<Width>268.000000</Width>
+<Height>26.000000</Height>
 <Position>9.000000,4.000000,0.000000</Position>
-<Anchor>5</Anchor>
+<Anchor>65</Anchor>
 <TextColor>0xff0f0f0f</TextColor>
 <DropShadowColor>0x800f0f0f</DropShadowColor>
 </Properties>
@@ -16342,10 +16342,10 @@
 <XuiText>
 <Properties>
 <Id>RightText</Id>
-<Width>130.509796</Width>
-<Height>26.883928</Height>
-<Position>147.517395,4.000000,0.000000</Position>
-<Anchor>4</Anchor>
+<Width>268.000000</Width>
+<Height>26.000000</Height>
+<Position>9.000000,4.000000,0.000000</Position>
+<Anchor>68</Anchor>
 <TextColor>0xff0f0f0f</TextColor>
 <DropShadowColor>0x800f0f0f</DropShadowColor>
 <TextStyle>528</TextStyle>

From f7117e9fd5f506aa0d7519392c5a03b78948c06d Mon Sep 17 00:00:00 2001
From: Swizzy <swizzy@xeupd.com>
Date: Thu, 8 Jan 2015 01:09:00 +0100
Subject: [PATCH 2/2] (XDK360) Fixed some D3D Debug exceptions

---
 gfx/d3d/d3d.cpp            | 4 ++++
 gfx/d3d/d3d_wrapper.cpp    | 1 +
 gfx/d3d/render_chain_xdk.h | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 8e1621bc6f..382b1c2807 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -191,6 +191,10 @@ static bool d3d_init_base(void *data, const video_info_t *info)
       return false;
    }
 
+#ifdef _XBOX360
+   d3d->cur_mon_id=0;
+#endif
+
    if (FAILED(d3d->d3d_err = d3d->g_pD3D->CreateDevice(
             d3d->cur_mon_id,
             D3DDEVTYPE_HAL,
diff --git a/gfx/d3d/d3d_wrapper.cpp b/gfx/d3d/d3d_wrapper.cpp
index 59fef10c5e..042d5795aa 100644
--- a/gfx/d3d/d3d_wrapper.cpp
+++ b/gfx/d3d/d3d_wrapper.cpp
@@ -345,6 +345,7 @@ void d3d_texture_blit(void *data, void *renderchain_data,
       memcpy(out, in, width * d3d->pixel_size);
    }
 #endif
+   D3DTexture_UnlockRect(tex, 0);
 #else
    renderchain_t *chain = (renderchain_t*)renderchain_data;
 
diff --git a/gfx/d3d/render_chain_xdk.h b/gfx/d3d/render_chain_xdk.h
index 1ebf66ad37..3a83bd3159 100644
--- a/gfx/d3d/render_chain_xdk.h
+++ b/gfx/d3d/render_chain_xdk.h
@@ -9,6 +9,10 @@ static void renderchain_clear(void *data)
 {
    d3d_video_t *d3d = (d3d_video_t*)data;
 
+#ifdef _XBOX360
+	for (int i = 0; i < 4; i++)
+		d3d_set_stream_source(d3d->dev, i, NULL, 0, 0);
+#endif
    d3d_texture_free(d3d->tex);
    d3d_vertex_buffer_free(d3d->vertex_buf);