From f93ca7b7e60ad2b95ae8b5eb7a347d9dddeb99c9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 6 Apr 2015 01:34:05 +0200 Subject: [PATCH] (D3D) Cleanups --- gfx/d3d/d3d.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index 9618cbeb5e..bf64d9e5e4 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -108,11 +108,10 @@ static bool d3d_init_shader(void *data) static void d3d_deinit_chain(d3d_video_t *d3d) { -#ifdef _XBOX - renderchain_free(d3d); -#else renderchain_deinit(d3d->chain); d3d->chain = NULL; +#ifdef _XBOX + renderchain_free(d3d); #endif } @@ -894,26 +893,23 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info) video_info->input_scale * RARCH_SCALE_BASE; #endif -#ifdef _XBOX - if (!renderchain_init(d3d, video_info, - NULL, NULL, NULL, - video_info->rgb32 ? - RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565)) - { - RARCH_ERR("[D3D]: Failed to init render chain.\n"); - return false; - } -#else d3d->chain = renderchain_new(); if (!d3d->chain) return false; +#ifdef _XBOX + if (!renderchain_init(d3d, video_info, + NULL, NULL, NULL, + video_info->rgb32 ? + RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565)) +#else if (!renderchain_init(d3d->chain, &d3d->video_info, d3dr, &d3d->final_viewport, &link_info, d3d->video_info.rgb32 ? RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565)) +#endif { - RARCH_ERR("[D3D9]: Failed to init render chain.\n"); + RARCH_ERR("[D3D]: Failed to init render chain.\n"); return false; }