mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Menu driver - don't use current_shader interface

Browse Source
This commit is contained in:
twinaphex 2017-05-19 19:53:19 +02:00
parent d8f5065d64
commit d6c80d7de7
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/drivers_display/menu_display_d3d.cpp
View File

@ -172,15 +172,6 @@ static void menu_display_d3d_draw(void *data)
menu_display_d3d_viewport(draw); menu_display_d3d_viewport(draw);
menu_display_d3d_bind_texture(draw); menu_display_d3d_bind_texture(draw);
#if 0
mat = (math_matrix_4x4*)draw->matrix_data;
if (!mat)
mat = (math_matrix_4x4*)
menu_display_d3d_get_default_mvp();
video_shader_driver_set_coords(draw->coords);
video_shader_driver_set_mvp(mat);
#endif
d3d_draw_primitive(d3d->dev, (D3DPRIMITIVETYPE) d3d_draw_primitive(d3d->dev, (D3DPRIMITIVETYPE)
menu_display_prim_to_d3d_enum(draw->prim_type), menu_display_prim_to_d3d_enum(draw->prim_type),
0, draw->coords->vertices); 0, draw->coords->vertices);
@ -189,7 +180,6 @@ static void menu_display_d3d_draw(void *data)
static void menu_display_d3d_draw_pipeline(void *data) static void menu_display_d3d_draw_pipeline(void *data)
{ {
#if defined(HAVE_HLSL) || defined(HAVE_CG) #if defined(HAVE_HLSL) || defined(HAVE_CG)
video_shader_ctx_info_t shader_info;
menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data; menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
struct uniform_info uniform_param = {0}; struct uniform_info uniform_param = {0};
static float t = 0; static float t = 0;
@ -207,11 +197,6 @@ static void menu_display_d3d_draw_pipeline(void *data)
case VIDEO_SHADER_MENU: case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_2: case VIDEO_SHADER_MENU_2:
case VIDEO_SHADER_MENU_3: case VIDEO_SHADER_MENU_3:
shader_info.data = NULL;
shader_info.idx = draw->pipeline.id;
shader_info.set_active = true;
video_shader_driver_use(shader_info);
t += 0.01; t += 0.01;
@ -224,7 +209,6 @@ static void menu_display_d3d_draw_pipeline(void *data)
uniform_param.lookup.ident = "time"; uniform_param.lookup.ident = "time";
uniform_param.result.f.v0 = t; uniform_param.result.f.v0 = t;
video_shader_driver_set_parameter(uniform_param);
break; break;
} }
#endif #endif