mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 07:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

reduce video_driver_get_ptr calls

Browse Source
This commit is contained in:
twinaphex 2015-11-20 17:45:10 +01:00
parent 8e38a18f55
commit 4ede2d1f70
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
menu/drivers_display/menu_display_d3d.cpp
View File

@ -43,13 +43,21 @@ static const float d3d_tex_coords[] = {
1, 0 1, 0
}; };
static void *menu_display_d3d_get_default_mvp(void) static d3d_video_t *d3d_get_ptr(void)
{ {
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL); d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL);
if (!d3d) if (!d3d)
return NULL; return NULL;
return d3d;
}
static void *menu_display_d3d_get_default_mvp(void)
{
d3d_video_t *d3d = d3d_get_ptr();
if (!d3d)
return NULL;
return NULL; /* TODO/FIXME */ return NULL; /* TODO/FIXME */
} }
@ -70,7 +78,7 @@ static unsigned menu_display_prim_to_d3d_enum(enum menu_display_prim_type prim_t
static void menu_display_d3d_blend_begin(void) static void menu_display_d3d_blend_begin(void)
{ {
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL); d3d_video_t *d3d = d3d_get_ptr();
if (!d3d) if (!d3d)
return; return;
@ -85,7 +93,7 @@ static void menu_display_d3d_blend_begin(void)
static void menu_display_d3d_blend_end(void) static void menu_display_d3d_blend_end(void)
{ {
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL); d3d_video_t *d3d = d3d_get_ptr();
if (!d3d) if (!d3d)
return; return;
@ -103,8 +111,7 @@ static void menu_display_d3d_draw(
) )
{ {
D3DVIEWPORT vp = {0}; D3DVIEWPORT vp = {0};
driver_t *driver = driver_get_ptr(); d3d_video_t *d3d = d3d_get_ptr();
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL);
math_matrix_4x4 *mat = (math_matrix_4x4*)matrix_data; math_matrix_4x4 *mat = (math_matrix_4x4*)matrix_data;
if (!d3d) if (!d3d)
@ -163,7 +170,7 @@ static void menu_display_d3d_draw_bg(
const float *new_tex_coord = NULL; const float *new_tex_coord = NULL;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL); d3d_video_t *d3d = d3d_get_ptr();
if (!d3d) if (!d3d)
return; return;
@ -205,16 +212,16 @@ static void menu_display_d3d_draw_bg(
static void menu_display_d3d_restore_clear_color(void) static void menu_display_d3d_restore_clear_color(void)
{ {
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL); d3d_video_t *d3d = d3d_get_ptr();
DWORD clear_color = 0x00000000; DWORD clear_color = 0x00000000;
d3d_clear(d3d->dev, 0, NULL, D3DCLEAR_TARGET, clear_color, 0, 0); d3d_clear(d3d->dev, 0, NULL, D3DCLEAR_TARGET, clear_color, 0, 0);
} }
static void menu_display_d3d_clear_color(float r, float g, float b, float a) static void menu_display_d3d_clear_color(float r, float g, float b, float a)
{ {
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL); d3d_video_t *d3d = d3d_get_ptr();
DWORD clear_color = D3DCOLOR_ARGB(BYTE_CLAMP(a * 255.0f), BYTE_CLAMP(r * 255.0f), BYTE_CLAMP(g * 255.0f), BYTE_CLAMP(b * 255.0f)); DWORD clear_color = D3DCOLOR_ARGB(BYTE_CLAMP(a * 255.0f), BYTE_CLAMP(r * 255.0f), BYTE_CLAMP(g * 255.0f), BYTE_CLAMP(b * 255.0f));
d3d_clear(d3d->dev, 0, NULL, D3DCLEAR_TARGET, clear_color, 0, 0); d3d_clear(d3d->dev, 0, NULL, D3DCLEAR_TARGET, clear_color, 0, 0);
} }