From b950e4a86ac50829e8e72cd132e8db0249899966 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 6 Apr 2015 20:51:24 +0200 Subject: [PATCH] (XDK) Cleanups --- gfx/d3d/d3d.cpp | 9 +++------ gfx/d3d/d3d.h | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index 4cb80bcf60..e5e5cb76b9 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -1065,7 +1065,7 @@ static void d3d_draw_texture(d3d_video_t *d3d) menu_texture->x = 0; menu_texture->y = 0; - if (d3d->menu_texture_enable) + if (d3d->menu->enabled) { d3d_enable_blend_func(d3d->dev); texture_image_render(d3d, menu_texture, @@ -1639,7 +1639,7 @@ static bool d3d_frame(void *data, const void *frame, #ifdef _XBOX /* TODO - should be refactored. */ - if (d3d && d3d->menu_texture_enable) + if (d3d && d3d->menu->enabled) d3d_draw_texture(d3d); #endif #endif @@ -1863,10 +1863,7 @@ static void d3d_set_menu_texture_enable(void *data, if (!d3d) return; -#ifdef _XBOX - d3d->menu_texture_enable = state; - d3d->menu_texture_full_screen = full_screen; -#else +#ifdef HAVE_MENU if (!d3d->menu) return; diff --git a/gfx/d3d/d3d.h b/gfx/d3d/d3d.h index b4432562eb..a3b7865164 100644 --- a/gfx/d3d/d3d.h +++ b/gfx/d3d/d3d.h @@ -136,8 +136,6 @@ typedef struct d3d_video std::vector overlays; #endif - bool menu_texture_enable; - bool menu_texture_full_screen; #if defined(HAVE_MENU) overlay_t *menu; #endif