From 2d3a2ac7c937961b98bb9fdbfcea1e97838bff21 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 30 Jul 2012 00:11:56 +0200 Subject: [PATCH] (Xbox 1) Clean up Surface.cpp --- xbox1/frontend/RetroLaunch/Surface.cpp | 12 +----------- xbox1/frontend/RetroLaunch/Surface.h | 6 ------ 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/xbox1/frontend/RetroLaunch/Surface.cpp b/xbox1/frontend/RetroLaunch/Surface.cpp index ee53640570..639b7cc3f7 100644 --- a/xbox1/frontend/RetroLaunch/Surface.cpp +++ b/xbox1/frontend/RetroLaunch/Surface.cpp @@ -24,12 +24,6 @@ bool d3d_surface_new(d3d_surface_t *surface, const char *filename) surface->m_pTexture = NULL; surface->m_pVertexBuffer = NULL; - surface->m_byR = 255; - surface->m_byG = 255; - surface->m_byB = 255; - surface->m_bLoaded = false; - surface->m_x = 0; - surface->m_y = 0; HRESULT ret = D3DXCreateTextureFromFileExA(d3d->d3d_render_device, // d3d device filename, // filename @@ -63,8 +57,6 @@ bool d3d_surface_new(d3d_surface_t *surface, const char *filename) return false; } - surface->m_bLoaded = true; - return true; } @@ -83,15 +75,13 @@ void d3d_surface_free(d3d_surface_t *surface) surface->m_pTexture->Release(); surface->m_pTexture = NULL; } - - surface->m_bLoaded = false; } bool d3d_surface_render(d3d_surface_t *surface, int x, int y, int32_t w, int32_t h) { xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; - if (surface->m_pTexture == NULL || surface->m_pVertexBuffer == NULL || surface->m_bLoaded == false) + if (surface->m_pTexture == NULL || surface->m_pVertexBuffer == NULL) return false; float fX = static_cast(x); diff --git a/xbox1/frontend/RetroLaunch/Surface.h b/xbox1/frontend/RetroLaunch/Surface.h index d54ffee498..51466e7f78 100644 --- a/xbox1/frontend/RetroLaunch/Surface.h +++ b/xbox1/frontend/RetroLaunch/Surface.h @@ -23,13 +23,7 @@ typedef struct { LPDIRECT3DTEXTURE m_pTexture; LPDIRECT3DVERTEXBUFFER m_pVertexBuffer; - int m_x; - int m_y; D3DXIMAGE_INFO m_imageInfo; - unsigned char m_byR; - unsigned char m_byG; - unsigned char m_byB; - bool m_bLoaded; } d3d_surface_t; bool d3d_surface_new(d3d_surface_t *surface, const char *filename);