mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Move shader path init to init_cg()."

Browse Source 
This reverts commit e0faf0cc47de08bebb429140d2875cc8d1335ff0.
This commit is contained in:
Themaister 2012-12-19 21:33:10 +01:00
parent e0faf0cc47
commit 71f2754e91
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/d3d9/d3d9.cpp
View File

@ -448,6 +448,13 @@ D3DVideo::D3DVideo(const video_info_t *info) :
SetForegroundWindow(hWnd); SetForegroundWindow(hWnd);
SetFocus(hWnd); SetFocus(hWnd);
#ifdef HAVE_CG
auto shader_type = g_settings.video.shader_type;
if ((shader_type == RARCH_SHADER_CG ||
shader_type == RARCH_SHADER_AUTO) && *g_settings.video.cg_shader_path)
cg_shader = g_settings.video.cg_shader_path;
#endif
video_info = *info; video_info = *info;
init(video_info); init(video_info);
@ -581,11 +588,6 @@ void D3DVideo::process()
#ifdef HAVE_CG #ifdef HAVE_CG
bool D3DVideo::init_cg() bool D3DVideo::init_cg()
{ {
auto shader_type = g_settings.video.shader_type;
if ((shader_type == RARCH_SHADER_CG ||
shader_type == RARCH_SHADER_AUTO) && *g_settings.video.cg_shader_path)
cg_shader = g_settings.video.cg_shader_path;
cgCtx = cgCreateContext(); cgCtx = cgCreateContext();
if (cgCtx == nullptr) if (cgCtx == nullptr)
return false; return false;