mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-22 12:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XDK1 RMenu) Don't call texture_image_render for panel anymore in rmenu.c

Browse Source
This commit is contained in:
twinaphex 2013-04-11 15:05:42 +02:00
parent 0f60833cac
commit ea969282f4
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/menu/rmenu.c
View File

@ -1107,7 +1107,6 @@ static void browser_render(void *data)
menu_panel->y = y_increment; menu_panel->y = y_increment;
menu_panel->width = 510; menu_panel->width = 510;
menu_panel->height = 20; menu_panel->height = 20;
texture_image_render(menu_panel);
} }
#endif #endif
@ -2581,7 +2580,6 @@ static int select_setting(uint8_t menu_type, uint64_t input)
menu_panel->y = y_increment; menu_panel->y = y_increment;
menu_panel->width = 510; menu_panel->width = 510;
menu_panel->height = 20; menu_panel->height = 20;
texture_image_render(menu_panel);
#endif #endif
font_parms.x = POSITION_X; font_parms.x = POSITION_X;

19
xdk/xdk_d3d.cpp
View File

@ -731,6 +731,10 @@ bool texture_image_render(struct texture_image *out_img)
#if defined(HAVE_RGUI) || defined(HAVE_RMENU) #if defined(HAVE_RGUI) || defined(HAVE_RMENU)
#ifdef HAVE_MENU_PANEL
extern struct texture_image *menu_panel;
#endif
static inline void xdk_d3d_draw_texture(void *data) static inline void xdk_d3d_draw_texture(void *data)
{ {
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data;
@ -741,11 +745,23 @@ static inline void xdk_d3d_draw_texture(void *data)
menu_texture->x = 0; menu_texture->x = 0;
menu_texture->y = 0; menu_texture->y = 0;
if (d3d->rgui_texture_enable)
{
d3d->d3d_render_device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_ONE); d3d->d3d_render_device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_ONE);
d3d->d3d_render_device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); d3d->d3d_render_device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
d3d->d3d_render_device->SetRenderState(D3DRS_ALPHABLENDENABLE, true); d3d->d3d_render_device->SetRenderState(D3DRS_ALPHABLENDENABLE, true);
texture_image_render(menu_texture); texture_image_render(menu_texture);
d3d->d3d_render_device->SetRenderState(D3DRS_ALPHABLENDENABLE, false); d3d->d3d_render_device->SetRenderState(D3DRS_ALPHABLENDENABLE, false);
}
#ifdef HAVE_MENU_PANEL
if ((menu_panel->x != 0) || (menu_panel->y != 0))
{
texture_image_render(menu_panel);
menu_panel->x = 0;
menu_panel->y = 0;
}
#endif
#endif #endif
} }
#endif #endif
@ -918,8 +934,6 @@ static bool xdk_d3d_frame(void *data, const void *frame,
#if defined(HAVE_RGUI) || defined(HAVE_RMENU) #if defined(HAVE_RGUI) || defined(HAVE_RMENU)
#ifdef HAVE_RMENU_XUI #ifdef HAVE_RMENU_XUI
if (lifecycle_mode_state & (1ULL << MODE_MENU_DRAW)) if (lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
#else
if (d3d->rgui_texture_enable)
#endif #endif
xdk_d3d_draw_texture(d3d); xdk_d3d_draw_texture(d3d);
#endif #endif
@ -969,7 +983,6 @@ static bool xdk_d3d_frame(void *data, const void *frame,
d3d->font_ctx->render_msg(d3d, msg, &font_parms); d3d->font_ctx->render_msg(d3d, msg, &font_parms);
} }
if (!(lifecycle_mode_state & (1ULL << MODE_MENU_DRAW)))
gfx_ctx_xdk_swap_buffers(); gfx_ctx_xdk_swap_buffers();
return true; return true;