ViewVC Help

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

root/cebix/BasiliskII/src/Unix/video_vosf.h

Comparing BasiliskII/src/Unix/video_vosf.h (file contents):
Revision 1.26 by cebix, 2001-07-06T20:49:48Z vs.
Revision 1.54 by gbeauche, 2005-06-25T11:40:29Z

#	Line 1 | Line 1
1		/*
2		*  video_vosf.h - Video/graphics emulation, video on SEGV signals support
3		*
4	<	*  Basilisk II (C) 1997-2001 Christian Bauer
4	>	*  Basilisk II (C) 1997-2005 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 21 | Line 21
21		#ifndef VIDEO_VOSF_H
22		#define VIDEO_VOSF_H
23
24	<	// Note: this file is #include'd in video_x.cpp
24	>	// Note: this file must be #include'd only in video_x.cpp
25		#ifdef ENABLE_VOSF
26
27	–	#include <fcntl.h>
28	–	#include <sys/mman.h>
27		#include "sigsegv.h"
28		#include "vm_alloc.h"
29	+	#ifdef _WIN32
30	+	#include "util_windows.h"
31	+	#endif
32
33	<	#ifdef ENABLE_MON
34	<	# include "mon.h"
33	>	// Glue for SDL and X11 support
34	>	#ifdef USE_SDL_VIDEO
35	>	#define MONITOR_INIT                    SDL_monitor_desc &monitor
36	>	#define VIDEO_DRV_WIN_INIT              driver_window *drv
37	>	#define VIDEO_DRV_DGA_INIT              driver_fullscreen *drv
38	>	#define VIDEO_DRV_LOCK_PIXELS   if (SDL_MUSTLOCK(drv->s)) SDL_LockSurface(drv->s)
39	>	#define VIDEO_DRV_UNLOCK_PIXELS if (SDL_MUSTLOCK(drv->s)) SDL_UnlockSurface(drv->s)
40	>	#define VIDEO_DRV_DEPTH                 drv->s->format->BitsPerPixel
41	>	#define VIDEO_DRV_WIDTH                 drv->s->w
42	>	#define VIDEO_DRV_HEIGHT                drv->s->h
43	>	#define VIDEO_DRV_ROW_BYTES             drv->s->pitch
44	>	#else
45	>	#ifdef SHEEPSHAVER
46	>	#define MONITOR_INIT                    /* nothing */
47	>	#define VIDEO_DRV_WIN_INIT              /* nothing */
48	>	#define VIDEO_DRV_DGA_INIT              /* nothing */
49	>	#define VIDEO_DRV_WINDOW                the_win
50	>	#define VIDEO_DRV_GC                    the_gc
51	>	#define VIDEO_DRV_IMAGE                 img
52	>	#define VIDEO_DRV_HAVE_SHM              have_shm
53	>	#else
54	>	#define MONITOR_INIT                    X11_monitor_desc &monitor
55	>	#define VIDEO_DRV_WIN_INIT              driver_window *drv
56	>	#define VIDEO_DRV_DGA_INIT              driver_dga *drv
57	>	#define VIDEO_DRV_WINDOW                drv->w
58	>	#define VIDEO_DRV_GC                    drv->gc
59	>	#define VIDEO_DRV_IMAGE                 drv->img
60	>	#define VIDEO_DRV_HAVE_SHM              drv->have_shm
61	>	#endif
62	>	#define VIDEO_DRV_LOCK_PIXELS   /* nothing */
63	>	#define VIDEO_DRV_UNLOCK_PIXELS /* nothing */
64	>	#define VIDEO_DRV_DEPTH                 VIDEO_DRV_IMAGE->depth
65	>	#define VIDEO_DRV_WIDTH                 VIDEO_DRV_IMAGE->width
66	>	#define VIDEO_DRV_HEIGHT                VIDEO_DRV_IMAGE->height
67	>	#define VIDEO_DRV_ROW_BYTES             VIDEO_DRV_IMAGE->bytes_per_line
68		#endif
69
70		// Variables for Video on SEGV support
71		static uint8 *the_host_buffer;  // Host frame buffer in VOSF mode
38	–	static uint32 the_buffer_size;  // Size of allocated the_buffer
72
73		struct ScreenPageInfo {
74		int top, bottom;                    // Mapping between this virtual page and Mac scanlines
75		};
76
77		struct ScreenInfo {
45	–	uintptr memBase;                    // Real start address
78		uintptr memStart;                   // Start address aligned to page boundary
47	–	uintptr memEnd;                             // Address of one-past-the-end of the screen
79		uint32 memLength;                   // Length of the memory addressed by the screen pages
80
81	<	uint32 pageSize;                    // Size of a page
81	>	uintptr pageSize;                   // Size of a page
82		int pageBits;                               // Shift count to get the page number
83		uint32 pageCount;                   // Number of pages allocated to the screen
84
85		bool dirty;                                     // Flag: set if the frame buffer was touched
86	+	bool very_dirty;                        // Flag: set if the frame buffer was completely modified (e.g. colormap changes)
87		char * dirtyPages;                  // Table of flags set if page was altered
88		ScreenPageInfo * pageInfo;  // Table of mappings page -> Mac scanlines
89		};
#	Line 97 | Line 129 | static ScreenInfo mainBuffer;
129		#define PFLAG_CLEAR_ALL do { \
130		PFLAG_CLEAR_RANGE(0, mainBuffer.pageCount); \
131		mainBuffer.dirty = false; \
132	+	mainBuffer.very_dirty = false; \
133	+	} while (0)
134	+
135	+	#define PFLAG_SET_VERY_DIRTY do { \
136	+	mainBuffer.very_dirty = true; \
137		} while (0)
138
139		// Set the following macro definition to 1 if your system
#	Line 131 | Line 168 | static inline int find_next_page_clear(i
168		#endif
169		}
170
171	<	#ifdef HAVE_PTHREADS
171	>	#if defined(HAVE_PTHREADS)
172		static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer (dirtyPages in fact)
173		#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
174		#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
175	+	#elif defined(_WIN32)
176	+	static mutex_t vosf_lock;                                                                               // Mutex to protect frame buffer (dirtyPages in fact)
177	+	#define LOCK_VOSF vosf_lock.lock();
178	+	#define UNLOCK_VOSF vosf_lock.unlock();
179	+	#elif defined(HAVE_SPINLOCKS)
180	+	static spinlock_t vosf_lock = SPIN_LOCK_UNLOCKED;                               // Mutex to protect frame buffer (dirtyPages in fact)
181	+	#define LOCK_VOSF spin_lock(&vosf_lock)
182	+	#define UNLOCK_VOSF spin_unlock(&vosf_lock)
183		#else
184		#define LOCK_VOSF
185		#define UNLOCK_VOSF
#	Line 154 | Line 199 | static int log_base_2(uint32 x)
199		// Extend size to page boundary
200		static uint32 page_extend(uint32 size)
201		{
202	<	const uint32 page_size = getpagesize();
202	>	const uint32 page_size = vm_get_page_size();
203		const uint32 page_mask = page_size - 1;
204		return (size + page_mask) & ~page_mask;
205		}
206
207
208		/*
209	<	*  Initialize mainBuffer structure
209	>	*  Check if VOSF acceleration is profitable on this platform
210		*/
211
212	<	static bool video_init_buffer(void)
212	>	const int VOSF_PROFITABLE_TRIES = 3;                    // Make 3 attempts for full screen update
213	>	const int VOSF_PROFITABLE_THRESHOLD = 16667;    // 60 Hz
214	>
215	>	static bool video_vosf_profitable(void)
216		{
217	<	if (use_vosf) {
218	<	const uint32 page_size  = getpagesize();
219	<	const uint32 page_mask  = page_size - 1;
220	<
221	<	mainBuffer.memBase      = (uintptr) the_buffer;
222	<	// Round up frame buffer base to page boundary
223	<	mainBuffer.memStart             = (uintptr)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
224	<	mainBuffer.memLength    = the_buffer_size;
177	<	mainBuffer.memEnd       = mainBuffer.memStart + mainBuffer.memLength;
178	<
179	<	mainBuffer.pageSize     = page_size;
180	<	mainBuffer.pageCount    = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
181	<	mainBuffer.pageBits     = log_base_2(mainBuffer.pageSize);
182	<
183	<	if (mainBuffer.dirtyPages) {
184	<	free(mainBuffer.dirtyPages);
185	<	mainBuffer.dirtyPages = NULL;
217	>	int64 durations[VOSF_PROFITABLE_TRIES];
218	>	int mean_duration = 0;
219	>
220	>	for (int i = 0; i < VOSF_PROFITABLE_TRIES; i++) {
221	>	uint64 start = GetTicks_usec();
222	>	for (int p = 0; p < mainBuffer.pageCount; p++) {
223	>	uint8 *addr = (uint8 *)(mainBuffer.memStart + (p * mainBuffer.pageSize));
224	>	addr[0] = 0; // Trigger Screen_fault_handler()
225		}
226	+	int64 duration = GetTicks_usec() - start;
227	+	mean_duration += duration;
228	+	durations[i] = duration;
229
230	<	mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2);
230	>	PFLAG_CLEAR_ALL;
231	>	mainBuffer.dirty = false;
232	>	if (vm_protect((char *)mainBuffer.memStart, mainBuffer.memLength, VM_PAGE_READ) != 0)
233	>	return false;
234	>	}
235
236	<	if (mainBuffer.pageInfo) {
237	<	free(mainBuffer.pageInfo);
238	<	mainBuffer.pageInfo = NULL;
239	<	}
236	>	mean_duration /= VOSF_PROFITABLE_TRIES;
237	>	D(bug("Triggered %d screen faults in %ld usec on average\n", mainBuffer.pageCount, mean_duration));
238	>	return (mean_duration < (VOSF_PROFITABLE_THRESHOLD * (frame_skip ? frame_skip : 1)));
239	>	}
240
195	–	mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo));
241
242	<	if ((mainBuffer.dirtyPages == NULL) || (mainBuffer.pageInfo == NULL))
243	<	return false;
244	<
200	<	mainBuffer.dirty = false;
242	>	/*
243	>	*  Initialize the VOSF system (mainBuffer structure, SIGSEGV handler)
244	>	*/
245
246	<	PFLAG_CLEAR_ALL;
247	<	// Safety net to insure the loops in the update routines will terminate
248	<	// See "How can we deal with array overrun conditions ?" hereunder for further details
249	<	PFLAG_CLEAR(mainBuffer.pageCount);
250	<	PFLAG_SET(mainBuffer.pageCount+1);
251	<
252	<	uint32 a = 0;
253	<	for (int i = 0; i < mainBuffer.pageCount; i++) {
254	<	int y1 = a / VideoMonitor.mode.bytes_per_row;
255	<	if (y1 >= VideoMonitor.mode.y)
256	<	y1 = VideoMonitor.mode.y - 1;
257	<
258	<	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.mode.bytes_per_row;
259	<	if (y2 >= VideoMonitor.mode.y)
260	<	y2 = VideoMonitor.mode.y - 1;
261	<
262	<	mainBuffer.pageInfo[i].top = y1;
263	<	mainBuffer.pageInfo[i].bottom = y2;
264	<
265	<	a += mainBuffer.pageSize;
266	<	if (a > mainBuffer.memLength)
267	<	a = mainBuffer.memLength;
268	<	}
246	>	static bool video_vosf_init(MONITOR_INIT)
247	>	{
248	>	VIDEO_MODE_INIT_MONITOR;
249	>
250	>	const uintptr page_size = vm_get_page_size();
251	>	const uintptr page_mask = page_size - 1;
252	>
253	>	// Round up frame buffer base to page boundary
254	>	mainBuffer.memStart = (((uintptr) the_buffer) + page_mask) & ~page_mask;
255	>
256	>	// The frame buffer size shall already be aligned to page boundary (use page_extend)
257	>	mainBuffer.memLength = the_buffer_size;
258	>
259	>	mainBuffer.pageSize = page_size;
260	>	mainBuffer.pageBits = log_base_2(mainBuffer.pageSize);
261	>	mainBuffer.pageCount =  (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
262	>
263	>	// The "2" more bytes requested are a safety net to insure the
264	>	// loops in the update routines will terminate.
265	>	// See "How can we deal with array overrun conditions ?" hereunder for further details.
266	>	mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2);
267	>	if (mainBuffer.dirtyPages == NULL)
268	>	return false;
269
270	<	// We can now write-protect the frame buffer
271	<	if (vm_protect((char *)mainBuffer.memStart, mainBuffer.memLength, VM_PAGE_READ) != 0)
272	<	return false;
270	>	PFLAG_CLEAR_ALL;
271	>	PFLAG_CLEAR(mainBuffer.pageCount);
272	>	PFLAG_SET(mainBuffer.pageCount+1);
273	>
274	>	// Allocate and fill in pageInfo with start and end (inclusive) row in number of bytes
275	>	mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo));
276	>	if (mainBuffer.pageInfo == NULL)
277	>	return false;
278	>
279	>	uint32 a = 0;
280	>	for (unsigned i = 0; i < mainBuffer.pageCount; i++) {
281	>	unsigned y1 = a / VIDEO_MODE_ROW_BYTES;
282	>	if (y1 >= VIDEO_MODE_Y)
283	>	y1 = VIDEO_MODE_Y - 1;
284	>
285	>	unsigned y2 = (a + mainBuffer.pageSize) / VIDEO_MODE_ROW_BYTES;
286	>	if (y2 >= VIDEO_MODE_Y)
287	>	y2 = VIDEO_MODE_Y - 1;
288	>
289	>	mainBuffer.pageInfo[i].top = y1;
290	>	mainBuffer.pageInfo[i].bottom = y2;
291	>
292	>	a += mainBuffer.pageSize;
293	>	if (a > mainBuffer.memLength)
294	>	a = mainBuffer.memLength;
295		}
296	+
297	+	// We can now write-protect the frame buffer
298	+	if (vm_protect((char *)mainBuffer.memStart, mainBuffer.memLength, VM_PAGE_READ) != 0)
299	+	return false;
300	+
301	+	// The frame buffer is sane, i.e. there is no write to it yet
302	+	mainBuffer.dirty = false;
303		return true;
304		}
305
306
307		/*
308	+	* Deinitialize VOSF system
309	+	*/
310	+
311	+	static void video_vosf_exit(void)
312	+	{
313	+	if (mainBuffer.pageInfo) {
314	+	free(mainBuffer.pageInfo);
315	+	mainBuffer.pageInfo = NULL;
316	+	}
317	+	if (mainBuffer.dirtyPages) {
318	+	free(mainBuffer.dirtyPages);
319	+	mainBuffer.dirtyPages = NULL;
320	+	}
321	+	}
322	+
323	+
324	+	/*
325		* Screen fault handler
326		*/
327
328	<	static bool screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
328	>	bool Screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
329		{
240	–	//      D(bug("screen_fault_handler: ADDR=0x%08X from IP=0x%08X\n", fault_address, fault_instruction));
330		const uintptr addr = (uintptr)fault_address;
331
332		/* Someone attempted to write to the frame buffer. Make it writeable
333		* now so that the data could actually be written to. It will be made
334		* read-only back in one of the screen update_*() functions.
335		*/
336	<	if ((addr >= mainBuffer.memStart) && (addr < mainBuffer.memEnd)) {
337	<	const int page  = (addr - mainBuffer.memStart) >> mainBuffer.pageBits;
249	<	caddr_t page_ad = (caddr_t)(addr & -mainBuffer.pageSize);
336	>	if (((uintptr)addr - mainBuffer.memStart) < mainBuffer.memLength) {
337	>	const int page  = ((uintptr)addr - mainBuffer.memStart) >> mainBuffer.pageBits;
338		LOCK_VOSF;
339		PFLAG_SET(page);
340	<	vm_protect((char *)page_ad, mainBuffer.pageSize, VM_PAGE_READ | VM_PAGE_WRITE);
340	>	vm_protect((char *)(addr & -mainBuffer.pageSize), mainBuffer.pageSize, VM_PAGE_READ | VM_PAGE_WRITE);
341		mainBuffer.dirty = true;
342		UNLOCK_VOSF;
343		return true;
344		}
345
346		/* Otherwise, we don't know how to handle the fault, let it crash */
259	–	fprintf(stderr, "do_handle_screen_fault: unhandled address 0x%08X", addr);
260	–	if (fault_instruction != SIGSEGV_INVALID_PC)
261	–	fprintf(stderr, " [IP=0x%08X]", fault_instruction);
262	–	fprintf(stderr, "\n");
263	–	#if EMULATED_68K
264	–	uaecptr nextpc;
265	–	extern void m68k_dumpstate(uaecptr *nextpc);
266	–	m68k_dumpstate(&nextpc);
267	–	#endif
268	–	VideoQuitFullScreen();
269	–	#ifdef ENABLE_MON
270	–	char *arg[4] = {"mon", "-m", "-r", NULL};
271	–	mon(3, arg);
272	–	QuitEmulator();
273	–	#endif
347		return false;
348		}
349
#	Line 279 | Line 352 | static bool screen_fault_handler(sigsegv
352		*      Update display for Windowed mode and VOSF
353		*/
354
282	–	// From video_blit.cpp
283	–	extern void (*Screen_blit)(uint8 * dest, const uint8 * source, uint32 length);
284	–	extern bool Screen_blitter_init(XVisualInfo * visual_info, bool native_byte_order, video_depth mac_depth);
285	–	extern uint32 ExpandMap[256];
286	–
355		/*      How can we deal with array overrun conditions ?
356
357		The state of the framebuffer pages that have been touched are maintained
#	Line 317 | Line 385 | There are two cases to check:
385		than pageCount.
386		*/
387
388	<	static inline void update_display_window_vosf(driver_window *drv)
388	>	static void update_display_window_vosf(VIDEO_DRV_WIN_INIT)
389		{
390	+	VIDEO_MODE_INIT;
391	+
392		int page = 0;
393		for (;;) {
394	<	const int first_page = find_next_page_set(page);
394	>	const unsigned first_page = find_next_page_set(page);
395		if (first_page >= mainBuffer.pageCount)
396		break;
397
#	Line 337 | Line 407 | static inline void update_display_window
407		const int y1 = mainBuffer.pageInfo[first_page].top;
408		const int y2 = mainBuffer.pageInfo[page - 1].bottom;
409		const int height = y2 - y1 + 1;
340	–
341	–	if (VideoMonitor.mode.depth < VDEPTH_8BIT) {
342	–
343	–	// Update the_host_buffer and copy of the_buffer
344	–	const int src_bytes_per_row = VideoMonitor.mode.bytes_per_row;
345	–	const int dst_bytes_per_row = drv->img->bytes_per_line;
346	–	const int pixels_per_byte = VideoMonitor.mode.x / src_bytes_per_row;
347	–	int i1 = y1 * src_bytes_per_row, i2 = y1 * dst_bytes_per_row, j;
348	–	for (j = y1; j <= y2; j++) {
349	–	Screen_blit(the_host_buffer + i2, the_buffer + i1, VideoMonitor.mode.x / pixels_per_byte);
350	–	i1 += src_bytes_per_row;
351	–	i2 += dst_bytes_per_row;
352	–	}
410
411	<	} else {
412	<
413	<	// Update the_host_buffer and copy of the_buffer
414	<	const int src_bytes_per_row = VideoMonitor.mode.bytes_per_row;
415	<	const int dst_bytes_per_row = drv->img->bytes_per_line;
416	<	const int bytes_per_pixel = src_bytes_per_row / VideoMonitor.mode.x;
417	<	int i1 = y1 * src_bytes_per_row, i2 = y1 * dst_bytes_per_row, j;
418	<	for (j = y1; j <= y2; j++) {
419	<	Screen_blit(the_host_buffer + i2, the_buffer + i1, bytes_per_pixel * VideoMonitor.mode.x);
363	<	i1 += src_bytes_per_row;
364	<	i2 += dst_bytes_per_row;
365	<	}
411	>	// Update the_host_buffer
412	>	VIDEO_DRV_LOCK_PIXELS;
413	>	const int src_bytes_per_row = VIDEO_MODE_ROW_BYTES;
414	>	const int dst_bytes_per_row = VIDEO_DRV_ROW_BYTES;
415	>	int i1 = y1 * src_bytes_per_row, i2 = y1 * dst_bytes_per_row, j;
416	>	for (j = y1; j <= y2; j++) {
417	>	Screen_blit(the_host_buffer + i2, the_buffer + i1, src_bytes_per_row);
418	>	i1 += src_bytes_per_row;
419	>	i2 += dst_bytes_per_row;
420		}
421	+	VIDEO_DRV_UNLOCK_PIXELS;
422
423	<	if (drv->have_shm)
424	<	XShmPutImage(x_display, drv->w, drv->gc, drv->img, 0, y1, 0, y1, VideoMonitor.mode.x, height, 0);
423	>	#ifdef USE_SDL_VIDEO
424	>	SDL_UpdateRect(drv->s, 0, y1, VIDEO_MODE_X, height);
425	>	#else
426	>	if (VIDEO_DRV_HAVE_SHM)
427	>	XShmPutImage(x_display, VIDEO_DRV_WINDOW, VIDEO_DRV_GC, VIDEO_DRV_IMAGE, 0, y1, 0, y1, VIDEO_MODE_X, height, 0);
428		else
429	<	XPutImage(x_display, drv->w, drv->gc, drv->img, 0, y1, 0, y1, VideoMonitor.mode.x, height);
429	>	XPutImage(x_display, VIDEO_DRV_WINDOW, VIDEO_DRV_GC, VIDEO_DRV_IMAGE, 0, y1, 0, y1, VIDEO_MODE_X, height);
430	>	#endif
431		}
432		mainBuffer.dirty = false;
433		}
#	Line 380 | Line 439 | static inline void update_display_window
439		*/
440
441		#if REAL_ADDRESSING || DIRECT_ADDRESSING
442	<	static inline void update_display_dga_vosf(void)
442	>	static void update_display_dga_vosf(VIDEO_DRV_DGA_INIT)
443		{
444	<	int page = 0;
444	>	VIDEO_MODE_INIT;
445	>
446	>	// Compute number of bytes per row, take care to virtual screens
447	>	const int src_bytes_per_row = VIDEO_MODE_ROW_BYTES;
448	>	const int dst_bytes_per_row = TrivialBytesPerRow(VIDEO_MODE_X, DepthModeForPixelDepth(VIDEO_DRV_DEPTH));
449	>	const int scr_bytes_per_row = VIDEO_DRV_ROW_BYTES;
450	>	assert(dst_bytes_per_row <= scr_bytes_per_row);
451	>	const int scr_bytes_left = scr_bytes_per_row - dst_bytes_per_row;
452	>
453	>	// Full screen update requested?
454	>	if (mainBuffer.very_dirty) {
455	>	PFLAG_CLEAR_ALL;
456	>	vm_protect((char *)mainBuffer.memStart, mainBuffer.memLength, VM_PAGE_READ);
457	>	memcpy(the_buffer_copy, the_buffer, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
458	>	VIDEO_DRV_LOCK_PIXELS;
459	>	int i1 = 0, i2 = 0;
460	>	for (int j = 0;  j < VIDEO_MODE_Y; j++) {
461	>	Screen_blit(the_host_buffer + i2, the_buffer + i1, src_bytes_per_row);
462	>	i1 += src_bytes_per_row;
463	>	i2 += scr_bytes_per_row;
464	>	}
465	>	#ifdef USE_SDL_VIDEO
466	>	SDL_UpdateRect(drv->s, 0, 0, VIDEO_MODE_X, VIDEO_MODE_Y);
467	>	#endif
468	>	VIDEO_DRV_UNLOCK_PIXELS;
469	>	return;
470	>	}
471	>
472	>	// Setup partial blitter (use 64-pixel wide chunks)
473	>	const int n_pixels = 64;
474	>	const int n_chunks = VIDEO_MODE_X / n_pixels;
475	>	const int n_pixels_left = VIDEO_MODE_X - (n_chunks * n_pixels);
476	>	const int src_chunk_size = src_bytes_per_row / n_chunks;
477	>	const int dst_chunk_size = dst_bytes_per_row / n_chunks;
478	>	const int src_chunk_size_left = src_bytes_per_row - (n_chunks * src_chunk_size);
479	>	const int dst_chunk_size_left = dst_bytes_per_row - (n_chunks * dst_chunk_size);
480	>
481	>	int page = 0, last_scanline = -1;
482		for (;;) {
483	<	const int first_page = find_next_page_set(page);
483	>	const unsigned first_page = find_next_page_set(page);
484		if (first_page >= mainBuffer.pageCount)
485		break;
486
#	Line 395 | Line 491 | static inline void update_display_dga_vo
491		const int32 offset  = first_page << mainBuffer.pageBits;
492		const uint32 length = (page - first_page) << mainBuffer.pageBits;
493		vm_protect((char *)mainBuffer.memStart + offset, length, VM_PAGE_READ);
494	<
495	<	// I am sure that y2 >= y1 and depth != 1
496	<	const int y1 = mainBuffer.pageInfo[first_page].top;
497	<	const int y2 = mainBuffer.pageInfo[page - 1].bottom;
498	<
499	<	const int bytes_per_row = VideoMonitor.mode.bytes_per_row;
500	<	const int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
501	<	int i, j;
502	<
503	<	// Check for first column from left and first column
504	<	// from right that have changed
505	<	int x1 = VideoMonitor.mode.x * bytes_per_pixel - 1;
506	<	for (j = y1; j <= y2; j++) {
507	<	uint8 * const p1 = &the_buffer[j * bytes_per_row];
508	<	uint8 * const p2 = &the_buffer_copy[j * bytes_per_row];
509	<	for (i = 0; i < x1; i++) {
510	<	if (p1[i] != p2[i]) {
511	<	x1 = i;
512	<	break;
494	>
495	>	// Optimized for scanlines, don't process overlapping lines again
496	>	int y1 = mainBuffer.pageInfo[first_page].top;
497	>	int y2 = mainBuffer.pageInfo[page - 1].bottom;
498	>	if (y1 <= last_scanline && ++y1 >= VIDEO_MODE_Y)
499	>	continue;
500	>	if (y2 <= last_scanline && ++y2 >= VIDEO_MODE_Y)
501	>	continue;
502	>	last_scanline = y2;
503	>
504	>	// Update the_host_buffer and copy of the_buffer, one line at a time
505	>	int i1 = y1 * src_bytes_per_row;
506	>	int i2 = y1 * scr_bytes_per_row;
507	>	#ifdef USE_SDL_VIDEO
508	>	int bbi = 0;
509	>	SDL_Rect bb[3] = {
510	>	{ VIDEO_MODE_X, y1, 0, 0 },
511	>	{ VIDEO_MODE_X, -1, 0, 0 },
512	>	{ VIDEO_MODE_X, -1, 0, 0 }
513	>	};
514	>	#endif
515	>	VIDEO_DRV_LOCK_PIXELS;
516	>	for (int j = y1; j <= y2; j++) {
517	>	for (int i = 0; i < n_chunks; i++) {
518	>	if (memcmp(the_buffer_copy + i1, the_buffer + i1, src_chunk_size) != 0) {
519	>	memcpy(the_buffer_copy + i1, the_buffer + i1, src_chunk_size);
520	>	Screen_blit(the_host_buffer + i2, the_buffer + i1, src_chunk_size);
521	>	#ifdef USE_SDL_VIDEO
522	>	const int x = i * n_pixels;
523	>	if (x < bb[bbi].x) {
524	>	if (bb[bbi].w)
525	>	bb[bbi].w += bb[bbi].x - x;
526	>	else
527	>	bb[bbi].w = n_pixels;
528	>	bb[bbi].x = x;
529	>	}
530	>	else if (x >= bb[bbi].x + bb[bbi].w)
531	>	bb[bbi].w = x + n_pixels - bb[bbi].x;
532	>	#endif
533		}
534	+	i1 += src_chunk_size;
535	+	i2 += dst_chunk_size;
536		}
537	<	}
538	<	x1 /= bytes_per_pixel;
539	<
540	<	int x2 = x1 * bytes_per_pixel;
541	<	for (j = y2; j >= y1; j--) {
542	<	uint8 * const p1 = &the_buffer[j * bytes_per_row];
543	<	uint8 * const p2 = &the_buffer_copy[j * bytes_per_row];
544	<	for (i = VideoMonitor.mode.x * bytes_per_pixel - 1; i > x2; i--) {
545	<	if (p1[i] != p2[i]) {
546	<	x2 = i;
547	<	break;
537	>	if (src_chunk_size_left && dst_chunk_size_left) {
538	>	if (memcmp(the_buffer_copy + i1, the_buffer + i1, src_chunk_size_left) != 0) {
539	>	memcpy(the_buffer_copy + i1, the_buffer + i1, src_chunk_size_left);
540	>	Screen_blit(the_host_buffer + i2, the_buffer + i1, src_chunk_size_left);
541	>	}
542	>	i1 += src_chunk_size_left;
543	>	i2 += dst_chunk_size_left;
544	>	#ifdef USE_SDL_VIDEO
545	>	const int x = n_chunks * n_pixels;
546	>	if (x < bb[bbi].x) {
547	>	if (bb[bbi].w)
548	>	bb[bbi].w += bb[bbi].x - x;
549	>	else
550	>	bb[bbi].w = n_pixels_left;
551	>	bb[bbi].x = x;
552		}
553	+	else if (x >= bb[bbi].x + bb[bbi].w)
554	+	bb[bbi].w  = x + n_pixels_left - bb[bbi].x;
555	+	#endif
556		}
557	+	i2 += scr_bytes_left;
558	+	#ifdef USE_SDL_VIDEO
559	+	bb[bbi].h++;
560	+	if (bb[bbi].w && (j == y1 || j == y2 - 1 || j == y2)) {
561	+	bbi++;
562	+	assert(bbi <= 3);
563	+	if (j != y2)
564	+	bb[bbi].y = j + 1;
565	+	}
566	+	#endif
567		}
568	<	x2 /= bytes_per_pixel;
569	<
570	<	// Update the_host_buffer and copy of the_buffer
571	<	// There should be at least one pixel to copy
437	<	const int width = x2 - x1 + 1;
438	<	i = y1 * bytes_per_row + x1 * bytes_per_pixel;
439	<	for (j = y1; j <= y2; j++) {
440	<	Screen_blit(the_host_buffer + i, the_buffer + i, bytes_per_pixel * width);
441	<	memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * width);
442	<	i += bytes_per_row;
443	<	}
568	>	#ifdef USE_SDL_VIDEO
569	>	SDL_UpdateRects(drv->s, bbi, bb);
570	>	#endif
571	>	VIDEO_DRV_UNLOCK_PIXELS;
572		}
573		mainBuffer.dirty = false;
574		}

Diff Legend

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