ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp

Comparing BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp (file contents):
Revision 1.6 by cebix, 2000-04-10T18:52:39Z vs.
Revision 1.8 by cebix, 2000-07-13T17:45:32Z

#	Line 27 | Line 27
27		#include <libraries/asl.h>
28		#include <libraries/gtlayout.h>
29		#include <libraries/Picasso96.h>
30	+	#include <cybergraphx/cybergraphics.h>
31		#include <graphics/displayinfo.h>
32		#include <devices/ahi.h>
33		#include <proto/exec.h>
#	Line 37 | Line 38
38		#include <proto/graphics.h>
39		#include <proto/asl.h>
40		#include <proto/Picasso96.h>
41	+	#include <proto/cybergraphics.h>
42		#include <proto/ahi.h>
43
44		#include "sysdeps.h"
#	Line 1239 | Line 1241 | static void ghost_graphics_gadgets(struc
1241		// Show screen mode requester
1242		static void screen_mode_req(struct Window *win, struct LayoutHandle *h)
1243		{
1244	<	if (P96Base == NULL)
1244	>	if (P96Base == NULL && CyberGfxBase == NULL)
1245		return;
1246
1247		LT_LockWindow(win);
1248	<	ULONG id = p96RequestModeIDTags(
1249	<	P96MA_MinDepth, 8,
1250	<	P96MA_FormatsAllowed, RGBFF_CLUT | RGBFF_R5G5B5 | RGBFF_A8R8G8B8,
1251	<	TAG_END
1252	<	);
1248	>
1249	>	ULONG id;
1250	>
1251	>	if (P96Base) {
1252	>	id = p96RequestModeIDTags(
1253	>	P96MA_MinDepth, 8,
1254	>	P96MA_FormatsAllowed, RGBFF_CLUT | RGBFF_R5G5B5 | RGBFF_A8R8G8B8,
1255	>	TAG_END
1256	>	);
1257	>	} else {
1258	>	UWORD model_array[] = {PIXFMT_LUT8, PIXFMT_RGB16, PIXFMT_ARGB32, 0, ~0};
1259	>	id = (ULONG) CModeRequestTags(NULL,
1260	>	CYBRMREQ_MinDepth, 8,
1261	>	CYBRMREQ_CModelArray, (ULONG)model_array,
1262	>	TAG_END
1263	>	);
1264	>	}
1265		LT_UnlockWindow(win);
1266
1267		if (id != INVALID_ID) {

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines