ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

draw_bg operation should not implicitly enable/disable blending - 

should be done outside
This commit is contained in:
twinaphex 2016-04-12 22:24:33 +02:00
parent 9976077895
commit e1a3ceaaee
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
menu/drivers/materialui.c
View File

@ -738,6 +738,13 @@ static int mui_get_core_title(char *s, size_t len)
return 0;
}
static void mui_draw_bg(menu_display_ctx_draw_t *draw)
{
menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL);
menu_display_ctl(MENU_DISPLAY_CTL_DRAW_BG, draw);
menu_display_ctl(MENU_DISPLAY_CTL_BLEND_END, NULL);
}
static void mui_frame(void *data)
{
unsigned header_height;
@ -847,7 +854,7 @@ static void mui_frame(void *data)
&& !draw.force_transparency && draw.texture)
draw.color = &white_bg[0];
menu_display_ctl(MENU_DISPLAY_CTL_DRAW_BG, &draw);
mui_draw_bg(&draw);
}
else
{
@ -888,7 +895,7 @@ static void mui_frame(void *data)
&& !draw.force_transparency && draw.texture)
draw.color = &white_bg[0];
menu_display_ctl(MENU_DISPLAY_CTL_DRAW_BG, &draw);
mui_draw_bg(&draw);
/* Restore opacity of transposed white background */
bgcolor_setalpha(white_transp_bg, 0.90);

2
menu/drivers/xmb.c
View File

@ -1918,8 +1918,10 @@ static void xmb_frame_horizontal_list(xmb_handle_t *xmb,
static void xmb_draw_bg(menu_display_ctx_draw_t *draw)
{
menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL);
menu_display_ctl(MENU_DISPLAY_CTL_SET_VIEWPORT, NULL);
menu_display_ctl(MENU_DISPLAY_CTL_DRAW_BG, draw);
menu_display_ctl(MENU_DISPLAY_CTL_BLEND_END, NULL);
}
static void xmb_frame(void *data)

2
menu/drivers/zarch.c
View File

@ -1116,7 +1116,9 @@ static void zarch_frame(void *data)
&& !draw.force_transparency && draw.texture)
draw.color = &coord_color2[0];
menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL);
menu_display_ctl(MENU_DISPLAY_CTL_DRAW_BG, &draw);
menu_display_ctl(MENU_DISPLAY_CTL_BLEND_END, NULL);
zui->rendering = false;

4
menu/drivers_display/menu_display_d3d.cpp
View File

@ -188,8 +188,6 @@ static void menu_display_d3d_draw_bg(void *data)
coords.lut_tex_coord = new_tex_coord;
coords.color = (const float*)draw->color;
menu_display_d3d_blend_begin();
menu_display_ctl(MENU_DISPLAY_CTL_SET_VIEWPORT, NULL);
draw->x = 0;
@ -199,8 +197,6 @@ static void menu_display_d3d_draw_bg(void *data)
menu_display_d3d_draw(draw);
menu_display_d3d_blend_end();
#if 0
gl->coords.color = gl->white_color_ptr;
#endif

3
menu/drivers_display/menu_display_vulkan.c
View File

@ -157,7 +157,6 @@ static void menu_display_vk_draw_bg(void *data)
coords.tex_coord = new_tex_coord;
coords.color = (const float*)draw->color;
vk->display.blend = true;
draw->x = 0;
draw->y = 0;
draw->coords = &coords;
@ -165,8 +164,6 @@ static void menu_display_vk_draw_bg(void *data)
menu_display_vk_get_default_mvp();
menu_display_vk_draw(draw);
vk->display.blend = false;
}
static void menu_display_vk_restore_clear_color(void)