libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-25 00:49:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2018-01-04 14:50:56 +01:00
parent 41d9a8fd75
commit 6eddea99c0
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/drivers/d3d.c
View File

@ -322,7 +322,7 @@ static bool d3d_process_shader(d3d_video_t *d3d)
{ {
#ifdef HAVE_FBO #ifdef HAVE_FBO
if (d3d && !string_is_empty(d3d->shader_path) && if (d3d && !string_is_empty(d3d->shader_path) &&
string_is_equal_fast(path_get_extension(d3d->shader_path), "cgp", 3)) string_is_equal(path_get_extension(d3d->shader_path), "cgp"))
return d3d_init_multipass(d3d); return d3d_init_multipass(d3d);
#endif #endif
@ -982,9 +982,6 @@ static bool d3d_init_internal(d3d_video_t *d3d,
MONITORINFOEX current_mon; MONITORINFOEX current_mon;
HMONITOR hm_to_use; HMONITOR hm_to_use;
#endif #endif
#ifdef HAVE_SHADERS
enum rarch_shader_type type;
#endif
#ifdef HAVE_WINDOW #ifdef HAVE_WINDOW
DWORD style; DWORD style;
unsigned win_width = 0; unsigned win_width = 0;
@ -1066,11 +1063,11 @@ static bool d3d_init_internal(d3d_video_t *d3d,
/* This should only be done once here /* This should only be done once here
* to avoid set_shader() to be overridden * to avoid set_shader() to be overridden
* later. */ * later. */
type =
video_shader_parse_type(settings->paths.path_shader, RARCH_SHADER_NONE);
if (settings->bools.video_shader_enable) if (settings->bools.video_shader_enable)
{ {
enum rarch_shader_type type =
video_shader_parse_type(settings->paths.path_shader, RARCH_SHADER_NONE);
switch (type) switch (type)
{ {
case RARCH_SHADER_CG: case RARCH_SHADER_CG: