CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-27 14:23:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(D3D) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-11-10 05:09:31 +01:00
parent 42969b8f68
commit fd319cb223
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gfx/d3d/d3d.cpp
View File

@ -1037,17 +1037,18 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info)
return false; return false;
} }
if (
!d3d->renderchain_driver->init(
#ifdef _XBOX #ifdef _XBOX
if (!d3d->renderchain_driver->init(d3d, &d3d->video_info, d3d,
d3dr, &d3d->final_viewport, &link_info,
d3d->video_info.rgb32 ?
RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565))
#else #else
if (!d3d->renderchain_driver->init(d3d->renderchain_data, &d3d->video_info, d3d->renderchain_data,
#endif
&d3d->video_info,
d3dr, &d3d->final_viewport, &link_info, d3dr, &d3d->final_viewport, &link_info,
d3d->video_info.rgb32 ? d3d->video_info.rgb32 ?
RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565)) RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565)
#endif )
{ {
RARCH_ERR("[D3D]: Failed to init render chain.\n"); RARCH_ERR("[D3D]: Failed to init render chain.\n");
return false; return false;
@ -1501,13 +1502,12 @@ static void d3d_free_overlays(d3d_video_t *d3d)
d3d->overlays.clear(); d3d->overlays.clear();
} }
static void d3d_overlay_tex_geom(void *data, static void d3d_overlay_tex_geom(
d3d_video_t *d3d,
unsigned index, unsigned index,
float x, float y, float x, float y,
float w, float h) float w, float h)
{ {
d3d_video_t *d3d = (d3d_video_t*)data;
if (!d3d) if (!d3d)
return; return;
@ -1517,13 +1517,12 @@ static void d3d_overlay_tex_geom(void *data,
d3d->overlays[index].tex_coords.h = h; d3d->overlays[index].tex_coords.h = h;
} }
static void d3d_overlay_vertex_geom(void *data, static void d3d_overlay_vertex_geom(
d3d_video_t *d3d,
unsigned index, unsigned index,
float x, float y, float x, float y,
float w, float h) float w, float h)
{ {
d3d_video_t *d3d = (d3d_video_t*)data;
if (!d3d) if (!d3d)
return; return;
@ -1740,11 +1739,9 @@ static bool d3d_frame(void *data, const void *frame,
} }
#ifdef HAVE_MENU #ifdef HAVE_MENU
#ifndef _XBOX
if (d3d->menu && d3d->menu->enabled) if (d3d->menu && d3d->menu->enabled)
d3d_overlay_render(d3d, d3d->menu); d3d_overlay_render(d3d, d3d->menu);
#endif #endif
#endif
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (d3d->overlays_enabled) if (d3d->overlays_enabled)