mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix auto shader preset loading in d3d10, d3d11, d3d12

Browse Source
This commit is contained in:
radius 2018-10-10 19:02:36 -05:00
parent 2a46d73c95
commit 454efe03dc
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/drivers/d3d10.c
View File

@ -23,6 +23,8 @@
#include "../../driver.h" #include "../../driver.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#include "../../configuration.h" #include "../../configuration.h"
#include "../../retroarch.h"
#include "../video_driver.h" #include "../video_driver.h"
#include "../font_driver.h" #include "../font_driver.h"
#include "../common/win32_common.h" #include "../common/win32_common.h"
@ -909,10 +911,10 @@ d3d10_gfx_init(const video_info_t* video,
if (settings->bools.video_shader_enable) if (settings->bools.video_shader_enable)
{ {
const char* ext = path_get_extension(settings->paths.path_shader); const char* ext = path_get_extension(retroarch_get_shader_preset());
if (ext && !strncmp(ext, "slang", 5)) if (ext && !strncmp(ext, "slang", 5))
d3d10_gfx_set_shader(d3d10, RARCH_SHADER_SLANG, settings->paths.path_shader); d3d10_gfx_set_shader(d3d10, RARCH_SHADER_SLANG, retroarch_get_shader_preset());
} }
#if 0 #if 0

5
gfx/drivers/d3d11.c
View File

@ -25,6 +25,7 @@
#include "../../driver.h" #include "../../driver.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#include "../configuration.h" #include "../configuration.h"
#include "../../retroarch.h"
#include "../video_driver.h" #include "../video_driver.h"
#include "../font_driver.h" #include "../font_driver.h"
#include "../common/win32_common.h" #include "../common/win32_common.h"
@ -954,10 +955,10 @@ d3d11_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
if (settings->bools.video_shader_enable) if (settings->bools.video_shader_enable)
{ {
const char* ext = path_get_extension(settings->paths.path_shader); const char* ext = path_get_extension(retroarch_get_shader_preset());
if (ext && !strncmp(ext, "slang", 5)) if (ext && !strncmp(ext, "slang", 5))
d3d11_gfx_set_shader(d3d11, RARCH_SHADER_SLANG, settings->paths.path_shader); d3d11_gfx_set_shader(d3d11, RARCH_SHADER_SLANG, retroarch_get_shader_preset());
} }
if (video_driver_get_hw_context()->context_type == RETRO_HW_CONTEXT_DIRECT3D && if (video_driver_get_hw_context()->context_type == RETRO_HW_CONTEXT_DIRECT3D &&

5
gfx/drivers/d3d12.c
View File

@ -31,6 +31,7 @@
#include "../../driver.h" #include "../../driver.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#include "../../configuration.h" #include "../../configuration.h"
#include "../../retroarch.h"
#include "wiiu/wiiu_dbg.h" #include "wiiu/wiiu_dbg.h"
@ -971,10 +972,10 @@ d3d12_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
if (settings->bools.video_shader_enable) if (settings->bools.video_shader_enable)
{ {
const char* ext = path_get_extension(settings->paths.path_shader); const char* ext = path_get_extension(retroarch_get_shader_preset());
if (ext && string_is_equal(ext, "slangp")) if (ext && string_is_equal(ext, "slangp"))
d3d12_gfx_set_shader(d3d12, RARCH_SHADER_SLANG, settings->paths.path_shader); d3d12_gfx_set_shader(d3d12, RARCH_SHADER_SLANG, retroarch_get_shader_preset());
} }
return d3d12; return d3d12;