From c283c1eaf429b34186c1f9a449b383d19f5cd6fb Mon Sep 17 00:00:00 2001
From: Brad Parker <cbparker@gmail.com>
Date: Mon, 16 Jan 2017 19:26:19 -0500
Subject: [PATCH] disable shader dialog until video_threaded issues are fixed

---
 gfx/drivers/gl.c      | 3 ++-
 media/rarch.rc        | 3 ++-
 media/rarch_ja.rc     | 3 ++-
 ui/drivers/ui_win32.c | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 160427cba2..5c42dcce36 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -2330,7 +2330,8 @@ static bool gl_set_shader(void *data,
    gl_set_shader_viewport(gl, 1);
    context_bind_hw_render(true);
 #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
diff --git a/media/rarch.rc b/media/rarch.rc
index 57758d4aec..5bad253138 100644
--- a/media/rarch.rc
+++ b/media/rarch.rc
@@ -69,7 +69,8 @@ IDR_MENU MENU
             MENUITEM "10x", ID_M_WINDOW_SCALE_10X
         }
         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
     }
 }
 
diff --git a/media/rarch_ja.rc b/media/rarch_ja.rc
index d479e651ad..45f5423ba5 100644
--- a/media/rarch_ja.rc
+++ b/media/rarch_ja.rc
@@ -65,7 +65,8 @@ IDR_MENU MENU
             MENUITEM "10x", ID_M_WINDOW_SCALE_10X
         }
         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
     }
 }
 
diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c
index 5e530da392..b83d23dcfd 100644
--- a/ui/drivers/ui_win32.c
+++ b/ui/drivers/ui_win32.c
@@ -467,8 +467,9 @@ bool win32_window_init(WNDCLASSEX *wndclass,
    if (class_name != NULL) 
       return true;
 
+   /* Shader dialog is disabled for now, until video_threaded issues are fixed.
    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;
 }