disable shader dialog until video_threaded issues are fixed

This commit is contained in:
Brad Parker 2017-01-16 19:26:19 -05:00
parent a9c3837cdb
commit c283c1eaf4
4 changed files with 8 additions and 4 deletions

View File

@ -2330,7 +2330,8 @@ static bool gl_set_shader(void *data,
gl_set_shader_viewport(gl, 1); gl_set_shader_viewport(gl, 1);
context_bind_hw_render(true); context_bind_hw_render(true);
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)
shader_dlg_params_reload(); /* Shader dialog is disabled for now, until video_threaded issues are fixed.
shader_dlg_params_reload();*/
#endif #endif
#endif #endif

View File

@ -69,7 +69,8 @@ IDR_MENU MENU
MENUITEM "10x", ID_M_WINDOW_SCALE_10X MENUITEM "10x", ID_M_WINDOW_SCALE_10X
} }
MENUITEM "Toggle Exclusive Full Screen", ID_M_FULL_SCREEN MENUITEM "Toggle Exclusive Full Screen", ID_M_FULL_SCREEN
MENUITEM "Shader Parameters", ID_M_SHADER_PARAMETERS // Shader dialog is disabled for now, until video_threaded issues are fixed.
//MENUITEM "Shader Parameters", ID_M_SHADER_PARAMETERS
} }
} }

View File

@ -65,7 +65,8 @@ IDR_MENU MENU
MENUITEM "10x", ID_M_WINDOW_SCALE_10X MENUITEM "10x", ID_M_WINDOW_SCALE_10X
} }
MENUITEM "排他的なフルスクリーン切り替え", ID_M_FULL_SCREEN MENUITEM "排他的なフルスクリーン切り替え", ID_M_FULL_SCREEN
MENUITEM "シェーダーのパラメータ", ID_M_SHADER_PARAMETERS // Shader dialog is disabled for now, until video_threaded issues are fixed.
//MENUITEM "シェーダーのパラメータ", ID_M_SHADER_PARAMETERS
} }
} }

View File

@ -467,8 +467,9 @@ bool win32_window_init(WNDCLASSEX *wndclass,
if (class_name != NULL) if (class_name != NULL)
return true; return true;
/* Shader dialog is disabled for now, until video_threaded issues are fixed.
if (!win32_shader_dlg_init()) if (!win32_shader_dlg_init())
RARCH_ERR("[WGL]: wgl_shader_dlg_init() failed.\n"); RARCH_ERR("[WGL]: wgl_shader_dlg_init() failed.\n");*/
return true; return true;
} }