Skip to content

W
wine-winehq
Commit e960aa78 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

winecfg: Remove the Direct3D settings.

There should really be no reason to set any of these.
parent 2932b42a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 73 deletions
programs/winecfg/resource.h
View file @ e960aa78
......@@ -154,10 +154,6 @@
#define IDC_FULLSCREEN_GRAB 1102
#define IDC_USE_TAKE_FOCUS 1103
#define IDC_DOUBLE_BUFFER 1104
#define IDC_D3D_VSHADER_MODE 1105
#define IDC_D3D_PSHADER_MODE 1106
#define IDS_SHADER_MODE_HARDWARE 8100
#define IDS_SHADER_MODE_NONE 8101
#define IDC_RES_TRACKBAR 1107
#define IDC_RES_DPIEDIT 1108
......
programs/winecfg/winecfg.rc
View file @ e960aa78
......@@ -63,12 +63,6 @@ END
STRINGTABLE
BEGIN
IDS_SHADER_MODE_HARDWARE "Hardware"
IDS_SHADER_MODE_NONE "#msgctxt#vertex shader mode#None"
END
STRINGTABLE
BEGIN
IDS_DRIVE_UNKNOWN "Autodetect..."
IDS_DRIVE_FIXED "Local hard disk"
IDS_DRIVE_REMOTE "Network share"
......@@ -174,16 +168,11 @@ BEGIN
EDITTEXT IDC_DESKTOP_WIDTH,84,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
EDITTEXT IDC_DESKTOP_HEIGHT,137,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
GROUPBOX "Direct3D",IDC_STATIC,8,95,244,49
LTEXT "&Vertex Shader Support: ",IDC_STATIC,15,110,100,32
COMBOBOX IDC_D3D_VSHADER_MODE,115,108,130,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Allow &Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10
GROUPBOX "Screen resolution",IDC_STATIC,8,151,244,63
CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,171,15
EDITTEXT IDC_RES_DPIEDIT,188,161,23,13,ES_NUMBER|WS_TABSTOP
LTEXT "#msgctxt#unit: dots/inch#dpi",IDC_STATIC,215,163,30,8
LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,180,230,28
GROUPBOX "Screen resolution",IDC_STATIC,8,95,244,63
CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,105,171,15
EDITTEXT IDC_RES_DPIEDIT,188,105,23,13,ES_NUMBER|WS_TABSTOP
LTEXT "#msgctxt#unit: dots/inch#dpi",IDC_STATIC,215,107,30,8
LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,124,230,28
END
IDD_DLLCFG DIALOG 0, 0, 260, 220
......
programs/winecfg/x11drvdlg.c
View file @ e960aa78
......@@ -55,17 +55,6 @@ static const WCHAR x11_driverW[] = {'X','1','1',' ','D','r','i','v','e','r',0};
static const WCHAR default_resW[] = {'8','0','0','x','6','0','0',0};
static struct SHADERMODE
{
UINT displayStrID;
const char* settingStr;
} const D3D_VS_Modes[] = {
{IDS_SHADER_MODE_HARDWARE, "hardware"},
{IDS_SHADER_MODE_NONE, "none"},
{0, 0}
};
int updating_ui;
/* convert the x11 desktop key to the new explorer config */
......@@ -124,7 +113,6 @@ static void update_gui_for_desktop_mode(HWND dialog)
static void init_dialog(HWND dialog)
{
unsigned int it;
char* buf;
convert_x11_desktop_key();
......@@ -156,31 +144,6 @@ static void init_dialog(HWND dialog)
CheckDlgButton(dialog, IDC_ENABLE_DECORATED, BST_UNCHECKED);
HeapFree(GetProcessHeap(), 0, buf);
SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_RESETCONTENT, 0, 0);
for (it = 0; 0 != D3D_VS_Modes[it].displayStrID; ++it) {
SendDlgItemMessageW (dialog, IDC_D3D_VSHADER_MODE, CB_ADDSTRING, 0,
(LPARAM)load_string (D3D_VS_Modes[it].displayStrID));
}
buf = get_reg_key(config_key, keypath("Direct3D"), "VertexShaderMode", "hardware");
for (it = 0; NULL != D3D_VS_Modes[it].settingStr; ++it) {
if (strcmp(buf, D3D_VS_Modes[it].settingStr) == 0) {
SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_SETCURSEL, it, 0);
break ;
}
}
if (NULL == D3D_VS_Modes[it].settingStr) {
WINE_ERR("Invalid Direct3D VertexShader Mode read from registry (%s)\n", buf);
}
HeapFree(GetProcessHeap(), 0, buf);
buf = get_reg_key(config_key, keypath("Direct3D"), "PixelShaderMode", "enabled");
if (!strcmp(buf, "enabled"))
CheckDlgButton(dialog, IDC_D3D_PSHADER_MODE, BST_CHECKED);
else
CheckDlgButton(dialog, IDC_D3D_PSHADER_MODE, BST_UNCHECKED);
HeapFree(GetProcessHeap(), 0, buf);
updating_ui = FALSE;
}
......@@ -272,18 +235,6 @@ static void on_fullscreen_grab_clicked(HWND dialog)
set_reg_key(config_key, keypath("X11 Driver"), "GrabFullscreen", "N");
}
static void on_d3d_vshader_mode_changed(HWND dialog) {
int selected_mode = SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_GETCURSEL, 0, 0);
set_reg_key(config_key, keypath("Direct3D"), "VertexShaderMode",
D3D_VS_Modes[selected_mode].settingStr);
}
static void on_d3d_pshader_mode_clicked(HWND dialog) {
if (IsDlgButtonChecked(dialog, IDC_D3D_PSHADER_MODE) == BST_CHECKED)
set_reg_key(config_key, keypath("Direct3D"), "PixelShaderMode", "enabled");
else
set_reg_key(config_key, keypath("Direct3D"), "PixelShaderMode", "disabled");
}
static INT read_logpixels_reg(void)
{
DWORD dwLogPixels;
......@@ -434,15 +385,11 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
case IDC_ENABLE_MANAGED: on_enable_managed_clicked(hDlg); break;
case IDC_ENABLE_DECORATED: on_enable_decorated_clicked(hDlg); break;
case IDC_FULLSCREEN_GRAB: on_fullscreen_grab_clicked(hDlg); break;
case IDC_D3D_PSHADER_MODE: on_d3d_pshader_mode_clicked(hDlg); break;
}
break;
}
case CBN_SELCHANGE: {
SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);
switch (LOWORD(wParam)) {
case IDC_D3D_VSHADER_MODE: on_d3d_vshader_mode_changed(hDlg); break;
}
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment