Index: cfgmgr/cfgmgr.c |
— | — | @@ -669,7 +669,7 @@ |
670 | 670 | WriteDWORD(hKey,cfg->anisotropic,cfgmask->anisotropic,_T("AnisotropicFiltering"));
|
671 | 671 | WriteDWORD(hKey,cfg->msaa,cfgmask->msaa,_T("Antialiasing"));
|
672 | 672 | WriteDWORD(hKey,cfg->aspect3d,cfgmask->aspect3d,_T("AdjustAspectRatio"));
|
673 | | - WriteBool(hKey,cfg->primaryscale,cfgmask->primaryscale,_T("AdjustPrimaryResolution"));
|
| 673 | + WriteDWORD(hKey,cfg->primaryscale,cfgmask->primaryscale,_T("AdjustPrimaryResolution"));
|
674 | 674 | WriteFloat(hKey,cfg->primaryscalex,cfgmask->primaryscalex,_T("PrimaryScaleX"));
|
675 | 675 | WriteFloat(hKey,cfg->primaryscaley,cfgmask->primaryscaley,_T("PrimaryScaleY"));
|
676 | 676 | WriteBool(hKey, cfg->EnableShader, cfgmask->EnableShader, _T("EnableShader"));
|
Index: dxgl-example.ini |
— | — | @@ -166,14 +166,17 @@ |
167 | 167 | ; The following values are valid:
|
168 | 168 | ; 0 - Use native primary surface size. Most compatible.
|
169 | 169 | ; 1 - Adjust primary surface size to match display.
|
170 | | -; The following will be added in the future:
|
171 | 170 | ; 2 - Adjust primary surface to nearest integer multiple of native.
|
172 | 171 | ; 3 - Use exact 1.5x scale.
|
173 | | - ; 4 - Use exact 2x scale.
|
| 172 | +; 4 - Use exact 2x scale.
|
174 | 173 | ; 5 - Use exact 2.5x scale.
|
175 | 174 | ; 6 - Use exact 3x scale.
|
176 | 175 | ; 7 - Use exact 4x scale.
|
177 | | -; 8 - Use custom scale.
|
| 176 | +; 8 - Use exact 5x scale.
|
| 177 | +; 9 - Use exact 6x scale.
|
| 178 | +; 10 - Use exact 7x scale.
|
| 179 | +; 11 - Use exact 8x scale.
|
| 180 | +; 12 - Use custom scale.
|
178 | 181 | ; Default is 0.
|
179 | 182 | AdjustPrimaryResolution = 0
|
180 | 183 |
|
Index: dxglcfg2/dxglcfg2.c |
— | — | @@ -1095,7 +1095,8 @@ |
1096 | 1096 | }
|
1097 | 1097 | return TRUE;
|
1098 | 1098 | }
|
1099 | | -LRESULT CALLBACK Tab3DCallback(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
|
| 1099 | +
|
| 1100 | +LRESULT CALLBACK EffectsTabCallback(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
|
1100 | 1101 | {
|
1101 | 1102 | switch (Msg)
|
1102 | 1103 | {
|
— | — | @@ -1102,12 +1103,53 @@ |
1103 | 1104 | case WM_INITDIALOG:
|
1104 | 1105 | if (_EnableThemeDialogTexture) _EnableThemeDialogTexture(hWnd, ETDT_ENABLETAB);
|
1105 | 1106 | return TRUE;
|
| 1107 | + case WM_COMMAND:
|
| 1108 | + switch (LOWORD(wParam))
|
| 1109 | + {
|
| 1110 | + case IDC_POSTSCALE:
|
| 1111 | + cfg->postfilter = GetCombo(hWnd, IDC_POSTSCALE, &cfgmask->postfilter);
|
| 1112 | + EnableWindow(GetDlgItem(hDialog, IDC_APPLY), TRUE);
|
| 1113 | + *dirty = TRUE;
|
| 1114 | + break;
|
| 1115 | + case IDC_POSTSCALESIZE:
|
| 1116 | + if (HIWORD(wParam) == CBN_KILLFOCUS)
|
| 1117 | + {
|
| 1118 | + GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->postsizex, &cfg->postsizey,
|
| 1119 | + &cfgmask->postsizex, &cfgmask->postsizey);
|
| 1120 | + SetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, cfg->postsizex, cfg->postsizey,
|
| 1121 | + cfgmask->postsizex, cfgmask->postsizey, tristate);
|
| 1122 | + EnableWindow(GetDlgItem(hDialog, IDC_APPLY), TRUE);
|
| 1123 | + *dirty = TRUE;
|
| 1124 | + }
|
| 1125 | + else if (HIWORD(wParam) == CBN_SELCHANGE)
|
| 1126 | + {
|
| 1127 | + GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->postsizex, &cfg->postsizey,
|
| 1128 | + &cfgmask->postsizex, &cfgmask->postsizey);
|
| 1129 | + EnableWindow(GetDlgItem(hDialog, IDC_APPLY), TRUE);
|
| 1130 | + *dirty = TRUE;
|
| 1131 | + }
|
| 1132 | + break;
|
| 1133 | + case IDC_PRIMARYSCALE:
|
| 1134 | + cfg->primaryscale = GetCombo(hWnd, IDC_PRIMARYSCALE, &cfgmask->primaryscale);
|
| 1135 | + EnableWindow(GetDlgItem(hDialog, IDC_APPLY), TRUE);
|
| 1136 | + *dirty = TRUE;
|
| 1137 | + break;
|
| 1138 | + case IDC_SHADER:
|
| 1139 | + if (HIWORD(wParam) == EN_CHANGE)
|
| 1140 | + {
|
| 1141 | + GetText(hWnd, IDC_SHADER, cfg->shaderfile, cfgmask->shaderfile);
|
| 1142 | + EnableWindow(GetDlgItem(hDialog, IDC_APPLY), TRUE);
|
| 1143 | + *dirty = TRUE;
|
| 1144 | + }
|
| 1145 | + break;
|
| 1146 | + }
|
1106 | 1147 | default:
|
1107 | 1148 | return FALSE;
|
1108 | 1149 | }
|
1109 | 1150 | return TRUE;
|
1110 | 1151 | }
|
1111 | | -LRESULT CALLBACK EffectsTabCallback(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
|
| 1152 | +
|
| 1153 | +LRESULT CALLBACK Tab3DCallback(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
|
1112 | 1154 | {
|
1113 | 1155 | switch (Msg)
|
1114 | 1156 | {
|
— | — | @@ -1119,6 +1161,7 @@ |
1120 | 1162 | }
|
1121 | 1163 | return TRUE;
|
1122 | 1164 | }
|
| 1165 | +
|
1123 | 1166 | LRESULT CALLBACK AdvancedTabCallback(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
|
1124 | 1167 | {
|
1125 | 1168 | switch (Msg)
|
— | — | @@ -1131,6 +1174,7 @@ |
1132 | 1175 | }
|
1133 | 1176 | return TRUE;
|
1134 | 1177 | }
|
| 1178 | +
|
1135 | 1179 | LRESULT CALLBACK DebugTabCallback(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
|
1136 | 1180 | {
|
1137 | 1181 | switch (Msg)
|
— | — | @@ -1143,6 +1187,7 @@ |
1144 | 1188 | }
|
1145 | 1189 | return TRUE;
|
1146 | 1190 | }
|
| 1191 | +
|
1147 | 1192 | LRESULT CALLBACK PathsTabCallback(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
|
1148 | 1193 | {
|
1149 | 1194 | switch (Msg)
|
— | — | @@ -1155,6 +1200,7 @@ |
1156 | 1201 | }
|
1157 | 1202 | return TRUE;
|
1158 | 1203 | }
|
| 1204 | +
|
1159 | 1205 | LRESULT CALLBACK DXGLCfgCallback(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
|
1160 | 1206 | {
|
1161 | 1207 | PIXELFORMATDESCRIPTOR pfd =
|
— | — | @@ -1359,26 +1405,54 @@ |
1360 | 1406 | else SendDlgItemMessage(hTabs[0], IDC_COLOR, BM_SETCHECK, BST_UNCHECKED, 0);
|
1361 | 1407 | // first scaling filter
|
1362 | 1408 | _tcscpy(buffer, _T("Nearest"));
|
1363 | | - SendDlgItemMessage(hTabs[2], IDC_POSTSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1409 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
1364 | 1410 | _tcscpy(buffer, _T("Bilinear"));
|
1365 | | - SendDlgItemMessage(hTabs[2], IDC_POSTSCALE, CB_ADDSTRING, 1, (LPARAM)buffer);
|
1366 | | - SendDlgItemMessage(hTabs[2], IDC_POSTSCALE, CB_SETCURSEL, cfg->postfilter, 0);
|
| 1411 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALE, CB_ADDSTRING, 1, (LPARAM)buffer);
|
| 1412 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALE, CB_SETCURSEL, cfg->postfilter, 0);
|
1367 | 1413 | // first scaling sizes
|
1368 | 1414 | _tcscpy(buffer, _T("Auto"));
|
1369 | | - SendDlgItemMessage(hTabs[2], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1415 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
1370 | 1416 | _tcscpy(buffer, _T("1x"));
|
1371 | | - SendDlgItemMessage(hTabs[2], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1417 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
1372 | 1418 | _tcscpy(buffer, _T("2x1"));
|
1373 | | - SendDlgItemMessage(hTabs[2], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1419 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
1374 | 1420 | _tcscpy(buffer, _T("2x"));
|
1375 | | - SendDlgItemMessage(hTabs[2], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1421 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
1376 | 1422 | _tcscpy(buffer, _T("3x"));
|
1377 | | - SendDlgItemMessage(hTabs[2], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1423 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
1378 | 1424 | _tcscpy(buffer, _T("4x"));
|
1379 | | - SendDlgItemMessage(hTabs[2], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
1380 | | - SetPostScaleCombo(hTabs[2], IDC_POSTSCALESIZE, cfg->postsizex, cfg->postsizey,
|
| 1425 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1426 | + SetPostScaleCombo(hTabs[1], IDC_POSTSCALESIZE, cfg->postsizex, cfg->postsizey,
|
1381 | 1427 | cfgmask->postsizex, cfgmask->postsizey, tristate);
|
1382 | | - // final scaling filter
|
| 1428 | + // primary scaling
|
| 1429 | + _tcscpy(buffer, _T("1x scale"));
|
| 1430 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1431 | + _tcscpy(buffer, _T("Scale to screen"));
|
| 1432 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1433 | + _tcscpy(buffer, _T("Maximum integer scaling"));
|
| 1434 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1435 | + _tcscpy(buffer, _T("1.5x scale"));
|
| 1436 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1437 | + _tcscpy(buffer, _T("2x scale"));
|
| 1438 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1439 | + _tcscpy(buffer, _T("2.5x scale"));
|
| 1440 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1441 | + _tcscpy(buffer, _T("3x scale"));
|
| 1442 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1443 | + _tcscpy(buffer, _T("4x scale"));
|
| 1444 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1445 | + _tcscpy(buffer, _T("5x scale"));
|
| 1446 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1447 | + _tcscpy(buffer, _T("6x scale"));
|
| 1448 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1449 | + _tcscpy(buffer, _T("7x scale"));
|
| 1450 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1451 | + _tcscpy(buffer, _T("8x scale"));
|
| 1452 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1453 | + _tcscpy(buffer, _T("Custom scale"));
|
| 1454 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 1455 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_SETCURSEL, cfg->primaryscale, 0);
|
| 1456 | + // scaling filter
|
1383 | 1457 | _tcscpy(buffer,_T("Nearest"));
|
1384 | 1458 | SendDlgItemMessage(hTabs[0], IDC_SCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
1385 | 1459 | _tcscpy(buffer,_T("Bilinear"));
|
— | — | @@ -1396,26 +1470,6 @@ |
1397 | 1471 | _tcscpy(buffer,_T("5:4"));
|
1398 | 1472 | SendDlgItemMessage(hTabs[0], IDC_ASPECT, CB_ADDSTRING, 0, (LPARAM)buffer);
|
1399 | 1473 | SetAspectCombo(hTabs[0], IDC_ASPECT, cfg->aspect, cfgmask->aspect, tristate);
|
1400 | | - // primaryscale
|
1401 | | - _tcscpy(buffer, _T("Auto (Window Size)"));
|
1402 | | - SendDlgItemMessage(hTabs[2], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
1403 | | - _tcscpy(buffer, _T("Auto (Multiple of Native)"));
|
1404 | | - SendDlgItemMessage(hTabs[2], IDC_PRIMARYSCALE, CB_ADDSTRING, 1, (LPARAM)buffer);
|
1405 | | - _tcscpy(buffer, _T("1x Native (Recommended)"));
|
1406 | | - SendDlgItemMessage(hTabs[2], IDC_PRIMARYSCALE, CB_ADDSTRING, 2, (LPARAM)buffer);
|
1407 | | - _tcscpy(buffer, _T("1.5x Native"));
|
1408 | | - SendDlgItemMessage(hTabs[2], IDC_PRIMARYSCALE, CB_ADDSTRING, 3, (LPARAM)buffer);
|
1409 | | - _tcscpy(buffer, _T("2x Native"));
|
1410 | | - SendDlgItemMessage(hTabs[2], IDC_PRIMARYSCALE, CB_ADDSTRING, 4, (LPARAM)buffer);
|
1411 | | - _tcscpy(buffer, _T("2.5x Native"));
|
1412 | | - SendDlgItemMessage(hTabs[2], IDC_PRIMARYSCALE, CB_ADDSTRING, 5, (LPARAM)buffer);
|
1413 | | - _tcscpy(buffer, _T("3x Native"));
|
1414 | | - SendDlgItemMessage(hTabs[2], IDC_PRIMARYSCALE, CB_ADDSTRING, 6, (LPARAM)buffer);
|
1415 | | - _tcscpy(buffer, _T("4x Native"));
|
1416 | | - SendDlgItemMessage(hTabs[2], IDC_PRIMARYSCALE, CB_ADDSTRING, 7, (LPARAM)buffer);
|
1417 | | - _tcscpy(buffer, _T("Custom"));
|
1418 | | - SendDlgItemMessage(hTabs[2], IDC_PRIMARYSCALE, CB_ADDSTRING, 8, (LPARAM)buffer);
|
1419 | | - SetPrimaryScaleCombo(hTabs[2], IDC_PRIMARYSCALE, cfg->primaryscale, cfgmask->primaryscale, tristate);
|
1420 | 1474 | // texfilter
|
1421 | 1475 | _tcscpy(buffer,_T("Application default"));
|
1422 | 1476 | SendDlgItemMessage(hTabs[2], IDC_TEXFILTER, CB_ADDSTRING, 0, (LPARAM)buffer);
|
— | — | @@ -1869,14 +1923,14 @@ |
1870 | 1924 | SendDlgItemMessage(hTabs[0], IDC_VSYNC, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
1871 | 1925 | SendDlgItemMessage(hTabs[0], IDC_FULLMODE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
1872 | 1926 | SendDlgItemMessage(hTabs[0], IDC_COLOR, BM_SETSTYLE, BS_AUTO3STATE, (LPARAM)TRUE);
|
| 1927 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
| 1928 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
| 1929 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
1873 | 1930 | /*
|
1874 | | - SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
1875 | | - SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
1876 | 1931 | SendDlgItemMessage(hWnd,IDC_MSAA,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1877 | 1932 | SendDlgItemMessage(hWnd,IDC_ANISO,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1878 | 1933 | SendDlgItemMessage(hWnd,IDC_TEXFILTER,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1879 | 1934 | SendDlgItemMessage(hWnd,IDC_ASPECT3D,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1880 | | - SendDlgItemMessage(hTabs[0], IDC_HIGHRES, BM_SETSTYLE, BS_AUTO3STATE, (LPARAM)TRUE);
|
1881 | 1935 | SendDlgItemMessage(hWnd,IDC_TEXTUREFORMAT,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1882 | 1936 | SendDlgItemMessage(hWnd,IDC_TEXUPLOAD,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1883 | 1937 | */
|
— | — | @@ -1904,11 +1958,13 @@ |
1905 | 1959 | SendDlgItemMessage(hTabs[0], IDC_FULLMODE, CB_DELETESTRING,
|
1906 | 1960 | SendDlgItemMessage(hTabs[0], IDC_FULLMODE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
1907 | 1961 | SendDlgItemMessage(hTabs[0], IDC_COLOR, BM_SETSTYLE, BS_AUTOCHECKBOX, (LPARAM)TRUE);
|
| 1962 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALE, CB_DELETESTRING,
|
| 1963 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
| 1964 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALESIZE, CB_DELETESTRING,
|
| 1965 | + SendDlgItemMessage(hTabs[1], IDC_POSTSCALESIZE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
| 1966 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_DELETESTRING,
|
| 1967 | + SendDlgItemMessage(hTabs[1], IDC_PRIMARYSCALE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
1908 | 1968 | /*
|
1909 | | - SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_DELETESTRING,
|
1910 | | - SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
1911 | | - SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_DELETESTRING,
|
1912 | | - SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
1913 | 1969 | SendDlgItemMessage(hWnd,IDC_MSAA,CB_DELETESTRING,
|
1914 | 1970 | SendDlgItemMessage(hWnd,IDC_MSAA,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
|
1915 | 1971 | SendDlgItemMessage(hWnd,IDC_ANISO,CB_DELETESTRING,
|
— | — | @@ -1917,7 +1973,6 @@ |
1918 | 1974 | SendDlgItemMessage(hWnd,IDC_TEXFILTER,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
|
1919 | 1975 | SendDlgItemMessage(hWnd,IDC_ASPECT3D,CB_DELETESTRING,
|
1920 | 1976 | SendDlgItemMessage(hWnd,IDC_ASPECT3D,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
|
1921 | | - SendDlgItemMessage(hWnd,IDC_HIGHRES,BM_SETSTYLE,BS_AUTOCHECKBOX,(LPARAM)TRUE);
|
1922 | 1977 | SendDlgItemMessage(hWnd,IDC_TEXTUREFORMAT,CB_DELETESTRING,
|
1923 | 1978 | SendDlgItemMessage(hWnd,IDC_ASPECT3D,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
|
1924 | 1979 | SendDlgItemMessage(hWnd,IDC_TEXUPLOAD,CB_DELETESTRING,
|
— | — | @@ -1936,28 +1991,23 @@ |
1937 | 1992 | SetCombo(hTabs[0], IDC_VSYNC, cfg->vsync, cfgmask->vsync, tristate);
|
1938 | 1993 | SetCombo(hTabs[0], IDC_FULLMODE, cfg->fullmode, cfgmask->fullmode, tristate);
|
1939 | 1994 | SetCheck(hTabs[0], IDC_COLOR, cfg->colormode, cfgmask->colormode, tristate);
|
| 1995 | + SetCombo(hTabs[1], IDC_POSTSCALE, cfg->postfilter, cfgmask->postfilter, tristate);
|
| 1996 | + SetPostScaleCombo(hTabs[1], IDC_POSTSCALESIZE, cfg->postsizex, cfg->postsizey,
|
| 1997 | + cfgmask->postsizex , cfgmask->postsizey, tristate);
|
| 1998 | + SetCombo(hTabs[1], IDC_PRIMARYSCALE, cfg->primaryscale, cfgmask->primaryscale, tristate);
|
1940 | 1999 | /*
|
1941 | | - SetCombo(hWnd,IDC_POSTSCALE,cfg->firstscalefilter,cfgmask->firstscalefilter,tristate);
|
1942 | 2000 | SetCombo(hWnd,IDC_MSAA,cfg->msaa,cfgmask->msaa,tristate);
|
1943 | 2001 | SetCombo(hWnd,IDC_ANISO,cfg->anisotropic,cfgmask->anisotropic,tristate);
|
1944 | 2002 | SetCombo(hWnd,IDC_TEXFILTER,cfg->texfilter,cfgmask->texfilter,tristate);
|
1945 | 2003 | SetCombo(hWnd,IDC_ASPECT3D,cfg->aspect3d,cfgmask->aspect3d,tristate);
|
1946 | | - SetCheck(hWnd,IDC_HIGHRES,cfg->highres,cfgmask->highres,tristate);
|
1947 | 2004 | SetCheck(hWnd,IDC_UNCOMMONCOLOR,cfg->AllColorDepths,cfgmask->AllColorDepths,tristate);
|
1948 | 2005 | SetCombo(hWnd,IDC_TEXTUREFORMAT,cfg->TextureFormat,cfgmask->TextureFormat,tristate);
|
1949 | 2006 | SetCombo(hWnd,IDC_TEXUPLOAD,cfg->TexUpload,cfgmask->TexUpload,tristate);
|
1950 | 2007 | SetCheck(hWnd,IDC_EXTRAMODES,cfg->ExtraModes,cfgmask->ExtraModes,tristate);
|
1951 | 2008 | SetText(hWnd,IDC_SHADER,cfg->shaderfile,cfgmask->shaderfile,tristate);
|
1952 | | - SetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, cfg->firstscalex, cfg->firstscaley,
|
1953 | | - cfgmask->firstscalex, cfgmask->firstscaley, tristate);
|
1954 | 2009 | */
|
1955 | 2010 | }
|
1956 | 2011 | break;/*
|
1957 | | - case IDC_POSTSCALE:
|
1958 | | - cfg->firstscalefilter = GetCombo(hWnd,IDC_POSTSCALE,&cfgmask->firstscalefilter);
|
1959 | | - EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
1960 | | - *dirty = TRUE;
|
1961 | | - break;
|
1962 | 2012 | case IDC_MSAA:
|
1963 | 2013 | cfg->msaa = GetCombo(hWnd,IDC_MSAA,&cfgmask->msaa);
|
1964 | 2014 | EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
— | — | @@ -1978,16 +2028,6 @@ |
1979 | 2029 | EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
1980 | 2030 | *dirty = TRUE;
|
1981 | 2031 | break;
|
1982 | | - case IDC_HIGHRES:
|
1983 | | - cfg->highres = GetCheck(hWnd,IDC_HIGHRES,&cfgmask->highres);
|
1984 | | - EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
1985 | | - *dirty = TRUE;
|
1986 | | - break;
|
1987 | | - case IDC_UNCOMMONCOLOR:
|
1988 | | - cfg->AllColorDepths = GetCheck(hWnd,IDC_UNCOMMONCOLOR,&cfgmask->AllColorDepths);
|
1989 | | - EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
1990 | | - *dirty = TRUE;
|
1991 | | - break;
|
1992 | 2032 | case IDC_TEXTUREFORMAT:
|
1993 | 2033 | cfg->TextureFormat = GetCombo(hWnd,IDC_TEXTUREFORMAT,&cfgmask->TextureFormat);
|
1994 | 2034 | EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
— | — | @@ -1998,32 +2038,6 @@ |
1999 | 2039 | EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
2000 | 2040 | *dirty = TRUE;
|
2001 | 2041 | break;
|
2002 | | - case IDC_POSTSCALESIZE:
|
2003 | | - if (HIWORD(wParam) == CBN_KILLFOCUS)
|
2004 | | - {
|
2005 | | - GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->firstscalex, &cfg->firstscaley,
|
2006 | | - &cfgmask->firstscalex, &cfgmask->firstscaley);
|
2007 | | - SetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, cfg->firstscalex, cfg->firstscaley,
|
2008 | | - cfgmask->firstscalex, cfgmask->firstscaley, tristate);
|
2009 | | - EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
|
2010 | | - *dirty = TRUE;
|
2011 | | - }
|
2012 | | - else if (HIWORD(wParam) == CBN_SELCHANGE)
|
2013 | | - {
|
2014 | | - GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->firstscalex, &cfg->firstscaley,
|
2015 | | - &cfgmask->firstscalex, &cfgmask->firstscaley);
|
2016 | | - EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
|
2017 | | - *dirty = TRUE;
|
2018 | | - }
|
2019 | | - break;
|
2020 | | - case IDC_SHADER:
|
2021 | | - if(HIWORD(wParam) == EN_CHANGE)
|
2022 | | - {
|
2023 | | - GetText(hWnd,IDC_SHADER,cfg->shaderfile,cfgmask->shaderfile);
|
2024 | | - EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
2025 | | - *dirty = TRUE;
|
2026 | | - }
|
2027 | | - break;
|
2028 | 2042 | */
|
2029 | 2043 | case IDC_ADD:
|
2030 | 2044 | selectedfile[0] = 0;
|