libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-12 20:58:18 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

(XDK1) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-04-06 20:47:29 +02:00
parent c9dc599ee7
commit 160c581df6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/d3d/d3d.cpp
View File

@ -461,7 +461,7 @@ static bool d3d_construct(d3d_video_t *d3d,
gfx_set_dwm(); gfx_set_dwm();
#endif #endif
#if defined(HAVE_MENU) && defined(HAVE_OVERLAY) #if defined(HAVE_MENU)
if (d3d->menu) if (d3d->menu)
free(d3d->menu); free(d3d->menu);

6
gfx/d3d/d3d.h
View File

@ -55,7 +55,6 @@
#include "d3d_wrapper.h" #include "d3d_wrapper.h"
#include "render_chain_driver.h" #include "render_chain_driver.h"
#ifdef HAVE_OVERLAY
typedef struct typedef struct
{ {
struct Coords struct Coords
@ -69,9 +68,10 @@ typedef struct
bool enabled; bool enabled;
float alpha_mod; float alpha_mod;
LPDIRECT3DTEXTURE tex; LPDIRECT3DTEXTURE tex;
#ifdef HAVE_D3D9
LPDIRECT3DVERTEXBUFFER vert_buf; LPDIRECT3DVERTEXBUFFER vert_buf;
} overlay_t;
#endif #endif
} overlay_t;
#ifdef _XBOX #ifdef _XBOX
typedef struct Vertex typedef struct Vertex
@ -138,7 +138,7 @@ typedef struct d3d_video
bool menu_texture_enable; bool menu_texture_enable;
bool menu_texture_full_screen; bool menu_texture_full_screen;
#if defined(HAVE_MENU) && defined(HAVE_OVERLAY) #if defined(HAVE_MENU)
overlay_t *menu; overlay_t *menu;
#endif #endif
const renderchain_driver_t *renderchain_driver; const renderchain_driver_t *renderchain_driver;

2
input/drivers_joypad/xdk_joypad.c
View File

@ -165,7 +165,7 @@ static void xdk_joypad_poll(void)
pad_state[port] = 0; pad_state[port] = 0;
char msg[512]; char msg[512];
snprintf(msg, sizeof(msg), "Joypad #%u (%s) disconnected.", i, udev_pads[i].ident); snprintf(msg, sizeof(msg), "Joypad #%u (%s) disconnected.", port, xdk_joypad.ident);
rarch_main_msg_queue_push(msg, 0, 60, false); rarch_main_msg_queue_push(msg, 0, 60, false);
RARCH_LOG("%s\n", msg); RARCH_LOG("%s\n", msg);
} }