ViewVC Help

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

root/cebix/BasiliskII/src/Unix/video_x.cpp

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.21 by gbeauche, 2000-09-25T22:33:49Z vs.
Revision 1.24 by cebix, 2000-10-11T17:55:06Z

#	Line 583 | Line 583 | static bool init_fbdev_dga(char *in_fb_n
583		}
584		}
585
586	+	#if ENABLE_VOSF
587		#if REAL_ADDRESSING || DIRECT_ADDRESSING
588		// If the blit function is null, i.e. just a copy of the buffer,
589		// we first try to avoid the allocation of a temporary frame buffer
#	Line 599 | Line 600 | static bool init_fbdev_dga(char *in_fb_n
600		the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
601		memset(the_buffer, 0, the_buffer_size);
602		}
603	<	#elif ENABLE_VOSF
603	>	#else
604		use_vosf = false;
605		#endif
606	+	#endif
607
608		set_video_monitor(width, height, bytes_per_row, true);
609		#if REAL_ADDRESSING || DIRECT_ADDRESSING
#	Line 703 | Line 705 | static bool init_xf86_dga(int width, int
705		the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
706		memset(the_buffer, 0, the_buffer_size);
707		}
708	<	#elif ENABLE_VOSF
708	>	#elif defined(ENABLE_VOSF)
709		// The UAE memory handlers will already handle color conversion, if needed.
710		use_vosf = false;
711		#endif
#	Line 1743 | Line 1745 | static void update_display_static(void)
1745		// Check for first column from left and first column from right that have changed
1746		if (high) {
1747		if (depth == 1) {
1748	<	x1 = VideoMonitor.x;
1748	>	x1 = VideoMonitor.x - 1;
1749		for (j=y1; j<=y2; j++) {
1750		p = &the_buffer[j * bytes_per_row];
1751		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1905 | Line 1907 | static void video_refresh_dga(void)
1907		handle_palette_changes(depth, DISPLAY_DGA);
1908		}
1909
1910	+	#ifdef ENABLE_VOSF
1911		#if REAL_ADDRESSING || DIRECT_ADDRESSING
1912		static void video_refresh_dga_vosf(void)
1913		{
#	Line 1932 | Line 1935 | static void video_refresh_dga_vosf(void)
1935		}
1936		#endif
1937
1935	–	#ifdef ENABLE_VOSF
1938		static void video_refresh_window_vosf(void)
1939		{
1940		// Quit DGA mode if requested
#	Line 1957 | Line 1959 | static void video_refresh_window_vosf(vo
1959		#endif
1960		}
1961		}
1962	<	#endif
1962	>	#endif // def ENABLE_VOSF
1963
1964		static void video_refresh_window_static(void)
1965		{
#	Line 1998 | Line 2000 | void VideoRefreshInit(void)
2000		{
2001		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2002		if (display_type == DISPLAY_DGA) {
2003	<	#if REAL_ADDRESSING || DIRECT_ADDRESSING
2003	>	#if ENABLE_VOSF && (REAL_ADDRESSING || DIRECT_ADDRESSING)
2004		if (use_vosf)
2005		video_refresh = video_refresh_dga_vosf;
2006		else

Diff Legend

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