DXGL r719 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:< r718‎ | r719 | r720 >
Date:04:27, 9 July 2017
Author:admin
Status:new
Tags:
Comment:
Rename postprocess scaling option in DXGL Config.
Move output scaling to above postprocess scaling.
Modified paths:
  • /dxglcfg/dxglcfg.c (modified) (history)
  • /dxglcfg/dxglcfg.rc (modified) (history)
  • /dxglcfg/resource.h (modified) (history)
  • /dxglcfg2/dxglcfg2.c (modified) (history)
  • /dxglcfg2/dxglcfg2.rc (modified) (history)
  • /dxglcfg2/resource.h (modified) (history)

Diff [purge]

Index: dxglcfg/dxglcfg.c
——@@ -358,7 +358,7 @@
359359 }
360360 }
361361
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)
363363 {
364364 TCHAR buffer[32];
365365 if (tristate && !maskx && !masky)
——@@ -431,7 +431,7 @@
432432 }
433433 }
434434
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)
436436 {
437437 TCHAR buffer[32];
438438 TCHAR *ptr;
——@@ -676,24 +676,24 @@
677677 else SendDlgItemMessage(hWnd,IDC_COLOR,BM_SETCHECK,BST_UNCHECKED,0);
678678 // first scaling filter
679679 _tcscpy(buffer, _T("Nearest"));
680 - SendDlgItemMessage(hWnd, IDC_PRESCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
 680+ SendDlgItemMessage(hWnd, IDC_POSTSCALE, CB_ADDSTRING, 0, (LPARAM)buffer);
681681 _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);
684684 // first scaling sizes
685685 _tcscpy(buffer, _T("Auto"));
686 - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
 686+ SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
687687 _tcscpy(buffer, _T("1x"));
688 - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
 688+ SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
689689 _tcscpy(buffer, _T("2x1"));
690 - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
 690+ SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
691691 _tcscpy(buffer, _T("2x"));
692 - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
 692+ SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
693693 _tcscpy(buffer, _T("3x"));
694 - SendDlgItemMessage(hWnd, IDC_PRESCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
 694+ SendDlgItemMessage(hWnd, IDC_POSTSCALESIZE, CB_ADDSTRING, 0, (LPARAM)buffer);
695695 _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,
698698 cfgmask->postsizex, cfgmask->postsizey, tristate);
699699 // final scaling filter
700700 _tcscpy(buffer,_T("Nearest"));
——@@ -1124,8 +1124,8 @@
11251125 tristate = TRUE;
11261126 SendDlgItemMessage(hWnd,IDC_VIDMODE,CB_ADDSTRING,0,(LPARAM)strdefault);
11271127 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);
11301130 SendDlgItemMessage(hWnd,IDC_SCALE,CB_ADDSTRING,0,(LPARAM)strdefault);
11311131 //SendDlgItemMessage(hWnd,IDC_VSYNC,CB_ADDSTRING,0,(LPARAM)strdefault);
11321132 SendDlgItemMessage(hWnd, IDC_FULLMODE, CB_ADDSTRING, 0, (LPARAM)strdefault);
——@@ -1149,10 +1149,10 @@
11501150 SendDlgItemMessage(hWnd,IDC_VIDMODE,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
11511151 SendDlgItemMessage(hWnd,IDC_SORTMODES,CB_DELETESTRING,
11521152 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);
11571157 SendDlgItemMessage(hWnd,IDC_SCALE,CB_DELETESTRING,
11581158 SendDlgItemMessage(hWnd,IDC_SCALE,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
11591159 /* SendDlgItemMessage(hWnd,IDC_VSYNC,CB_DELETESTRING,
——@@ -1183,7 +1183,7 @@
11841184 // Read settings into controls
11851185 SetCombo(hWnd,IDC_VIDMODE,cfg->scaler,cfgmask->scaler,tristate);
11861186 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);
11881188 SetCombo(hWnd,IDC_SCALE,cfg->scalingfilter,cfgmask->scalingfilter,tristate);
11891189 //SetCombo(hWnd,IDC_VSYNC,cfg->vsync,cfgmask->vsync,tristate);
11901190 SetCombo(hWnd,IDC_FULLMODE,cfg->fullmode,cfgmask->fullmode,tristate);
——@@ -1198,7 +1198,7 @@
11991199 SetCombo(hWnd,IDC_TEXUPLOAD,cfg->TexUpload,cfgmask->TexUpload,tristate);
12001200 SetCheck(hWnd,IDC_EXTRAMODES,cfg->AddModes,cfgmask->AddModes,tristate);
12011201 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,
12031203 cfgmask->postsizex, cfgmask->postsizey, tristate);
12041204 SetAspectCombo(hWnd, IDC_ASPECT, cfg->aspect, cfgmask->aspect, tristate);
12051205 }
——@@ -1213,8 +1213,8 @@
12141214 EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
12151215 *dirty = TRUE;
12161216 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);
12191219 EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
12201220 *dirty = TRUE;
12211221 break;
——@@ -1288,12 +1288,12 @@
12891289 EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
12901290 *dirty = TRUE;
12911291 break;
1292 - case IDC_PRESCALESIZE:
 1292+ case IDC_POSTSCALESIZE:
12931293 if (HIWORD(wParam) == CBN_KILLFOCUS)
12941294 {
1295 - Get1stScaleCombo(hWnd, IDC_PRESCALESIZE, &cfg->postsizex, &cfg->postsizey,
 1295+ GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->postsizex, &cfg->postsizey,
12961296 &cfgmask->postsizex, &cfgmask->postsizey);
1297 - Set1stScaleCombo(hWnd, IDC_PRESCALESIZE, cfg->postsizex, cfg->postsizey,
 1297+ SetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, cfg->postsizex, cfg->postsizey,
12981298 cfgmask->postsizex, cfgmask->postsizey, tristate);
12991299 EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
13001300 *dirty = TRUE;
——@@ -1300,7 +1300,7 @@
13011301 }
13021302 else if (HIWORD(wParam) == CBN_SELCHANGE)
13031303 {
1304 - Get1stScaleCombo(hWnd, IDC_PRESCALESIZE, &cfg->postsizex, &cfg->postsizey,
 1304+ GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->postsizex, &cfg->postsizey,
13051305 &cfgmask->postsizex, &cfgmask->postsizey);
13061306 EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
13071307 *dirty = TRUE;
Index: dxglcfg/dxglcfg.rc
——@@ -45,17 +45,17 @@
4646 LTEXT "Video mode", IDC_STATIC, 195, 14, 38, 8, SS_LEFT, WS_EX_LEFT
4747 COMBOBOX IDC_VIDMODE, 195, 24, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
4848 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
5757 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
5859 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
6060 COMBOBOX IDC_DPISCALE, 299, 126, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
6161 LTEXT "Texture filter", IDC_STATIC, 195, 141, 43, 8, SS_LEFT, WS_EX_LEFT
6262 COMBOBOX IDC_TEXFILTER, 195, 151, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
Index: dxglcfg/resource.h
——@@ -34,8 +34,8 @@
3535 #define IDC_VIDMODE 1041
3636 #define IDC_SCALE 1042
3737 #define IDC_FULLMODE 1043
38 -#define IDC_PRESCALESIZE 1044
39 -#define IDC_PRESCALE 1045
 38+#define IDC_POSTSCALESIZE 1044
 39+#define IDC_POSTSCALE 1045
4040 #define IDC_TEXFILTER 1046
4141 #define IDC_ANISO 1047
4242 #define IDC_MSAA 1048
Index: dxglcfg2/dxglcfg2.c
——@@ -430,7 +430,7 @@
431431 }
432432 }
433433
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)
435435 {
436436 TCHAR buffer[32];
437437 if (tristate && !maskx && !masky)
——@@ -485,7 +485,7 @@
486486 }
487487 }
488488
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)
490490 {
491491 TCHAR buffer[32];
492492 TCHAR *ptr;
——@@ -908,24 +908,24 @@
909909 else SendDlgItemMessage(hTabs[0], IDC_COLOR, BM_SETCHECK, BST_UNCHECKED, 0);
910910 // first scaling filter
911911 _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);
913913 _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);
916916 // first scaling sizes
917917 _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);
919919 _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);
921921 _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);
923923 _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);
925925 _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);
927927 _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,
930930 cfgmask->postsizex, cfgmask->postsizey, tristate);
931931 // final scaling filter
932932 _tcscpy(buffer,_T("Nearest"));
——@@ -1404,8 +1404,8 @@
14051405 tristate = TRUE;
14061406 SendDlgItemMessage(hWnd,IDC_VIDMODE,CB_ADDSTRING,0,(LPARAM)strdefault);
14071407 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);
14101410 SendDlgItemMessage(hWnd,IDC_SCALE,CB_ADDSTRING,0,(LPARAM)strdefault);
14111411 SendDlgItemMessage(hWnd,IDC_VSYNC,CB_ADDSTRING,0,(LPARAM)strdefault);
14121412 SendDlgItemMessage(hWnd,IDC_MSAA,CB_ADDSTRING,0,(LPARAM)strdefault);
——@@ -1428,10 +1428,10 @@
14291429 SendDlgItemMessage(hWnd,IDC_VIDMODE,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
14301430 SendDlgItemMessage(hWnd,IDC_SORTMODES,CB_DELETESTRING,
14311431 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);
14361436 SendDlgItemMessage(hWnd,IDC_SCALE,CB_DELETESTRING,
14371437 SendDlgItemMessage(hWnd,IDC_SCALE,CB_FINDSTRING,-1,(LPARAM)strdefault),0);
14381438 SendDlgItemMessage(hWnd,IDC_VSYNC,CB_DELETESTRING,
——@@ -1460,7 +1460,7 @@
14611461 // Read settings into controls
14621462 SetCombo(hWnd,IDC_VIDMODE,cfg->scaler,cfgmask->scaler,tristate);
14631463 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);
14651465 SetCombo(hWnd,IDC_SCALE,cfg->scalingfilter,cfgmask->scalingfilter,tristate);
14661466 SetCombo(hWnd,IDC_VSYNC,cfg->vsync,cfgmask->vsync,tristate);
14671467 SetCombo(hWnd,IDC_MSAA,cfg->msaa,cfgmask->msaa,tristate);
——@@ -1475,7 +1475,7 @@
14761476 SetCheck(hWnd,IDC_EXTRAMODES,cfg->ExtraModes,cfgmask->ExtraModes,tristate);
14771477 SetText(hWnd,IDC_SHADER,cfg->shaderfile,cfgmask->shaderfile,tristate);
14781478 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,
14801480 cfgmask->firstscalex, cfgmask->firstscaley, tristate);
14811481 SetAspectCombo(hWnd, IDC_ASPECT, cfg->aspect, cfgmask->aspect, tristate);*/
14821482 }
——@@ -1490,8 +1490,8 @@
14911491 EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
14921492 *dirty = TRUE;
14931493 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);
14961496 EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
14971497 *dirty = TRUE;
14981498 break;
——@@ -1560,12 +1560,12 @@
15611561 EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
15621562 *dirty = TRUE;
15631563 break;
1564 - case IDC_PRESCALESIZE:
 1564+ case IDC_POSTSCALESIZE:
15651565 if (HIWORD(wParam) == CBN_KILLFOCUS)
15661566 {
1567 - Get1stScaleCombo(hWnd, IDC_PRESCALESIZE, &cfg->firstscalex, &cfg->firstscaley,
 1567+ GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->firstscalex, &cfg->firstscaley,
15681568 &cfgmask->firstscalex, &cfgmask->firstscaley);
1569 - Set1stScaleCombo(hWnd, IDC_PRESCALESIZE, cfg->firstscalex, cfg->firstscaley,
 1569+ SetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, cfg->firstscalex, cfg->firstscaley,
15701570 cfgmask->firstscalex, cfgmask->firstscaley, tristate);
15711571 EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
15721572 *dirty = TRUE;
——@@ -1572,7 +1572,7 @@
15731573 }
15741574 else if (HIWORD(wParam) == CBN_SELCHANGE)
15751575 {
1576 - Get1stScaleCombo(hWnd, IDC_PRESCALESIZE, &cfg->firstscalex, &cfg->firstscaley,
 1576+ GetPostScaleCombo(hWnd, IDC_POSTSCALESIZE, &cfg->firstscalex, &cfg->firstscaley,
15771577 &cfgmask->firstscalex, &cfgmask->firstscaley);
15781578 EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
15791579 *dirty = TRUE;
Index: dxglcfg2/dxglcfg2.rc
——@@ -38,10 +38,14 @@
3939 COMBOBOX IDC_VIDMODE, 7, 17, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_LEFT
4040 LTEXT "Add color depths", IDC_STATIC, 114, 7, 54, 8, SS_LEFT, WS_EX_LEFT
4141 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
4650 LTEXT "Fixed scaling", IDC_FIXEDSCALELABEL, 113, 133, 47, 9, WS_DISABLED | SS_LEFT, WS_EX_LEFT
4751 LTEXT "X", IDC_FIXEDSCALELABELX, 113, 146, 8, 9, WS_DISABLED | SS_LEFT, WS_EX_LEFT
4852 EDITTEXT IDC_FIXEDSCALEX, 121, 143, 24, 14, ES_AUTOHSCROLL, WS_EX_LEFT
——@@ -59,10 +63,6 @@
6064 AUTOCHECKBOX "Change display color depth", IDC_COLOR, 9, 158, 100, 10, 0, WS_EX_LEFT
6165 LTEXT "Fullscreen window mode", IDC_STATIC, 7, 132, 78, 9, SS_LEFT, WS_EX_LEFT
6266 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
6767 }
6868
6969
Index: dxglcfg2/resource.h
——@@ -72,5 +72,5 @@
7373 #define IDC_FIXEDSCALESQUARE 1039
7474 #define IDC_LOWCOLORRENDER 1040
7575 #define IDC_FULLMODE 1041
76 -#define IDC_PRESCALE 1042
77 -#define IDC_PRESCALESIZE 1043
 76+#define IDC_POSTSCALE 1042
 77+#define IDC_POSTSCALESIZE 1043
Retrieved from "https://dxgl.org/wiki/Special:Code/DXGL/719"