From a871b6da548d295b57835e43e5851cc8fb6d582d Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Wed, 10 Apr 2013 09:59:29 +0200
Subject: [PATCH] (XDK) Remove texture_image_free - will have to manually do
 freeing memory management without a public function for Xbox

---
 frontend/menu/rmenu.c | 33 ++++++++++++++++++++++++++++++---
 gfx/image.h           |  1 -
 xdk/image.c           | 17 -----------------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c
index 97157d39c8..4e8d208a85 100644
--- a/frontend/menu/rmenu.c
+++ b/frontend/menu/rmenu.c
@@ -232,9 +232,27 @@ static void rmenu_gfx_free(void)
 {
 #ifdef _XBOX1
 #ifdef HAVE_MENU_PANEL
-   texture_image_free(menu_panel);
+   if (menu_panel->vertex_buf)
+   {
+      menu_panel->vertex_buf->Release();
+      menu_panel->vertex_buf = NULL;
+   }
+   if (menu_panel->pixels)
+   {
+      menu_panel->pixels->Release();
+      menu_panel->pixels = NULL;
+   }
 #endif
-   texture_image_free(menu_texture);
+   if (menu_texture->vertex_buf)
+   {
+      menu_texture->vertex_buf->Release();
+      menu_texture->vertex_buf = NULL;
+   }
+   if (menu_texture->pixels)
+   {
+      menu_texture->pixels->Release();
+      menu_texture->pixels = NULL;
+   }
 #else
 #ifdef HAVE_MENU_PANEL
    if (menu_panel)
@@ -1052,7 +1070,16 @@ static int select_file(uint8_t menu_type, uint64_t input)
                if (menu_texture)
                {
 #ifdef _XBOX
-                  texture_image_free(menu_texture);
+                  if (menu_texture->vertex_buf)
+                  {
+                     menu_texture->vertex_buf->Release();
+                     menu_texture->vertex_buf = NULL;
+                  }
+                  if (menu_texture->pixels)
+                  {
+                     menu_texture->pixels->Release();
+                     menu_texture->pixels = NULL;
+                  }
 #else
                   free(menu_texture->pixels);
                   menu_texture->pixels = NULL;
diff --git a/gfx/image.h b/gfx/image.h
index 9096a99e45..d3d76b310c 100644
--- a/gfx/image.h
+++ b/gfx/image.h
@@ -39,7 +39,6 @@ struct texture_image
 };
 
 #ifdef _XBOX1
-void texture_image_free(struct texture_image *out_img);
 bool texture_image_render(struct texture_image *out_img);
 #endif
 
diff --git a/xdk/image.c b/xdk/image.c
index b0a07b6e95..1b56b2b928 100644
--- a/xdk/image.c
+++ b/xdk/image.c
@@ -54,23 +54,6 @@ bool texture_image_load(const char *path, struct texture_image *out_img)
    return true;
 }
 
-void texture_image_free(struct texture_image *out_img)
-{
-   // free the vertex buffer
-   if (out_img->vertex_buf)
-   {
-      out_img->vertex_buf->Release();
-      out_img->vertex_buf = NULL;
-   }
-
-   // free the texture
-   if (out_img->pixels)
-   {
-      out_img->pixels->Release();
-      out_img->pixels = NULL;
-   }
-}
-
 bool texture_image_render(struct texture_image *out_img)
 {
    xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data;