Index: dxglcfg/dxglcfg.c |
— | — | @@ -358,7 +358,7 @@ |
359 | 359 | }
|
360 | 360 | }
|
361 | 361 |
|
362 | | -void Set1stScaleCombo(HWND hWnd, int DlgItem, float x, float y, DWORD maskx, DWORD masky, BOOL tristate)
|
| 362 | +void SetPostScaleCombo(HWND hWnd, int DlgItem, float x, float y, DWORD maskx, DWORD masky, BOOL tristate)
|
363 | 363 | {
|
364 | 364 | TCHAR buffer[32];
|
365 | 365 | if (tristate && !maskx && !masky)
|
— | — | @@ -431,7 +431,7 @@ |
432 | 432 | }
|
433 | 433 | }
|
434 | 434 |
|
435 | | -void Get1stScaleCombo(HWND hWnd, int DlgItem, float *x, float *y, float *maskx, float *masky)
|
| 435 | +void GetPostScaleCombo(HWND hWnd, int DlgItem, float *x, float *y, float *maskx, float *masky)
|
436 | 436 | {
|
437 | 437 | TCHAR buffer[32];
|
438 | 438 | TCHAR *ptr;
|
— | — | @@ -676,24 +676,24 @@ |
677 | 677 | else SendDlgItemMessage(hWnd,IDC_COLOR,BM_SETCHECK,BST_UNCHECKED,0);
|
678 | 678 | // first scaling filter
|
679 | 679 | _tcscpy(buffer, _T("Nearest"));
|
680 | | - SendDlgItemMessage(hWnd, IDC_PRESCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 680 | + SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
681 | 681 | _tcscpy(buffer, _T("Bilinear"));
|
682 | | - SendDlgItemMessage(hWnd, IDC_PRESCALE, CB_ADDSTRING, 1, (LPARAM)buffer);
|
683 | | - SendDlgItemMessage(hWnd, IDC_PRESCALE, CB_SETCURSEL, cfg->postfilter, 0);
|
| 682 | + SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_ADDSTRING, 1, (LPARAM)buffer);
|
| 683 | + SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_SETCURSEL, cfg->postfilter, 0);
|
684 | 684 | // first scaling sizes
|
685 | 685 | _tcscpy(buffer, _T("Auto"));
|
686 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 686 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
687 | 687 | _tcscpy(buffer, _T("1x"));
|
688 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 688 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
689 | 689 | _tcscpy(buffer, _T("2x1"));
|
690 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 690 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
691 | 691 | _tcscpy(buffer, _T("2x"));
|
692 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 692 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
693 | 693 | _tcscpy(buffer, _T("3x"));
|
694 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 694 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
695 | 695 | _tcscpy(buffer, _T("4x"));
|
696 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
697 | | - Set1stScaleCombo(hWnd, IDC_PRESCALESIZE, cfg->postsizex, cfg->postsizey,
|
| 696 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 697 | + SetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, cfg->postsizex, cfg->postsizey,
|
698 | 698 | cfgmask->postsizex, cfgmask->postsizey, tristate);
|
699 | 699 | // final scaling filter
|
700 | 700 | _tcscpy(buffer,_T("Nearest"));
|
— | — | @@ -1124,8 +1124,8 @@ |
1125 | 1125 | tristate = TRUE;
|
1126 | 1126 | SendDlgItemMessage(hWnd,IDC_VIDMODE,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1127 | 1127 | SendDlgItemMessage(hWnd,IDC_SORTMODES,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1128 | | - SendDlgItemMessage(hWnd, IDC_PRESCALE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
1129 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
| 1128 | + SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
| 1129 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
1130 | 1130 | SendDlgItemMessage(hWnd,IDC_SCALE,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1131 | 1131 | //SendDlgItemMessage(hWnd,IDC_VSYNC,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1132 | 1132 | SendDlgItemMessage(hWnd, IDC_FULLMODE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
— | — | @@ -1149,10 +1149,10 @@ |
1150 | 1150 | SendDlgItemMessage(hWnd,IDC_VIDMODE,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
|
1151 | 1151 | SendDlgItemMessage(hWnd,IDC_SORTMODES,CB_DELETESTRING,
|
1152 | 1152 | SendDlgItemMessage(hWnd,IDC_SORTMODES,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
|
1153 | | - SendDlgItemMessage(hWnd, IDC_PRESCALE, CB_DELETESTRING,
|
1154 | | - SendDlgItemMessage(hWnd, IDC_PRESCALE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
1155 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_DELETESTRING,
|
1156 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
| 1153 | + SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_DELETESTRING,
|
| 1154 | + SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
| 1155 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_DELETESTRING,
|
| 1156 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
1157 | 1157 | SendDlgItemMessage(hWnd,IDC_SCALE,CB_DELETESTRING,
|
1158 | 1158 | SendDlgItemMessage(hWnd,IDC_SCALE,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
|
1159 | 1159 | /* SendDlgItemMessage(hWnd,IDC_VSYNC,CB_DELETESTRING,
|
— | — | @@ -1183,7 +1183,7 @@ |
1184 | 1184 | // Read settings into controls
|
1185 | 1185 | SetCombo(hWnd,IDC_VIDMODE,cfg->scaler,cfgmask->scaler,tristate);
|
1186 | 1186 | SetCombo(hWnd,IDC_SORTMODES,cfg->SortModes,cfgmask->SortModes,tristate);
|
1187 | | - SetCombo(hWnd,IDC_PRESCALE,cfg->postfilter,cfgmask->postfilter,tristate);
|
| 1187 | + SetCombo(hWnd,IDC_POSTSCALE,cfg->postfilter,cfgmask->postfilter,tristate);
|
1188 | 1188 | SetCombo(hWnd,IDC_SCALE,cfg->scalingfilter,cfgmask->scalingfilter,tristate);
|
1189 | 1189 | //SetCombo(hWnd,IDC_VSYNC,cfg->vsync,cfgmask->vsync,tristate);
|
1190 | 1190 | SetCombo(hWnd,IDC_FULLMODE,cfg->fullmode,cfgmask->fullmode,tristate);
|
— | — | @@ -1198,7 +1198,7 @@ |
1199 | 1199 | SetCombo(hWnd,IDC_TEXUPLOAD,cfg->TexUpload,cfgmask->TexUpload,tristate);
|
1200 | 1200 | SetCheck(hWnd,IDC_EXTRAMODES,cfg->AddModes,cfgmask->AddModes,tristate);
|
1201 | 1201 | SetCombo(hWnd, IDC_DPISCALE, cfg->DPIScale, cfgmask->DPIScale, tristate);
|
1202 | | - Set1stScaleCombo(hWnd, IDC_PRESCALESIZE, cfg->postsizex, cfg->postsizey,
|
| 1202 | + SetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, cfg->postsizex, cfg->postsizey,
|
1203 | 1203 | cfgmask->postsizex, cfgmask->postsizey, tristate);
|
1204 | 1204 | SetAspectCombo(hWnd, IDC_ASPECT, cfg->aspect, cfgmask->aspect, tristate);
|
1205 | 1205 | }
|
— | — | @@ -1213,8 +1213,8 @@ |
1214 | 1214 | EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
1215 | 1215 | *dirty = TRUE;
|
1216 | 1216 | break;
|
1217 | | - case IDC_PRESCALE:
|
1218 | | - cfg->postfilter = GetCombo(hWnd,IDC_PRESCALE,&cfgmask->postfilter);
|
| 1217 | + case IDC_POSTSCALE:
|
| 1218 | + cfg->postfilter = GetCombo(hWnd,IDC_POSTSCALE,&cfgmask->postfilter);
|
1219 | 1219 | EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
1220 | 1220 | *dirty = TRUE;
|
1221 | 1221 | break;
|
— | — | @@ -1288,12 +1288,12 @@ |
1289 | 1289 | EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
|
1290 | 1290 | *dirty = TRUE;
|
1291 | 1291 | break;
|
1292 | | - case IDC_PRESCALESIZE:
|
| 1292 | + case IDC_POSTSCALESIZE:
|
1293 | 1293 | if (HIWORD(wParam) == CBN_KILLFOCUS)
|
1294 | 1294 | {
|
1295 | | - Get1stScaleCombo(hWnd, IDC_PRESCALESIZE, &cfg->postsizex, &cfg->postsizey,
|
| 1295 | + GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->postsizex, &cfg->postsizey,
|
1296 | 1296 | &cfgmask->postsizex, &cfgmask->postsizey);
|
1297 | | - Set1stScaleCombo(hWnd, IDC_PRESCALESIZE, cfg->postsizex, cfg->postsizey,
|
| 1297 | + SetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, cfg->postsizex, cfg->postsizey,
|
1298 | 1298 | cfgmask->postsizex, cfgmask->postsizey, tristate);
|
1299 | 1299 | EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
|
1300 | 1300 | *dirty = TRUE;
|
— | — | @@ -1300,7 +1300,7 @@ |
1301 | 1301 | }
|
1302 | 1302 | else if (HIWORD(wParam) == CBN_SELCHANGE)
|
1303 | 1303 | {
|
1304 | | - Get1stScaleCombo(hWnd, IDC_PRESCALESIZE, &cfg->postsizex, &cfg->postsizey,
|
| 1304 | + GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->postsizex, &cfg->postsizey,
|
1305 | 1305 | &cfgmask->postsizex, &cfgmask->postsizey);
|
1306 | 1306 | EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
|
1307 | 1307 | *dirty = TRUE;
|
Index: dxglcfg/dxglcfg.rc |
— | — | @@ -45,17 +45,17 @@ |
46 | 46 | LTEXT "Video mode", IDC_STATIC, 195, 14, 38, 8, SS_LEFT, WS_EX_LEFT
|
47 | 47 | COMBOBOX IDC_VIDMODE, 195, 24, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
48 | 48 | AUTOCHECKBOX "Change display color depth", IDC_COLOR, 299, 14, 100, 10, 0, WS_EX_LEFT
|
49 | | - LTEXT "Scaling method (final pass)", IDC_STATIC, 195, 90, 86, 9, SS_LEFT, WS_EX_LEFT
|
50 | | - COMBOBOX IDC_SCALE, 195, 101, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
51 | | - LTEXT "Fullscreen window mode", IDC_STATIC, 299, 90, 78, 8, SS_LEFT, WS_EX_LEFT
|
52 | | - COMBOBOX IDC_FULLMODE, 299, 101, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
53 | | - LTEXT "Scaling method (1st pass)", IDC_STATIC, 195, 64, 83, 9, SS_LEFT, WS_EX_LEFT
|
54 | | - COMBOBOX IDC_PRESCALE, 195, 75, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
55 | | - COMBOBOX IDC_PRESCALESIZE, 299, 75, 100, 30, CBS_DROPDOWN | CBS_HASSTRINGS, WS_EX_LEFT
|
56 | | - LTEXT "1st pass scale size", 0, 299, 64, 60, 9, SS_LEFT, WS_EX_LEFT
|
| 49 | + LTEXT "Scaling method", IDC_STATIC, 195, 64, 49, 8, SS_LEFT, WS_EX_LEFT
|
| 50 | + COMBOBOX IDC_SCALE, 195, 75, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
| 51 | + LTEXT "Fullscreen window mode", IDC_STATIC, 299, 64, 78, 9, SS_LEFT, WS_EX_LEFT
|
| 52 | + COMBOBOX IDC_FULLMODE, 299, 75, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
| 53 | + LTEXT "Postprocess scaler", IDC_STATIC, 195, 90, 60, 9, SS_LEFT, WS_EX_LEFT
|
| 54 | + COMBOBOX IDC_POSTSCALE, 195, 101, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
| 55 | + LTEXT "Postprocess input multiplier", IDC_STATIC, 299, 90, 88, 9, SS_LEFT, WS_EX_LEFT
|
| 56 | + COMBOBOX IDC_POSTSCALESIZE, 299, 101, 100, 30, CBS_DROPDOWN | CBS_HASSTRINGS, WS_EX_LEFT
|
57 | 57 | LTEXT "Screen aspect ratio", IDC_STATIC, 195, 116, 63, 8, SS_LEFT, WS_EX_LEFT
|
| 58 | + COMBOBOX IDC_ASPECT, 195, 126, 102, 30, CBS_DROPDOWN | CBS_HASSTRINGS, WS_EX_LEFT
|
58 | 59 | LTEXT "Windows DPI scaling mode", IDC_STATIC, 299, 116, 86, 9, SS_LEFT, WS_EX_LEFT
|
59 | | - COMBOBOX IDC_ASPECT, 195, 126, 102, 30, CBS_DROPDOWN | CBS_HASSTRINGS, WS_EX_LEFT
|
60 | 60 | COMBOBOX IDC_DPISCALE, 299, 126, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
61 | 61 | LTEXT "Texture filter", IDC_STATIC, 195, 141, 43, 8, SS_LEFT, WS_EX_LEFT
|
62 | 62 | COMBOBOX IDC_TEXFILTER, 195, 151, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
Index: dxglcfg/resource.h |
— | — | @@ -34,8 +34,8 @@ |
35 | 35 | #define IDC_VIDMODE 1041
|
36 | 36 | #define IDC_SCALE 1042
|
37 | 37 | #define IDC_FULLMODE 1043
|
38 | | -#define IDC_PRESCALESIZE 1044
|
39 | | -#define IDC_PRESCALE 1045
|
| 38 | +#define IDC_POSTSCALESIZE 1044
|
| 39 | +#define IDC_POSTSCALE 1045
|
40 | 40 | #define IDC_TEXFILTER 1046
|
41 | 41 | #define IDC_ANISO 1047
|
42 | 42 | #define IDC_MSAA 1048
|
Index: dxglcfg2/dxglcfg2.c |
— | — | @@ -430,7 +430,7 @@ |
431 | 431 | }
|
432 | 432 | }
|
433 | 433 |
|
434 | | -void Set1stScaleCombo(HWND hWnd, int DlgItem, float x, float y, DWORD maskx, DWORD masky, BOOL tristate)
|
| 434 | +void SetPostScaleCombo(HWND hWnd, int DlgItem, float x, float y, DWORD maskx, DWORD masky, BOOL tristate)
|
435 | 435 | {
|
436 | 436 | TCHAR buffer[32];
|
437 | 437 | if (tristate && !maskx && !masky)
|
— | — | @@ -485,7 +485,7 @@ |
486 | 486 | }
|
487 | 487 | }
|
488 | 488 |
|
489 | | -void Get1stScaleCombo(HWND hWnd, int DlgItem, float *x, float *y, float *maskx, float *masky)
|
| 489 | +void GetPostScaleCombo(HWND hWnd, int DlgItem, float *x, float *y, float *maskx, float *masky)
|
490 | 490 | {
|
491 | 491 | TCHAR buffer[32];
|
492 | 492 | TCHAR *ptr;
|
— | — | @@ -908,24 +908,24 @@ |
909 | 909 | else SendDlgItemMessage(hTabs[0], IDC_COLOR, BM_SETCHECK, BST_UNCHECKED, 0);
|
910 | 910 | // first scaling filter
|
911 | 911 | _tcscpy(buffer, _T("Nearest"));
|
912 | | - SendDlgItemMessage(hTabs[0], IDC_PRESCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 912 | + SendDlgItemMessage(hTabs[0], IDC_POSTSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
913 | 913 | _tcscpy(buffer, _T("Bilinear"));
|
914 | | - SendDlgItemMessage(hTabs[0], IDC_PRESCALE, CB_ADDSTRING, 1, (LPARAM)buffer);
|
915 | | - SendDlgItemMessage(hWnd, IDC_PRESCALE, CB_SETCURSEL, cfg->postfilter, 0);
|
| 914 | + SendDlgItemMessage(hTabs[0], IDC_POSTSCALE, CB_ADDSTRING, 1, (LPARAM)buffer);
|
| 915 | + SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_SETCURSEL, cfg->postfilter, 0);
|
916 | 916 | // first scaling sizes
|
917 | 917 | _tcscpy(buffer, _T("Auto"));
|
918 | | - SendDlgItemMessage(hTabs[0], IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 918 | + SendDlgItemMessage(hTabs[0], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
919 | 919 | _tcscpy(buffer, _T("1x"));
|
920 | | - SendDlgItemMessage(hTabs[0], IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 920 | + SendDlgItemMessage(hTabs[0], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
921 | 921 | _tcscpy(buffer, _T("2x1"));
|
922 | | - SendDlgItemMessage(hTabs[0], IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 922 | + SendDlgItemMessage(hTabs[0], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
923 | 923 | _tcscpy(buffer, _T("2x"));
|
924 | | - SendDlgItemMessage(hTabs[0], IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 924 | + SendDlgItemMessage(hTabs[0], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
925 | 925 | _tcscpy(buffer, _T("3x"));
|
926 | | - SendDlgItemMessage(hTabs[0], IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 926 | + SendDlgItemMessage(hTabs[0], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
927 | 927 | _tcscpy(buffer, _T("4x"));
|
928 | | - SendDlgItemMessage(hTabs[0], IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
929 | | - Set1stScaleCombo(hWnd, IDC_PRESCALESIZE, cfg->postsizex, cfg->postsizey,
|
| 928 | + SendDlgItemMessage(hTabs[0], IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
|
| 929 | + SetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, cfg->postsizex, cfg->postsizey,
|
930 | 930 | cfgmask->postsizex, cfgmask->postsizey, tristate);
|
931 | 931 | // final scaling filter
|
932 | 932 | _tcscpy(buffer,_T("Nearest"));
|
— | — | @@ -1404,8 +1404,8 @@ |
1405 | 1405 | tristate = TRUE;
|
1406 | 1406 | SendDlgItemMessage(hWnd,IDC_VIDMODE,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1407 | 1407 | SendDlgItemMessage(hWnd,IDC_SORTMODES,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1408 | | - SendDlgItemMessage(hWnd, IDC_PRESCALE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
1409 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
| 1408 | + SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
| 1409 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)strdefault);
|
1410 | 1410 | SendDlgItemMessage(hWnd,IDC_SCALE,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1411 | 1411 | SendDlgItemMessage(hWnd,IDC_VSYNC,CB_ADDSTRING,0,(LPARAM)strdefault);
|
1412 | 1412 | SendDlgItemMessage(hWnd,IDC_MSAA,CB_ADDSTRING,0,(LPARAM)strdefault);
|
— | — | @@ -1428,10 +1428,10 @@ |
1429 | 1429 | SendDlgItemMessage(hWnd,IDC_VIDMODE,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
|
1430 | 1430 | SendDlgItemMessage(hWnd,IDC_SORTMODES,CB_DELETESTRING,
|
1431 | 1431 | SendDlgItemMessage(hWnd,IDC_SORTMODES,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
|
1432 | | - SendDlgItemMessage(hWnd, IDC_PRESCALE, CB_DELETESTRING,
|
1433 | | - SendDlgItemMessage(hWnd, IDC_PRESCALE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
1434 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_DELETESTRING,
|
1435 | | - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
| 1432 | + SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_DELETESTRING,
|
| 1433 | + SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
| 1434 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_DELETESTRING,
|
| 1435 | + SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_FINDSTRING, -1, (LPARAM)strdefault), 0);
|
1436 | 1436 | SendDlgItemMessage(hWnd,IDC_SCALE,CB_DELETESTRING,
|
1437 | 1437 | SendDlgItemMessage(hWnd,IDC_SCALE,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
|
1438 | 1438 | SendDlgItemMessage(hWnd,IDC_VSYNC,CB_DELETESTRING,
|
— | — | @@ -1460,7 +1460,7 @@ |
1461 | 1461 | // Read settings into controls
|
1462 | 1462 | SetCombo(hWnd,IDC_VIDMODE,cfg->scaler,cfgmask->scaler,tristate);
|
1463 | 1463 | SetCombo(hWnd,IDC_SORTMODES,cfg->SortModes,cfgmask->SortModes,tristate);
|
1464 | | - SetCombo(hWnd,IDC_PRESCALE,cfg->firstscalefilter,cfgmask->firstscalefilter,tristate);
|
| 1464 | + SetCombo(hWnd,IDC_POSTSCALE,cfg->firstscalefilter,cfgmask->firstscalefilter,tristate);
|
1465 | 1465 | SetCombo(hWnd,IDC_SCALE,cfg->scalingfilter,cfgmask->scalingfilter,tristate);
|
1466 | 1466 | SetCombo(hWnd,IDC_VSYNC,cfg->vsync,cfgmask->vsync,tristate);
|
1467 | 1467 | SetCombo(hWnd,IDC_MSAA,cfg->msaa,cfgmask->msaa,tristate);
|
— | — | @@ -1475,7 +1475,7 @@ |
1476 | 1476 | SetCheck(hWnd,IDC_EXTRAMODES,cfg->ExtraModes,cfgmask->ExtraModes,tristate);
|
1477 | 1477 | SetText(hWnd,IDC_SHADER,cfg->shaderfile,cfgmask->shaderfile,tristate);
|
1478 | 1478 | SetCombo(hWnd, IDC_DPISCALE, cfg->DPIScale, cfgmask->DPIScale, tristate);
|
1479 | | - Set1stScaleCombo(hWnd, IDC_PRESCALESIZE, cfg->firstscalex, cfg->firstscaley,
|
| 1479 | + SetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, cfg->firstscalex, cfg->firstscaley,
|
1480 | 1480 | cfgmask->firstscalex, cfgmask->firstscaley, tristate);
|
1481 | 1481 | SetAspectCombo(hWnd, IDC_ASPECT, cfg->aspect, cfgmask->aspect, tristate);*/
|
1482 | 1482 | }
|
— | — | @@ -1490,8 +1490,8 @@ |
1491 | 1491 | EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
1492 | 1492 | *dirty = TRUE;
|
1493 | 1493 | break;
|
1494 | | - case IDC_PRESCALE:
|
1495 | | - cfg->firstscalefilter = GetCombo(hWnd,IDC_PRESCALE,&cfgmask->firstscalefilter);
|
| 1494 | + case IDC_POSTSCALE:
|
| 1495 | + cfg->firstscalefilter = GetCombo(hWnd,IDC_POSTSCALE,&cfgmask->firstscalefilter);
|
1496 | 1496 | EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
1497 | 1497 | *dirty = TRUE;
|
1498 | 1498 | break;
|
— | — | @@ -1560,12 +1560,12 @@ |
1561 | 1561 | EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
|
1562 | 1562 | *dirty = TRUE;
|
1563 | 1563 | break;
|
1564 | | - case IDC_PRESCALESIZE:
|
| 1564 | + case IDC_POSTSCALESIZE:
|
1565 | 1565 | if (HIWORD(wParam) == CBN_KILLFOCUS)
|
1566 | 1566 | {
|
1567 | | - Get1stScaleCombo(hWnd, IDC_PRESCALESIZE, &cfg->firstscalex, &cfg->firstscaley,
|
| 1567 | + GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->firstscalex, &cfg->firstscaley,
|
1568 | 1568 | &cfgmask->firstscalex, &cfgmask->firstscaley);
|
1569 | | - Set1stScaleCombo(hWnd, IDC_PRESCALESIZE, cfg->firstscalex, cfg->firstscaley,
|
| 1569 | + SetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, cfg->firstscalex, cfg->firstscaley,
|
1570 | 1570 | cfgmask->firstscalex, cfgmask->firstscaley, tristate);
|
1571 | 1571 | EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
|
1572 | 1572 | *dirty = TRUE;
|
— | — | @@ -1572,7 +1572,7 @@ |
1573 | 1573 | }
|
1574 | 1574 | else if (HIWORD(wParam) == CBN_SELCHANGE)
|
1575 | 1575 | {
|
1576 | | - Get1stScaleCombo(hWnd, IDC_PRESCALESIZE, &cfg->firstscalex, &cfg->firstscaley,
|
| 1576 | + GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->firstscalex, &cfg->firstscaley,
|
1577 | 1577 | &cfgmask->firstscalex, &cfgmask->firstscaley);
|
1578 | 1578 | EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
|
1579 | 1579 | *dirty = TRUE;
|
Index: dxglcfg2/dxglcfg2.rc |
— | — | @@ -38,10 +38,14 @@ |
39 | 39 | COMBOBOX IDC_VIDMODE, 7, 17, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
40 | 40 | LTEXT "Add color depths", IDC_STATIC, 114, 7, 54, 8, SS_LEFT, WS_EX_LEFT
|
41 | 41 | COMBOBOX IDC_COLORDEPTH, 114, 17, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
42 | | - LTEXT "Scaling method (final pass)", IDC_STATIC, 7, 57, 85, 9, SS_LEFT, WS_EX_LEFT
|
43 | | - COMBOBOX IDC_SCALE, 7, 67, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
44 | | - LTEXT "Additional display modes", 0, 114, 57, 78, 8, SS_LEFT, WS_EX_LEFT
|
45 | | - COMBOBOX IDC_EXTRAMODES, 114, 67, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED, WS_EX_LEFT
|
| 42 | + LTEXT "Scaling method", IDC_STATIC, 7, 32, 49, 9, SS_LEFT, WS_EX_LEFT
|
| 43 | + COMBOBOX IDC_SCALE, 7, 43, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
| 44 | + LTEXT "Additional display modes", IDC_STATIC, 114, 32, 78, 8, SS_LEFT, WS_EX_LEFT
|
| 45 | + COMBOBOX IDC_EXTRAMODES, 114, 43, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED, WS_EX_LEFT
|
| 46 | + LTEXT "Postprocess scaler", IDC_STATIC, 7, 57, 60, 9, SS_LEFT, WS_EX_LEFT
|
| 47 | + COMBOBOX IDC_POSTSCALE, 7, 67, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
| 48 | + LTEXT "Postprocess input miultiplier", 0, 114, 57, 86, 9, SS_LEFT, WS_EX_LEFT
|
| 49 | + COMBOBOX IDC_POSTSCALESIZE, 114, 67, 102, 30, CBS_DROPDOWN | CBS_HASSTRINGS, WS_EX_LEFT
|
46 | 50 | LTEXT "Fixed scaling", IDC_FIXEDSCALELABEL, 113, 133, 47, 9, WS_DISABLED | SS_LEFT, WS_EX_LEFT
|
47 | 51 | LTEXT "X", IDC_FIXEDSCALELABELX, 113, 146, 8, 9, WS_DISABLED | SS_LEFT, WS_EX_LEFT
|
48 | 52 | EDITTEXT IDC_FIXEDSCALEX, 121, 143, 24, 14, ES_AUTOHSCROLL, WS_EX_LEFT
|
— | — | @@ -59,10 +63,6 @@ |
60 | 64 | AUTOCHECKBOX "Change display color depth", IDC_COLOR, 9, 158, 100, 10, 0, WS_EX_LEFT
|
61 | 65 | LTEXT "Fullscreen window mode", IDC_STATIC, 7, 132, 78, 9, SS_LEFT, WS_EX_LEFT
|
62 | 66 | COMBOBOX IDC_FULLMODE, 8, 143, 101, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
63 | | - LTEXT "Scaling method (1st pass)", IDC_STATIC, 7, 32, 83, 9, SS_LEFT, WS_EX_LEFT
|
64 | | - COMBOBOX IDC_PRESCALE, 7, 43, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
|
65 | | - LTEXT "1st pass scale size", 0, 114, 32, 60, 9, SS_LEFT, WS_EX_LEFT
|
66 | | - COMBOBOX IDC_PRESCALESIZE, 114, 43, 102, 30, CBS_DROPDOWN | CBS_HASSTRINGS, WS_EX_LEFT
|
67 | 67 | }
|
68 | 68 |
|
69 | 69 |
|
Index: dxglcfg2/resource.h |
— | — | @@ -72,5 +72,5 @@ |
73 | 73 | #define IDC_FIXEDSCALESQUARE 1039
|
74 | 74 | #define IDC_LOWCOLORRENDER 1040
|
75 | 75 | #define IDC_FULLMODE 1041
|
76 | | -#define IDC_PRESCALE 1042
|
77 | | -#define IDC_PRESCALESIZE 1043
|
| 76 | +#define IDC_POSTSCALE 1042
|
| 77 | +#define IDC_POSTSCALESIZE 1043
|