DXGL r752 - Code Review

Repository:	DXGL
Revision:	< r751‎ \| r752 \| r753 >
Date:	05:23, 8 October 2017
Author:	admin
Status:	new
Tags:
Comment:	Adjust new DXGL Config dialogs to match DXGL Test tabs. Swap two tabs in new DXGL Config. Sort and re-number dialog controls.
Modified paths:	/dxglcfg2/dxglcfg2.c (modified) (history) /dxglcfg2/dxglcfg2.rc (modified) (history) /dxglcfg2/resource.h (modified) (history) /dxgltest/Resource.h (modified) (history) /dxgltest/dxgltest.cpp (modified) (history) /dxgltest/dxgltest.rc (modified) (history)

Diff [purge]

Index: dxglcfg2/dxglcfg2.c
—	—	@@ -972,9 +972,9 @@
973	973	tab.mask = TCIF_TEXT;
974	974	tab.pszText = _T("Display");
975	975	SendDlgItemMessage(hWnd, IDC_TABS, TCM_INSERTITEM, 0, (LPARAM)&tab);
	976	+ tab.pszText = _T("Effects");
	977	+ SendDlgItemMessage(hWnd, IDC_TABS, TCM_INSERTITEM, 1, (LPARAM)&tab);
976	978	tab.pszText = _T("3D Graphics");
977		~~- SendDlgItemMessage(hWnd, IDC_TABS, TCM_INSERTITEM, 1, (LPARAM)&tab);~~
978		~~- tab.pszText = _T("Effects");~~
979	979	SendDlgItemMessage(hWnd, IDC_TABS, TCM_INSERTITEM, 2, (LPARAM)&tab);
980	980	tab.pszText = _T("Advanced");
981	981	SendDlgItemMessage(hWnd, IDC_TABS, TCM_INSERTITEM, 3, (LPARAM)&tab);
—	—	@@ -982,8 +982,8 @@
983	983	SendDlgItemMessage(hWnd, IDC_TABS, TCM_INSERTITEM, 4, (LPARAM)&tab);
984	984	hTab = GetDlgItem(hWnd, IDC_TABS);
985	985	hTabs[0] = CreateDialog(hinstance, MAKEINTRESOURCE(IDD_DISPLAY), hTab, DisplayTabCallback);
986		~~- hTabs[1] = CreateDialog(hinstance, MAKEINTRESOURCE(IDD_3DGRAPHICS), hTab, Tab3DCallback);~~
987		~~- hTabs[2] = CreateDialog(hinstance, MAKEINTRESOURCE(IDD_EFFECTS), hTab, EffectsTabCallback);~~
	986	+ hTabs[1] = CreateDialog(hinstance, MAKEINTRESOURCE(IDD_EFFECTS), hTab, EffectsTabCallback);
	987	+ hTabs[2] = CreateDialog(hinstance, MAKEINTRESOURCE(IDD_3DGRAPHICS), hTab, Tab3DCallback);
988	988	hTabs[3] = CreateDialog(hinstance, MAKEINTRESOURCE(IDD_ADVANCED), hTab, AdvancedTabCallback);
989	989	hTabs[4] = CreateDialog(hinstance, MAKEINTRESOURCE(IDD_DEBUG), hTab, DebugTabCallback);
990	990	SendDlgItemMessage(hWnd, IDC_TABS, TCM_GETITEMRECT, 0, (LPARAM)&r);
—	—	@@ -1092,69 +1092,69 @@
1093	1093	SetPrimaryScaleCombo(hTabs[2], IDC_PRIMARYSCALE, cfg->primaryscale, cfgmask->primaryscale, tristate);
1094	1094	// texfilter
1095	1095	_tcscpy(buffer,_T("Application default"));
1096		~~- SendDlgItemMessage(hTabs[1], IDC_TEXFILTER, CB_ADDSTRING, 0, (LPARAM)buffer);~~
	1096	+ SendDlgItemMessage(hTabs[2], IDC_TEXFILTER, CB_ADDSTRING, 0, (LPARAM)buffer);
1097	1097	_tcscpy(buffer,_T("Nearest"));
1098		~~- SendDlgItemMessage(hTabs[1], IDC_TEXFILTER, CB_ADDSTRING, 1, (LPARAM)buffer);~~
	1098	+ SendDlgItemMessage(hTabs[2], IDC_TEXFILTER, CB_ADDSTRING, 1, (LPARAM)buffer);
1099	1099	_tcscpy(buffer,_T("Bilinear"));
1100		~~- SendDlgItemMessage(hTabs[1], IDC_TEXFILTER, CB_ADDSTRING, 2, (LPARAM)buffer);~~
	1100	+ SendDlgItemMessage(hTabs[2], IDC_TEXFILTER, CB_ADDSTRING, 2, (LPARAM)buffer);
1101	1101	_tcscpy(buffer,_T("Nearest, nearest mipmap"));
1102		~~- SendDlgItemMessage(hTabs[1], IDC_TEXFILTER, CB_ADDSTRING, 3, (LPARAM)buffer);~~
	1102	+ SendDlgItemMessage(hTabs[2], IDC_TEXFILTER, CB_ADDSTRING, 3, (LPARAM)buffer);
1103	1103	_tcscpy(buffer,_T("Nearest, linear mipmap"));
1104		~~- SendDlgItemMessage(hTabs[1], IDC_TEXFILTER, CB_ADDSTRING, 4, (LPARAM)buffer);~~
	1104	+ SendDlgItemMessage(hTabs[2], IDC_TEXFILTER, CB_ADDSTRING, 4, (LPARAM)buffer);
1105	1105	_tcscpy(buffer,_T("Bilinear, nearest mipmap"));
1106		~~- SendDlgItemMessage(hTabs[1], IDC_TEXFILTER, CB_ADDSTRING, 5, (LPARAM)buffer);~~
	1106	+ SendDlgItemMessage(hTabs[2], IDC_TEXFILTER, CB_ADDSTRING, 5, (LPARAM)buffer);
1107	1107	_tcscpy(buffer,_T("Bilinear, linear mipmap"));
1108		~~- SendDlgItemMessage(hTabs[1],IDC_TEXFILTER,CB_ADDSTRING,6,(LPARAM)buffer);~~
1109		~~- SendDlgItemMessage(hTabs[1],IDC_TEXFILTER,CB_SETCURSEL,cfg->texfilter,0);~~
	1108	+ SendDlgItemMessage(hTabs[2],IDC_TEXFILTER,CB_ADDSTRING,6,(LPARAM)buffer);
	1109	+ SendDlgItemMessage(hTabs[2],IDC_TEXFILTER,CB_SETCURSEL,cfg->texfilter,0);
1110	1110	// anisotropic
1111	1111	if (anisotropic < 2)
1112	1112	{
1113	1113	_tcscpy(buffer,_T("Not supported"));
1114		~~- SendDlgItemMessage(hTabs[1], IDC_ANISO, CB_ADDSTRING, 0, (LPARAM)buffer);~~
1115		~~- SendDlgItemMessage(hTabs[1], IDC_ANISO, CB_SETCURSEL, 0, 0);~~
1116		~~- EnableWindow(GetDlgItem(hTabs[1], IDC_ANISO), FALSE);~~
	1114	+ SendDlgItemMessage(hTabs[2], IDC_ANISO, CB_ADDSTRING, 0, (LPARAM)buffer);
	1115	+ SendDlgItemMessage(hTabs[2], IDC_ANISO, CB_SETCURSEL, 0, 0);
	1116	+ EnableWindow(GetDlgItem(hTabs[2], IDC_ANISO), FALSE);
1117	1117	cfg->anisotropic = 0;
1118	1118	}
1119	1119	else
1120	1120	{
1121	1121	_tcscpy(buffer,_T("Application default"));
1122		~~- SendDlgItemMessage(hTabs[1], IDC_ANISO, CB_ADDSTRING, 0, (LPARAM)buffer);~~
	1122	+ SendDlgItemMessage(hTabs[2], IDC_ANISO, CB_ADDSTRING, 0, (LPARAM)buffer);
1123	1123	_tcscpy(buffer,_T("Disabled"));
1124		~~- SendDlgItemMessage(hTabs[1], IDC_ANISO, CB_ADDSTRING, 1, (LPARAM)buffer);~~
	1124	+ SendDlgItemMessage(hTabs[2], IDC_ANISO, CB_ADDSTRING, 1, (LPARAM)buffer);
1125	1125	if(anisotropic >= 2)
1126	1126	{
1127	1127	_tcscpy(buffer,_T("2x"));
1128		~~- SendDlgItemMessage(hTabs[1], IDC_ANISO, CB_ADDSTRING, 2, (LPARAM)buffer);~~
	1128	+ SendDlgItemMessage(hTabs[2], IDC_ANISO, CB_ADDSTRING, 2, (LPARAM)buffer);
1129	1129	}
1130	1130	if(anisotropic >= 4)
1131	1131	{
1132	1132	_tcscpy(buffer,_T("4x"));
1133		~~- SendDlgItemMessage(hTabs[1], IDC_ANISO, CB_ADDSTRING, 4, (LPARAM)buffer);~~
	1133	+ SendDlgItemMessage(hTabs[2], IDC_ANISO, CB_ADDSTRING, 4, (LPARAM)buffer);
1134	1134	}
1135	1135	if(anisotropic >= 8)
1136	1136	{
1137	1137	_tcscpy(buffer,_T("8x"));
1138		~~- SendDlgItemMessage(hTabs[1], IDC_ANISO, CB_ADDSTRING, 8, (LPARAM)buffer);~~
	1138	+ SendDlgItemMessage(hTabs[2], IDC_ANISO, CB_ADDSTRING, 8, (LPARAM)buffer);
1139	1139	}
1140	1140	if(anisotropic >= 16)
1141	1141	{
1142	1142	_tcscpy(buffer,_T("16x"));
1143		~~- SendDlgItemMessage(hTabs[1], IDC_ANISO, CB_ADDSTRING, 16, (LPARAM)buffer);~~
	1143	+ SendDlgItemMessage(hTabs[2], IDC_ANISO, CB_ADDSTRING, 16, (LPARAM)buffer);
1144	1144	}
1145	1145	if(anisotropic >= 32)
1146	1146	{
1147	1147	_tcscpy(buffer,_T("32x"));
1148		~~- SendDlgItemMessage(hTabs[1], IDC_ANISO, CB_ADDSTRING, 4, (LPARAM)buffer);~~
	1148	+ SendDlgItemMessage(hTabs[2], IDC_ANISO, CB_ADDSTRING, 4, (LPARAM)buffer);
1149	1149	}
1150		~~- SendDlgItemMessage(hTabs[1], IDC_ANISO, CB_SETCURSEL, cfg->anisotropic, 0);~~
	1150	+ SendDlgItemMessage(hTabs[2], IDC_ANISO, CB_SETCURSEL, cfg->anisotropic, 0);
1151	1151	}
1152	1152	// msaa
1153	1153	if(msaa)
1154	1154	{
1155	1155	_tcscpy(buffer,_T("Application default"));
1156		~~- SendDlgItemMessage(hTabs[1], IDC_MSAA, CB_ADDSTRING, 0, (LPARAM)buffer);~~
	1156	+ SendDlgItemMessage(hTabs[2], IDC_MSAA, CB_ADDSTRING, 0, (LPARAM)buffer);
1157	1157	_tcscpy(buffer,_T("Disabled"));
1158		~~- SendDlgItemMessage(hTabs[1], IDC_MSAA, CB_ADDSTRING, 1, (LPARAM)buffer);~~
	1158	+ SendDlgItemMessage(hTabs[2], IDC_MSAA, CB_ADDSTRING, 1, (LPARAM)buffer);
1159	1159	if(maxcoverage)
1160	1160	{
1161	1161	for(i = 0; i < maxcoverage; i++)
—	—	@@ -1162,7 +1162,7 @@
1163	1163	if((msaamodes[i] & 0xfff) <= 4)
1164	1164	_sntprintf(buffer,64,_T("%dx"),msaamodes[i] & 0xfff);
1165	1165	else _sntprintf(buffer,64,_T("%dx coverage, %dx color"),(msaamodes[i] & 0xfff), (msaamodes[i] >> 12));
1166		~~- SendDlgItemMessage(hTabs[1], IDC_MSAA, CB_ADDSTRING, msaamodes[i], (LPARAM)buffer);~~
	1166	+ SendDlgItemMessage(hTabs[2], IDC_MSAA, CB_ADDSTRING, msaamodes[i], (LPARAM)buffer);
1167	1167	}
1168	1168	}
1169	1169	else
—	—	@@ -1170,47 +1170,47 @@
1171	1171	if(maxsamples >= 2)
1172	1172	{
1173	1173	_tcscpy(buffer,_T("2x"));
1174		~~- SendDlgItemMessage(hTabs[1], IDC_MSAA, CB_ADDSTRING, 2, (LPARAM)buffer);~~
	1174	+ SendDlgItemMessage(hTabs[2], IDC_MSAA, CB_ADDSTRING, 2, (LPARAM)buffer);
1175	1175	}
1176	1176	if(maxsamples >= 4)
1177	1177	{
1178	1178	_tcscpy(buffer,_T("4x"));
1179		~~- SendDlgItemMessage(hTabs[1], IDC_MSAA, CB_ADDSTRING, 4, (LPARAM)buffer);~~
	1179	+ SendDlgItemMessage(hTabs[2], IDC_MSAA, CB_ADDSTRING, 4, (LPARAM)buffer);
1180	1180	}
1181	1181	if(maxsamples >= 8)
1182	1182	{
1183	1183	_tcscpy(buffer,_T("8x"));
1184		~~- SendDlgItemMessage(hTabs[1], IDC_MSAA, CB_ADDSTRING, 8, (LPARAM)buffer);~~
	1184	+ SendDlgItemMessage(hTabs[2], IDC_MSAA, CB_ADDSTRING, 8, (LPARAM)buffer);
1185	1185	}
1186	1186	if(maxsamples >= 16)
1187	1187	{
1188	1188	_tcscpy(buffer,_T("16x"));
1189		~~- SendDlgItemMessage(hTabs[1], IDC_MSAA, CB_ADDSTRING, 16, (LPARAM)buffer);~~
	1189	+ SendDlgItemMessage(hTabs[2], IDC_MSAA, CB_ADDSTRING, 16, (LPARAM)buffer);
1190	1190	}
1191	1191	if(maxsamples >= 32)
1192	1192	{
1193	1193	_tcscpy(buffer,_T("32x"));
1194		~~- SendDlgItemMessage(hTabs[1], IDC_MSAA, CB_ADDSTRING, 32, (LPARAM)buffer);~~
	1194	+ SendDlgItemMessage(hTabs[2], IDC_MSAA, CB_ADDSTRING, 32, (LPARAM)buffer);
1195	1195	}
1196	1196	}
1197		~~- SendDlgItemMessage(hTabs[1], IDC_MSAA, CB_SETCURSEL, cfg->msaa, 0);~~
	1197	+ SendDlgItemMessage(hTabs[2], IDC_MSAA, CB_SETCURSEL, cfg->msaa, 0);
1198	1198	}
1199	1199	else
1200	1200	{
1201	1201	_tcscpy(buffer,_T("Not supported"));
1202		~~- SendDlgItemMessage(hTabs[1], IDC_MSAA, CB_ADDSTRING, 0, (LPARAM)buffer);~~
1203		~~- SendDlgItemMessage(hTabs[1], IDC_MSAA, CB_SETCURSEL, 0, 0);~~
1204		~~- EnableWindow(GetDlgItem(hTabs[1], IDC_MSAA), FALSE);~~
	1202	+ SendDlgItemMessage(hTabs[2], IDC_MSAA, CB_ADDSTRING, 0, (LPARAM)buffer);
	1203	+ SendDlgItemMessage(hTabs[2], IDC_MSAA, CB_SETCURSEL, 0, 0);
	1204	+ EnableWindow(GetDlgItem(hTabs[2], IDC_MSAA), FALSE);
1205	1205	cfg->msaa = 0;
1206	1206	}
1207	1207	// aspect3d
1208	1208	_tcscpy(buffer,_T("Stretch to display"));
1209		~~- SendDlgItemMessage(hTabs[1], IDC_ASPECT3D, CB_ADDSTRING, 0, (LPARAM)buffer);~~
	1209	+ SendDlgItemMessage(hTabs[2], IDC_ASPECT3D, CB_ADDSTRING, 0, (LPARAM)buffer);
1210	1210	_tcscpy(buffer,_T("Expand viewable area"));
1211		~~- SendDlgItemMessage(hTabs[1], IDC_ASPECT3D, CB_ADDSTRING, 1, (LPARAM)buffer);~~
	1211	+ SendDlgItemMessage(hTabs[2], IDC_ASPECT3D, CB_ADDSTRING, 1, (LPARAM)buffer);
1212	1212	_tcscpy(buffer,_T("Crop to display"));
1213		~~- SendDlgItemMessage(hTabs[1],IDC_ASPECT3D,CB_ADDSTRING,2,(LPARAM)buffer);~~
1214		~~- SendDlgItemMessage(hTabs[1],IDC_ASPECT3D,CB_SETCURSEL,cfg->aspect3d,0);~~
	1213	+ SendDlgItemMessage(hTabs[2],IDC_ASPECT3D,CB_ADDSTRING,2,(LPARAM)buffer);
	1214	+ SendDlgItemMessage(hTabs[2],IDC_ASPECT3D,CB_SETCURSEL,cfg->aspect3d,0);
1215	1215	// sort modes
1216	1216	_tcscpy(buffer,_T("Use system order"));
1217	1217	SendDlgItemMessage(hTabs[0], IDC_SORTMODES, CB_ADDSTRING, 0, (LPARAM)buffer);
—	—	@@ -1242,10 +1242,10 @@
1243	1243	SendDlgItemMessage(hTabs[0], IDC_EXTRAMODES, CB_ADDSTRING, 6, (LPARAM)buffer);
1244	1244	//FIXME: Populate extra resolution combobox
1245	1245	// Enable shader
1246		~~- if (cfg->colormode) SendDlgItemMessage(hTabs[2], IDC_USESHADER, BM_SETCHECK, BST_CHECKED, 0);~~
1247		~~- else SendDlgItemMessage(hTabs[2], IDC_USESHADER, BM_SETCHECK, BST_UNCHECKED, 0);~~
	1246	+ if (cfg->colormode) SendDlgItemMessage(hTabs[1], IDC_USESHADER, BM_SETCHECK, BST_CHECKED, 0);
	1247	+ else SendDlgItemMessage(hTabs[1], IDC_USESHADER, BM_SETCHECK, BST_UNCHECKED, 0);
1248	1248	// shader path
1249		~~- SetText(hTabs[2],IDC_SHADER,cfg->shaderfile,cfgmask->shaderfile,FALSE);~~
	1249	+ SetText(hTabs[1],IDC_SHADER,cfg->shaderfile,cfgmask->shaderfile,FALSE);
1250	1250	// texture format
1251	1251	_tcscpy(buffer,_T("Automatic"));
1252	1252	SendDlgItemMessage(hTabs[3],IDC_TEXTUREFORMAT,CB_ADDSTRING,0,(LPARAM)buffer);
Index: dxglcfg2/dxglcfg2.rc
—	—	@@ -30,7 +30,25 @@
31	31	// Dialog resources
32	32	//
33	33	LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
34		~~-IDD_DISPLAY DIALOG 0, 0, 283, 173~~
	34	+IDD_DXGLCFG DIALOG 0, 0, 354, 242
	35	+STYLE DS_3DLOOK \| DS_CONTEXTHELP \| DS_SETFONT \| WS_CAPTION \| WS_SYSMENU
	36	+CAPTION "DXGL Config (Experimental)"
	37	+FONT 8, "Ms Shell Dlg 2"
	38	+{
	39	+ LTEXT "Application profile", IDC_STATIC, 7, 7, 58, 8, SS_LEFT, WS_EX_LEFT
	40	+ COMBOBOX IDC_APPS, 7, 17, 287, 195, WS_TABSTOP \| WS_VSCROLL \| CBS_DROPDOWNLIST \| CBS_OWNERDRAWFIXED \| 0x00000400, WS_EX_LEFT
	41	+ CONTROL "", IDC_TABS, WC_TABCONTROL, 0, 7, 35, 344, 185, WS_EX_LEFT
	42	+ PUSHBUTTON "A&dd...", IDC_ADD, 7, 223, 50, 14, 0, WS_EX_LEFT
	43	+ PUSHBUTTON "&Remove", IDC_REMOVE, 59, 223, 50, 14, WS_DISABLED, WS_EX_LEFT
	44	+ DEFPUSHBUTTON "OK", IDOK, 140, 223, 50, 14, 0, WS_EX_LEFT
	45	+ PUSHBUTTON "Cancel", IDCANCEL, 192, 223, 50, 14, 0, WS_EX_LEFT
	46	+ PUSHBUTTON "&Apply", IDC_APPLY, 244, 223, 50, 14, WS_DISABLED, WS_EX_LEFT
	47	+}
	48	+
	49	+
	50	+
	51	+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
	52	+IDD_DISPLAY DIALOG 0, 0, 340, 169
35	53	STYLE DS_3DLOOK \| DS_CENTER \| DS_SHELLFONT \| WS_VISIBLE \| WS_CHILDWINDOW
36	54	FONT 8, "Ms Shell Dlg"
37	55	{
—	—	@@ -42,6 +60,16 @@
43	61	COMBOBOX IDC_SCALE, 7, 43, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
44	62	LTEXT "Additional display modes", IDC_STATIC, 114, 32, 78, 8, SS_LEFT, WS_EX_LEFT
45	63	COMBOBOX IDC_EXTRAMODES, 114, 43, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS \| CBS_OWNERDRAWFIXED, WS_EX_LEFT
	64	+ LTEXT "Screen aspect ratio", IDC_STATIC, 7, 61, 63, 8, SS_LEFT, WS_EX_LEFT
	65	+ COMBOBOX IDC_ASPECT, 7, 71, 102, 30, CBS_DROPDOWN \| CBS_HASSTRINGS, WS_EX_LEFT
	66	+ LTEXT "Sort video modes", IDC_STATIC, 114, 61, 56, 8, SS_LEFT, WS_EX_LEFT
	67	+ COMBOBOX IDC_SORTMODES, 114, 71, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
	68	+ LTEXT "DPI scaling mode", IDC_STATIC, 7, 86, 55, 8, SS_LEFT, WS_EX_LEFT
	69	+ COMBOBOX IDC_DPISCALE, 7, 96, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
	70	+ LTEXT "Vertical sync", IDC_STATIC, 114, 86, 41, 8, SS_LEFT, WS_EX_LEFT
	71	+ COMBOBOX IDC_VSYNC, 114, 96, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
	72	+ LTEXT "Fullscreen window mode", IDC_STATIC, 7, 111, 78, 9, SS_LEFT, WS_EX_LEFT
	73	+ COMBOBOX IDC_FULLMODE, 8, 122, 101, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
46	74	LTEXT "Fixed scaling", IDC_FIXEDSCALELABEL, 113, 112, 47, 9, WS_DISABLED \| SS_LEFT, WS_EX_LEFT
47	75	LTEXT "X", IDC_FIXEDSCALELABELX, 113, 125, 8, 9, WS_DISABLED \| SS_LEFT, WS_EX_LEFT
48	76	EDITTEXT IDC_FIXEDSCALEX, 121, 122, 24, 14, ES_AUTOHSCROLL, WS_EX_LEFT
—	—	@@ -48,23 +76,13 @@
49	77	LTEXT "Y", IDC_FIXEDSCALELABELY, 150, 125, 8, 9, WS_DISABLED \| SS_LEFT, WS_EX_LEFT
50	78	EDITTEXT IDC_FIXEDSCALEY, 158, 122, 24, 14, ES_AUTOHSCROLL, WS_EX_LEFT
51	79	AUTOCHECKBOX "Square", IDC_FIXEDSCALESQUARE, 187, 122, 29, 14, BS_PUSHLIKE, WS_EX_LEFT
52		~~- LTEXT "Sort video modes", IDC_STATIC, 114, 61, 56, 8, SS_LEFT, WS_EX_LEFT~~
53		~~- COMBOBOX IDC_SORTMODES, 114, 71, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT~~
54		~~- LTEXT "Screen aspect ratio", IDC_STATIC, 7, 61, 63, 8, SS_LEFT, WS_EX_LEFT~~
55		~~- COMBOBOX IDC_ASPECT, 7, 71, 102, 30, CBS_DROPDOWN \| CBS_HASSTRINGS, WS_EX_LEFT~~
56		~~- LTEXT "Vertical sync", IDC_STATIC, 114, 86, 41, 8, SS_LEFT, WS_EX_LEFT~~
57		~~- COMBOBOX IDC_VSYNC, 114, 96, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT~~
58		~~- LTEXT "DPI scaling mode", IDC_STATIC, 7, 86, 55, 8, SS_LEFT, WS_EX_LEFT~~
59		~~- COMBOBOX IDC_DPISCALE, 7, 96, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT~~
60	80	AUTOCHECKBOX "Change display color depth", IDC_COLOR, 9, 137, 100, 10, 0, WS_EX_LEFT
61		~~- LTEXT "Fullscreen window mode", IDC_STATIC, 7, 111, 78, 9, SS_LEFT, WS_EX_LEFT~~
62		~~- COMBOBOX IDC_FULLMODE, 8, 122, 101, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT~~
63	81	}
64	82
65	83
66	84
67	85	LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
68		~~-IDD_3DGRAPHICS DIALOG 0, 0, 283, 173~~
	86	+IDD_3DGRAPHICS DIALOG 0, 0, 340, 169
69	87	STYLE DS_3DLOOK \| DS_CENTER \| DS_SHELLFONT \| WS_VISIBLE \| WS_CHILDWINDOW
70	88	FONT 8, "Ms Shell Dlg"
71	89	{
—	—	@@ -81,12 +99,10 @@
82	100
83	101
84	102	LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
85		~~-IDD_ADVANCED DIALOG 0, 0, 283, 173~~
	103	+IDD_ADVANCED DIALOG 0, 0, 340, 169
86	104	STYLE DS_3DLOOK \| DS_CENTER \| DS_SHELLFONT \| WS_VISIBLE \| WS_CHILDWINDOW
87	105	FONT 8, "Ms Shell Dlg"
88	106	{
89		~~- LTEXT "Low color rendering", 0, 7, 65, 63, 9, SS_LEFT, WS_EX_LEFT~~
90		~~- COMBOBOX IDC_LOWCOLORRENDER, 5, 76, 104, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT~~
91	107	LTEXT "Texture format", IDC_STATIC, 7, 7, 50, 8, SS_LEFT, WS_EX_LEFT
92	108	COMBOBOX IDC_TEXTUREFORMAT, 7, 17, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
93	109	LTEXT "Texture access method", IDC_STATIC, 114, 7, 76, 8, SS_LEFT, WS_EX_LEFT
—	—	@@ -93,44 +109,32 @@
94	110	COMBOBOX IDC_TEXUPLOAD, 114, 17, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
95	111	LTEXT "Display name", 0, 7, 35, 43, 9, SS_LEFT, WS_EX_LEFT
96	112	EDITTEXT IDC_DISPLAYNAME, 7, 46, 209, 14, ES_AUTOHSCROLL, WS_EX_LEFT
97		~~- PUSHBUTTON "Write INI file...", IDC_WRITEINI, 203, 155, 73, 14, 0, WS_EX_LEFT~~
	113	+ LTEXT "Low color rendering", 0, 7, 65, 63, 9, SS_LEFT, WS_EX_LEFT
	114	+ COMBOBOX IDC_LOWCOLORRENDER, 5, 76, 104, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
	115	+ PUSHBUTTON "Write INI file...", IDC_WRITEINI, 203, 151, 73, 14, 0, WS_EX_LEFT
98	116	}
99	117
100	118
101	119
102	120	LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
103		~~-IDD_DEBUG DIALOG 0, 0, 283, 173~~
	121	+IDD_DEBUG DIALOG 0, 0, 340, 169
104	122	STYLE DS_3DLOOK \| DS_CENTER \| DS_SHELLFONT \| WS_VISIBLE \| WS_CHILDWINDOW
105	123	FONT 8, "Ms Shell Dlg"
106	124	{
107		~~- LISTBOX IDC_DEBUGLIST, 7, 7, 269, 162, WS_TABSTOP \| WS_VSCROLL \| LBS_NOINTEGRALHEIGHT \| LBS_OWNERDRAWFIXED \| LBS_SORT \| LBS_NOTIFY, WS_EX_LEFT~~
	125	+ LISTBOX IDC_DEBUGLIST, 7, 7, 269, 158, WS_TABSTOP \| WS_VSCROLL \| LBS_NOINTEGRALHEIGHT \| LBS_OWNERDRAWFIXED \| LBS_SORT \| LBS_NOTIFY, WS_EX_LEFT
108	126	}
109	127
110	128
111	129
112	130	LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
113		~~-IDD_DXGLCFG DIALOG 0, 0, 301, 247~~
114		~~-STYLE DS_3DLOOK \| DS_CONTEXTHELP \| DS_SETFONT \| WS_CAPTION \| WS_SYSMENU~~
115		~~-CAPTION "DXGL Config (Experimental)"~~
116		~~-FONT 8, "Ms Shell Dlg 2"~~
117		-{
118		~~- LTEXT "Application profile", IDC_STATIC, 7, 7, 58, 8, SS_LEFT, WS_EX_LEFT~~
119		~~- COMBOBOX IDC_APPS, 7, 17, 287, 195, WS_TABSTOP \| WS_VSCROLL \| CBS_DROPDOWNLIST \| CBS_OWNERDRAWFIXED \| 0x00000400, WS_EX_LEFT~~
120		~~- CONTROL "", IDC_TABS, WC_TABCONTROL, 0, 7, 35, 287, 189, WS_EX_LEFT~~
121		~~- PUSHBUTTON "A&dd...", IDC_ADD, 7, 226, 50, 14, 0, WS_EX_LEFT~~
122		~~- PUSHBUTTON "&Remove", IDC_REMOVE, 59, 226, 50, 14, WS_DISABLED, WS_EX_LEFT~~
123		~~- DEFPUSHBUTTON "OK", IDOK, 140, 226, 50, 14, 0, WS_EX_LEFT~~
124		~~- PUSHBUTTON "Cancel", IDCANCEL, 192, 226, 50, 14, 0, WS_EX_LEFT~~
125		~~- PUSHBUTTON "&Apply", IDC_APPLY, 244, 226, 50, 14, WS_DISABLED, WS_EX_LEFT~~
126		-}
127		-
128		-
129		-
130		~~-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL~~
131		~~-IDD_EFFECTS DIALOG 0, 0, 283, 173~~
	131	+IDD_EFFECTS DIALOG 0, 0, 340, 169
132	132	STYLE DS_3DLOOK \| DS_CENTER \| DS_SHELLFONT \| WS_VISIBLE \| WS_CHILDWINDOW
133	133	FONT 8, "Ms Shell Dlg"
134	134	{
	135	+ LTEXT "Postprocess scaler", IDC_STATIC, 7, 5, 60, 9, SS_LEFT, WS_EX_LEFT
	136	+ COMBOBOX IDC_POSTSCALE, 7, 15, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
	137	+ LTEXT "Postprocess input miultiplier", 0, 114, 5, 86, 9, SS_LEFT, WS_EX_LEFT
	138	+ COMBOBOX IDC_POSTSCALESIZE, 114, 15, 102, 30, CBS_DROPDOWN \| CBS_HASSTRINGS, WS_EX_LEFT
135	139	AUTOCHECKBOX "Use post-processing shader", IDC_USESHADER, 7, 34, 103, 8, 0, WS_EX_LEFT
136	140	COMBOBOX IDC_SHADER, 7, 44, 247, 92, WS_DISABLED \| CBS_DROPDOWN \| CBS_HASSTRINGS, WS_EX_LEFT
137	141	PUSHBUTTON "...", IDC_BROWSESHADER, 256, 43, 20, 14, WS_DISABLED, WS_EX_LEFT
—	—	@@ -141,10 +145,6 @@
142	146	EDITTEXT IDC_CUSTOMSCALEX, 15, 95, 40, 14, WS_DISABLED \| ES_AUTOHSCROLL, WS_EX_LEFT
143	147	LTEXT "Y", IDC_CUSTOMSCALELABELY, 57, 98, 8, 8, WS_DISABLED \| SS_LEFT, WS_EX_LEFT
144	148	EDITTEXT IDC_CUSTOMSCALEY, 65, 95, 40, 14, WS_DISABLED \| ES_AUTOHSCROLL, WS_EX_LEFT
145		~~- COMBOBOX IDC_POSTSCALESIZE, 114, 15, 102, 30, CBS_DROPDOWN \| CBS_HASSTRINGS, WS_EX_LEFT~~
146		~~- LTEXT "Postprocess input miultiplier", 0, 114, 5, 86, 9, SS_LEFT, WS_EX_LEFT~~
147		~~- COMBOBOX IDC_POSTSCALE, 7, 15, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT~~
148		~~- LTEXT "Postprocess scaler", IDC_STATIC, 7, 5, 60, 9, SS_LEFT, WS_EX_LEFT~~
149	149	}
150	150
151	151
Index: dxglcfg2/resource.h
—	—	@@ -19,56 +19,75 @@
20	20	#define IDC_STATIC (-1)
21	21	#endif
22	22
23		~~-#define IDD_DXGLCFG 100~~
24		~~-#define IDI_DXGL 101~~
25		~~-#define IDI_DXGLSM 102~~
26		~~-#define IDI_STAR 103~~
27		~~-#define IDD_LOADING 110~~
28		~~-#define IDD_DISPLAY 111~~
29		~~-#define IDD_3DGRAPHICS 112~~
30		~~-#define IDD_EFFECTS 113~~
31		~~-#define IDD_ADVANCED 114~~
32		~~-#define IDD_DEBUG 115~~
	23	+// Dialogs
	24	+#define IDD_DXGLCFG 101
	25	+#define IDD_LOADING 102
	26	+
	27	+// Tabs
	28	+#define IDD_DISPLAY 201
	29	+#define IDD_EFFECTS 202
	30	+#define IDD_3DGRAPHICS 203
	31	+#define IDD_ADVANCED 204
	32	+#define IDD_DEBUG 205
	33	+
	34	+// Icons
	35	+#define IDI_DXGL 301
	36	+#define IDI_DXGLSM 302
	37	+#define IDI_STAR 303
	38	+
	39	+// Controls - DXGL Config Dialog
33	40	#define IDC_APPLY 1000
34	41	#define IDC_APPS 1001
35		~~-#define IDC_ADD 1002~~
36		~~-#define IDC_REMOVE 1003~~
37		~~-#define IDC_TABS 1004~~
38		~~-#define IDC_DEBUGLIST 1005~~
39		~~-#define IDC_SHADER 1006~~
40		~~-#define IDC_SORTMODES 1007~~
41		~~-#define IDC_TEXFILTER 1008~~
42		~~-#define IDC_TEXTUREFORMAT 1009~~
43		~~-#define IDC_ANISO 1010~~
44		~~-#define IDC_BROWSESHADER 1011~~
45		~~-#define IDC_TEXUPLOAD 1012~~
46		~~-#define IDC_VIDMODE 1013~~
47		~~-#define IDC_MSAA 1014~~
48		~~-#define IDC_PRIMARYSCALE 1015~~
49		~~-#define IDC_SCALE 1016~~
50		~~-#define IDC_WRITEINI 1017~~
51		~~-#define IDC_ASPECT 1018~~
52		~~-#define IDC_ASPECT3D 1019~~
53		~~-#define IDC_CUSTOMSCALELABEL 1020~~
54		~~-#define IDC_CUSTOMSCALELABELX 1021~~
55		~~-#define IDC_DPISCALE 1022~~
56		~~-#define IDC_COLORDEPTH 1023~~
57		~~-#define IDC_CUSTOMSCALEX 1024~~
58		~~-#define IDC_CUSTOMSCALELABELY 1025~~
59		~~-#define IDC_EXTRAMODES 1026~~
60		~~-#define IDC_CUSTOMSCALEY 1027~~
61		~~-#define IDC_VSYNC 1028~~
62		~~-#define IDC_COLOR 1029~~
63		~~-#define IDC_USESHADER 1030~~
64		~~-#define IDC_PROGRESS 1031~~
65		~~-#define IDC_DISPLAYNAME 1032~~
66		~~-#define IDC_FIXEDSCALELABEL 1033~~
67		~~-#define IDC_FIXEDSCALELABELX 1034~~
68		~~-#define IDC_FIXEDSCALEX 1035~~
69		~~-#define IDC_FIXEDSCALELABELY 1036~~
70		~~-#define IDC_FIXEDSCALEY 1037~~
71		~~-#define IDC_FIXEDSCALESQUARE 1038~~
72		~~-#define IDC_LOWCOLORRENDER 1039~~
73		~~-#define IDC_FULLMODE 1040~~
74		~~-#define IDC_POSTSCALE 1041~~
75		~~-#define IDC_POSTSCALESIZE 1042~~
	42	+#define IDC_TABS 1002
	43	+#define IDC_ADD 1003
	44	+#define IDC_REMOVE 1004
	45	+
	46	+// Controls - Progress Dialog
	47	+#define IDC_PROGRESS 1101
	48	+
	49	+// Controls - Display Tab
	50	+#define IDC_VIDMODE 2001
	51	+#define IDC_COLORDEPTH 2002
	52	+#define IDC_SCALE 2003
	53	+#define IDC_EXTRAMODES 2004
	54	+#define IDC_ASPECT 2005
	55	+#define IDC_SORTMODES 2006
	56	+#define IDC_DPISCALE 2007
	57	+#define IDC_VSYNC 2008
	58	+#define IDC_FULLMODE 2009
	59	+#define IDC_FIXEDSCALELABEL 2010
	60	+#define IDC_FIXEDSCALELABELX 2011
	61	+#define IDC_FIXEDSCALEX 2012
	62	+#define IDC_FIXEDSCALELABELY 2013
	63	+#define IDC_FIXEDSCALEY 2014
	64	+#define IDC_FIXEDSCALESQUARE 2015
	65	+#define IDC_COLOR 2016
	66	+
	67	+// Controls - Effects Tab
	68	+#define IDC_POSTSCALE 2101
	69	+#define IDC_POSTSCALESIZE 2102
	70	+#define IDC_USESHADER 2103
	71	+#define IDC_SHADER 2104
	72	+#define IDC_BROWSESHADER 2105
	73	+#define IDC_PRIMARYSCALE 2106
	74	+#define IDC_CUSTOMSCALELABEL 2107
	75	+#define IDC_CUSTOMSCALELABELX 2108
	76	+#define IDC_CUSTOMSCALEX 2109
	77	+#define IDC_CUSTOMSCALELABELY 2110
	78	+#define IDC_CUSTOMSCALEY 2111
	79	+
	80	+// Controls - 3D Graphics Tab
	81	+#define IDC_TEXFILTER 2201
	82	+#define IDC_ANISO 2202
	83	+#define IDC_MSAA 2203
	84	+#define IDC_ASPECT3D 2204
	85	+
	86	+// Controls - Advanced Tab
	87	+#define IDC_TEXTUREFORMAT 2301
	88	+#define IDC_TEXUPLOAD 2302
	89	+#define IDC_DISPLAYNAME 2303
	90	+#define IDC_LOWCOLORRENDER 2304
	91	+#define IDC_WRITEINI 2305
	92	+
	93	+// Controls - Debug Tab
	94	+#define IDC_DEBUGLIST 2401
Index: dxgltest/Resource.h
—	—	@@ -19,134 +19,153 @@
20	20	#define IDC_STATIC (-1)
21	21	#endif
22	22
23		~~-#define IDD_DXGLTEST 112~~
24		~~-#define IDD_TESTGFX 113~~
25		~~-#define IDD_SYSINFO 115~~
26		~~-#define IDI_DXGL 116~~
27		~~-#define IDI_DXGLSM 117~~
28		~~-#define IDI_X16 118~~
29		~~-#define IDB_DXGLINV 119~~
30		~~-#define IDB_DXGLINV64 120~~
31		~~-#define IDD_TEXSHADER 121~~
32		~~-#define IDD_VERTEXSHADER 123~~
33		~~-#define IDC_DXDIAG 1000~~
34		~~-#define IDC_SPINSTAGE 1000~~
35		~~-#define IDC_VIDMODES 1000~~
36		~~-#define IDC_LIGHTENABLED 1001~~
37		~~-#define IDC_RESIZABLE 1001~~
38		~~-#define IDC_SPINALPHAREF 1001~~
39		~~-#define IDC_DDTYPE 1002~~
40		~~-#define IDC_SPINDETAIL 1002~~
41		~~-#define IDC_SPINLINEREPEAT 1002~~
	23	+// Dialogs
	24	+#define IDD_TEXSHADER 103
	25	+#define IDD_VERTEXSHADER 104
	26	+#define IDD_DXGLTEST 199
	27	+
	28	+// Tabs
	29	+#define IDD_TESTGFX 206
	30	+#define IDD_SYSINFO 207
	31	+
	32	+// Icons
	33	+#define IDI_DXGL 301
	34	+#define IDI_DXGLSM 302
	35	+#define IDI_X16 304
	36	+
	37	+// Bitmaps
	38	+#define IDB_DXGLINV 311
	39	+#define IDB_DXGLINV64 312
	40	+
	41	+// Controls - DXGL Test Dialog
42	42	#define IDC_TABS 1002
43		~~-#define IDC_TESTHEADER 1002~~
44		~~-#define IDC_TEXTUREPREVIEW 1003~~
45		~~-#define IDC_DISPLAY 1004~~
46		~~-#define IDC_TESTLIST 1004~~
47		~~-#define IDC_FILLMODE 1005~~
48		~~-#define IDC_ALPHABLEND 1006~~
49		~~-#define IDC_DIFFUSESOURCE 1006~~
50		~~-#define IDC_BGCOLOR 1007~~
51		~~-#define IDC_SHADEMODE 1008~~
52		~~-#define IDC_WINDOWED 1008~~
53		~~-#define IDC_FULLSCREEN 1009~~
54		~~-#define IDC_CULLMODE 1010~~
55		~~-#define IDC_FOGENABLE 1011~~
56		~~-#define IDC_APIVER 1012~~
57		~~-#define IDC_MATDIFFUSESELECT 1012~~
58		~~-#define IDC_MATDIFFUSE 1013~~
59		~~-#define IDC_SPINAPI 1013~~
60		~~-#define IDC_ENABLELIGHT 1014~~
61		~~-#define IDC_ENABLESPECULAR 1015~~
62		~~-#define IDC_VSYNC 1015~~
63		~~-#define IDC_DETAIL 1016~~
64		~~-#define IDC_AMBIENT 1017~~
65		~~-#define IDC_BUFFERS 1017~~
66		~~-#define IDC_SPECULARSOURCE 1018~~
67		~~-#define IDC_SPINBACK 1019~~
68		~~-#define IDC_MATSPECULARSELECT 1020~~
69		~~-#define IDC_MATSPECULAR 1021~~
70		~~-#define IDC_AMBIENTSOURCE 1022~~
71		~~-#define IDC_FRAMERATE 1023~~
72		~~-#define IDC_EMISSIVESOURCE 1024~~
73		~~-#define IDC_SPINFRAME 1024~~
74		~~-#define IDC_FSAA 1026~~
75		~~-#define IDC_FILTERLABEL 1027~~
76		~~-#define IDC_FILTER 1028~~
77		~~-#define IDC_FSAALABEL 1029~~
78		~~-#define IDC_TEST 1031~~
79		~~-#define IDC_DDVER 1032~~
80		~~-#define IDC_FILLSTIPPLELLLABEL 1047~~
81		~~-#define IDC_FILLSTIPPLETYPE 1052~~
82		~~-#define IDC_FILLSTIPPLEFILE 1053~~
83		~~-#define IDC_FILLSTIPPLEBROWSE 1054~~
84		~~-#define IDC_FILLSTIPPLEPREVIEW 1055~~
85		~~-#define IDC_LINESTIPPLEREPEAT 1056~~
86		~~-#define IDC_LINESTIPPLEPATTERN 1057~~
87		~~-#define IDC_TEXSTAGE 1058~~
88		~~-#define IDC_TEXCOLORKEY 1059~~
89		~~-#define IDC_SETTEXCOLORKEY 1060~~
90		~~-#define IDC_TEXTURE 1061~~
91		~~-#define IDC_TEXTUREFILE 1062~~
92		~~-#define IDC_TEXTUREBROWSE 1063~~
93		~~-#define IDC_CARG1 1064~~
94		~~-#define IDC_CARG1INV 1065~~
95		~~-#define IDC_CARG1A 1066~~
96		~~-#define IDC_CARG2 1067~~
97		~~-#define IDC_CARG2INV 1068~~
98		~~-#define IDC_CARG2A 1069~~
99		~~-#define IDC_COLOROP 1070~~
100		~~-#define IDC_AARG1 1071~~
101		~~-#define IDC_AARG1INV 1072~~
102		~~-#define IDC_AARG1A 1073~~
103		~~-#define IDC_AARG2 1074~~
104		~~-#define IDC_AARG2INV 1075~~
105		~~-#define IDC_AARG2A 1076~~
106		~~-#define IDC_ALPHAOP 1077~~
107		~~-#define IDC_DIFFUSE 1080~~
108		~~-#define IDC_DIFFUSESELECT 1081~~
109		~~-#define IDC_SPECULAR 1082~~
110		~~-#define IDC_SPECULARSELECT 1083~~
111		~~-#define IDC_FACTOR 1084~~
112		~~-#define IDC_FACTORSELECT 1085~~
113		~~-#define IDC_FOGCOLOR 1086~~
114		~~-#define IDC_FOGCOLORSELECT 1087~~
115		~~-#define IDC_SRCBLEND 1089~~
116		~~-#define IDC_DESTBLEND 1090~~
117		~~-#define IDC_ALPHAREF 1091~~
118		~~-#define IDC_ALPHAFUNC 1092~~
119		~~-#define IDC_ALPHASTIPPLE 1093~~
120		~~-#define IDC_COLORKEY 1094~~
121		~~-#define IDC_COLORKEYBLEND 1095~~
122		~~-#define IDC_VERTEXFOGMODE 1096~~
123		~~-#define IDC_PIXELFOGMODE 1097~~
124		~~-#define IDC_FOGSTART 1098~~
125		~~-#define IDC_FOGEND 1099~~
126		~~-#define IDC_FOGDENSITY 1100~~
127		~~-#define IDC_RANGEBASEDFOG 1101~~
128		~~-#define IDC_BGCOLORSELECT 1102~~
129		~~-#define IDC_ALPHATEST 1103~~
130		~~-#define IDC_AMBIENTSELECT 1104~~
131		~~-#define IDC_VERTEXCOLOR 1106~~
132		~~-#define IDC_LOCALVIEWER 1108~~
133		~~-#define IDC_EMISSIVE 1111~~
134		~~-#define IDC_EMISSIVESELECT 1112~~
135		~~-#define IDC_MATAMBIENT 1114~~
136		~~-#define IDC_MATAMBIENTSELECT 1116~~
137		~~-#define IDC_POWER 1118~~
138		~~-#define IDC_LIGHTNUMBER 1120~~
139		~~-#define IDC_SPINLIGHT 1121~~
140		~~-#define IDC_LIGHTTYPE 1123~~
141		~~-#define IDC_LIGHTDIFFUSE 1126~~
142		~~-#define IDC_LIGHTDIFFUSESELECT 1127~~
143		~~-#define IDC_LIGHTSPECULAR 1129~~
144		~~-#define IDC_LIGHTSPECULARSELECT 1131~~
145		~~-#define IDC_LIGHTAMBIENT 1134~~
146		~~-#define IDC_LIGHTAMBIENTSELECT 1135~~
147		~~-#define IDC_LIGHTRANGE 1137~~
148		~~-#define IDC_LIGHTFALLOFF 1139~~
149		~~-#define IDC_LIGHTATTEN0 1143~~
150		~~-#define IDC_LIGHTATTEN1 1144~~
151		~~-#define IDC_LIGHTATTEN2 1145~~
152		~~-#define IDC_LIGHTTHETA 1147~~
153		~~-#define IDC_LIGHTPHI 1149~~
	43	+
	44	+// Controls - Graphics Tests Tab
	45	+#define IDC_TESTLIST 2501
	46	+#define IDC_VIDMODES 2502
	47	+#define IDC_WINDOWED 2503
	48	+#define IDC_FULLSCREEN 2504
	49	+#define IDC_RESIZABLE 2505
	50	+#define IDC_TESTVSYNC 2506
	51	+#define IDC_APIVER 2507
	52	+#define IDC_SPINAPI 2508
	53	+#define IDC_BUFFERS 2509
	54	+#define IDC_SPINBACK 2510
	55	+#define IDC_FRAMERATE 2511
	56	+#define IDC_SPINFRAME 2512
	57	+#define IDC_FILTERLABEL 2513
	58	+#define IDC_FILTER 2514
	59	+#define IDC_FSAALABEL 2515
	60	+#define IDC_FSAA 2516
	61	+#define IDC_TEST 2517
	62	+
	63	+// Controls - System Information Tab
	64	+#define IDC_DDTYPE 2601
	65	+#define IDC_DDVER 2602
	66	+#define IDC_DXDIAG 2603
	67	+
	68	+// Controls - Shader Test Dialog Common
	69	+#define IDC_DISPLAY 2701
	70	+#define IDC_TEXTURE 2702
	71	+#define IDC_TEXTUREFILE 2703
	72	+#define IDC_TEXTUREBROWSE 2704
	73	+#define IDC_VERTEXFOGMODE 2705
	74	+#define IDC_PIXELFOGMODE 2706
	75	+#define IDC_FOGSTART 2707
	76	+#define IDC_FOGEND 2708
	77	+#define IDC_FOGDENSITY 2709
	78	+#define IDC_RANGEBASEDFOG 2710
	79	+#define IDC_FOGENABLE 2711
	80	+#define IDC_DIFFUSE 2712
	81	+#define IDC_DIFFUSESELECT 2713
	82	+#define IDC_SPECULAR 2714
	83	+#define IDC_SPECULARSELECT 2715
	84	+#define IDC_FACTOR 2716
	85	+#define IDC_FACTORSELECT 2717
	86	+#define IDC_FOGCOLOR 2718
	87	+#define IDC_FOGCOLORSELECT 2719
	88	+#define IDC_BGCOLOR 2720
	89	+#define IDC_BGCOLORSELECT 2721
	90	+
	91	+
	92	+// Controls - Texture Shader Test Dialog
	93	+#define IDC_TEXSTAGE 2801
	94	+#define IDC_SPINSTAGE 2802
	95	+#define IDC_TEXCOLORKEY 2803
	96	+#define IDC_SETTEXCOLORKEY 2804
	97	+#define IDC_CARG1 2805
	98	+#define IDC_CARG1INV 2806
	99	+#define IDC_CARG1A 2807
	100	+#define IDC_CARG2 2808
	101	+#define IDC_CARG2INV 2809
	102	+#define IDC_CARG2A 2810
	103	+#define IDC_COLOROP 2811
	104	+#define IDC_AARG1 2812
	105	+#define IDC_AARG1INV 2813
	106	+#define IDC_AARG1A 2814
	107	+#define IDC_AARG2 2815
	108	+#define IDC_AARG2INV 2816
	109	+#define IDC_AARG2A 2817
	110	+#define IDC_ALPHAOP 2818
	111	+#define IDC_TEXTUREPREVIEW 2819
	112	+#define IDC_ALPHABLEND 2820
	113	+#define IDC_SRCBLEND 2821
	114	+#define IDC_DESTBLEND 2822
	115	+#define IDC_ALPHAREF 2823
	116	+#define IDC_SPINALPHAREF 2824
	117	+#define IDC_ALPHAFUNC 2825
	118	+#define IDC_ALPHASTIPPLE 2826
	119	+#define IDC_ALPHATEST 2827
	120	+#define IDC_COLORKEY 2828
	121	+#define IDC_COLORKEYBLEND 2829
	122	+#define IDC_LINESTIPPLEPATTERN 2830
	123	+#define IDC_LINESTIPPLEREPEAT 2831
	124	+#define IDC_SPINLINEREPEAT 2832
	125	+#define IDC_FILLSTIPPLELLLABEL 2833
	126	+#define IDC_FILLSTIPPLETYPE 2834
	127	+#define IDC_FILLSTIPPLEFILE 2835
	128	+#define IDC_FILLSTIPPLEBROWSE 2836
	129	+#define IDC_FILLSTIPPLEPREVIEW 2837
	130	+
	131	+// Controls - Vertex Test Dialog
	132	+#define IDC_AMBIENT 2901
	133	+#define IDC_AMBIENTSELECT 2902
	134	+#define IDC_EMISSIVE 2903
	135	+#define IDC_EMISSIVESELECT 2904
	136	+#define IDC_MATAMBIENT 2905
	137	+#define IDC_MATAMBIENTSELECT 2906
	138	+#define IDC_MATDIFFUSE 2907
	139	+#define IDC_MATDIFFUSESELECT 2908
	140	+#define IDC_MATSPECULAR 2909
	141	+#define IDC_MATSPECULARSELECT 2910
	142	+#define IDC_FILLMODE 2911
	143	+#define IDC_SHADEMODE 2912
	144	+#define IDC_CULLMODE 2913
	145	+#define IDC_ENABLELIGHT 2914
	146	+#define IDC_ENABLESPECULAR 2915
	147	+#define IDC_VERTEXCOLOR 2916
	148	+#define IDC_LOCALVIEWER 2917
	149	+#define IDC_DETAIL 2918
	150	+#define IDC_SPINDETAIL 2919
	151	+#define IDC_DIFFUSESOURCE 2920
	152	+#define IDC_AMBIENTSOURCE 2921
	153	+#define IDC_SPECULARSOURCE 2922
	154	+#define IDC_EMISSIVESOURCE 2923
	155	+#define IDC_LIGHTNUMBER 2924
	156	+#define IDC_SPINLIGHT 2925
	157	+#define IDC_LIGHTDIFFUSE 2926
	158	+#define IDC_LIGHTDIFFUSESELECT 2927
	159	+#define IDC_LIGHTAMBIENT 2928
	160	+#define IDC_LIGHTAMBIENTSELECT 2929
	161	+#define IDC_LIGHTTYPE 2930
	162	+#define IDC_LIGHTSPECULAR 2931
	163	+#define IDC_LIGHTSPECULARSELECT 2932
	164	+#define IDC_LIGHTRANGE 2933
	165	+#define IDC_LIGHTENABLED 2934
	166	+#define IDC_POWER 2935
	167	+#define IDC_LIGHTFALLOFF 2936
	168	+#define IDC_LIGHTATTEN0 2937
	169	+#define IDC_LIGHTATTEN1 2938
	170	+#define IDC_LIGHTATTEN2 2939
	171	+#define IDC_LIGHTTHETA 2940
	172	+#define IDC_LIGHTPHI 2941
Index: dxgltest/dxgltest.cpp
—	—	@@ -256,7 +256,6 @@
257	257	case WM_INITDIALOG:
258	258	if (_EnableThemeDialogTexture) _EnableThemeDialogTexture(hWnd, ETDT_ENABLETAB);
259	259	SendDlgItemMessage(hWnd,IDC_FULLSCREEN,BM_SETCHECK,1,0);
260		~~- SetDlgItemText(hWnd,IDC_TESTHEADER,_T("Test graphics functionality in DXGL or DirectDraw. Press ESC to quit any test."));~~
261	260	for(i = 0; i < numtests; i++)
262	261	SendDlgItemMessage(hWnd,IDC_TESTLIST,LB_ADDSTRING,0,(LPARAM)Tests[i].name);
263	262	error = DirectDrawCreate(NULL,&lpdd,NULL);
—	—	@@ -302,7 +301,7 @@
303	302	EnableWindow(GetDlgItem(hWnd,IDC_WINDOWED),TRUE);
304	303	EnableWindow(GetDlgItem(hWnd,IDC_FULLSCREEN),TRUE);
305	304	EnableWindow(GetDlgItem(hWnd,IDC_RESIZABLE),TRUE);
306		~~- EnableWindow(GetDlgItem(hWnd,IDC_VSYNC),TRUE);~~
	305	+ EnableWindow(GetDlgItem(hWnd,IDC_TESTVSYNC),TRUE);
307	306	EnableWindow(GetDlgItem(hWnd,IDC_VIDMODES),TRUE);
308	307	}
309	308	else
—	—	@@ -314,7 +313,7 @@
315	314	EnableWindow(GetDlgItem(hWnd,IDC_WINDOWED),FALSE);
316	315	EnableWindow(GetDlgItem(hWnd,IDC_FULLSCREEN),FALSE);
317	316	EnableWindow(GetDlgItem(hWnd,IDC_RESIZABLE),FALSE);
318		~~- EnableWindow(GetDlgItem(hWnd,IDC_VSYNC),FALSE);~~
	317	+ EnableWindow(GetDlgItem(hWnd,IDC_TESTVSYNC),FALSE);
319	318	EnableWindow(GetDlgItem(hWnd,IDC_VIDMODES),FALSE);
320	319	SendDlgItemMessage(hWnd,IDC_WINDOWED,BM_SETCHECK,BST_CHECKED,0);
321	320	SendDlgItemMessage(hWnd,IDC_FULLSCREEN,BM_SETCHECK,BST_UNCHECKED,0);
Index: dxgltest/dxgltest.rc
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

DXGL r752 - Code Review

Diff [purge]

Navigation menu

Search