ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(XDK D3D) Cleanups

This commit is contained in:
twinaphex 2014-03-03 04:28:19 +01:00
parent 065e98ee29
commit 810a1298ad
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xdk/xdk_d3d.cpp
View File

@ -125,9 +125,9 @@ static void check_window(void *data)
} }
#ifdef HAVE_HLSL #ifdef HAVE_HLSL
static bool hlsl_shader_init(void) static bool d3d_init_shader(void *data)
{ {
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data;
const gl_shader_backend_t *backend = NULL; const gl_shader_backend_t *backend = NULL;
const char *shader_path = g_settings.video.shader_path; const char *shader_path = g_settings.video.shader_path;
@ -592,9 +592,9 @@ static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **inpu
d3d->ctx_driver->swap_interval(d3d->vsync ? 1 : 0); d3d->ctx_driver->swap_interval(d3d->vsync ? 1 : 0);
#ifdef HAVE_HLSL #ifdef HAVE_HLSL
if (!hlsl_shader_init()) if (!d3d_init_shader(d3d))
{ {
RARCH_ERR("Shader init failed.\n"); RARCH_ERR("Failed to initialize HLSL.\n");
d3d->ctx_driver->destroy(); d3d->ctx_driver->destroy();
free(d3d); free(d3d);
return NULL; return NULL;
@ -884,10 +884,6 @@ NULL, NULL, NULL, 0);
#endif #endif
} }
if (frame)
{
}
unsigned filter = g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT; unsigned filter = g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT;
RD3DDevice_SetSamplerState_MinFilter(d3dr, 0, filter); RD3DDevice_SetSamplerState_MinFilter(d3dr, 0, filter);