From a7c95b9901bbba5328553eae1d0006d16e088233 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 6 Apr 2015 17:12:37 +0200 Subject: [PATCH] (D3D) Start going through renderchain_driver --- gfx/d3d/d3d.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index a238ac87a6..fc2ce735f2 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -908,15 +908,18 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info) return false; } + if (!d3d->renderchain_driver || !d3d->renderchain_data) + return false; + RARCH_LOG("Renderchain driver: %s\n", d3d->renderchain_driver->ident); #ifdef _XBOX - if (!renderchain_init(d3d, video_info, + if (!d3d->renderchain_driver->init(d3d, video_info, NULL, NULL, NULL, video_info->rgb32 ? RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565)) #else - if (!renderchain_init(d3d->renderchain_data, &d3d->video_info, + if (!d3d->renderchain_driver->init(d3d->renderchain_data, &d3d->video_info, d3dr, &d3d->final_viewport, &link_info, d3d->video_info.rgb32 ? RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565)) @@ -934,7 +937,7 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info) for (i = 1; i < d3d->shader.passes; i++) { - renderchain_convert_geometry(d3d->renderchain_data, + d3d->renderchain_driver->convert_geometry(d3d->renderchain_data, &link_info, &out_width, &out_height, current_width, current_height, &d3d->final_viewport); @@ -946,7 +949,7 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info) current_width = out_width; current_height = out_height; - if (!renderchain_add_pass(d3d->renderchain_data, &link_info)) + if (!d3d->renderchain_driver->add_pass(d3d->renderchain_data, &link_info)) { RARCH_ERR("[D3D9]: Failed to add pass.\n"); return false;