| 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-2004 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 |
| 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> |
| 29 |
|
#include "sigsegv.h" |
| 30 |
|
#include "vm_alloc.h" |
| 31 |
|
|
| 32 |
< |
#ifdef ENABLE_MON |
| 33 |
< |
# include "mon.h" |
| 32 |
> |
// Glue for SDL and X11 support |
| 33 |
> |
#ifdef USE_SDL_VIDEO |
| 34 |
> |
#define MONITOR_INIT SDL_monitor_desc &monitor |
| 35 |
> |
#define VIDEO_DRV_INIT driver_window *drv |
| 36 |
> |
#define VIDEO_DRV_ROW_BYTES drv->s->pitch |
| 37 |
> |
#define VIDEO_DRV_LOCK_PIXELS if (SDL_MUSTLOCK(drv->s)) SDL_LockSurface(drv->s) |
| 38 |
> |
#define VIDEO_DRV_UNLOCK_PIXELS if (SDL_MUSTLOCK(drv->s)) SDL_UnlockSurface(drv->s) |
| 39 |
> |
#else |
| 40 |
> |
#ifdef SHEEPSHAVER |
| 41 |
> |
#define MONITOR_INIT /* nothing */ |
| 42 |
> |
#define VIDEO_DRV_INIT /* nothing */ |
| 43 |
> |
#define VIDEO_DRV_WINDOW the_win |
| 44 |
> |
#define VIDEO_DRV_GC the_gc |
| 45 |
> |
#define VIDEO_DRV_IMAGE img |
| 46 |
> |
#define VIDEO_DRV_HAVE_SHM have_shm |
| 47 |
> |
#else |
| 48 |
> |
#define MONITOR_INIT X11_monitor_desc &monitor |
| 49 |
> |
#define VIDEO_DRV_INIT driver_window *drv |
| 50 |
> |
#define VIDEO_DRV_WINDOW drv->w |
| 51 |
> |
#define VIDEO_DRV_GC drv->gc |
| 52 |
> |
#define VIDEO_DRV_IMAGE drv->img |
| 53 |
> |
#define VIDEO_DRV_HAVE_SHM drv->have_shm |
| 54 |
> |
#endif |
| 55 |
> |
#define VIDEO_DRV_LOCK_PIXELS /* nothing */ |
| 56 |
> |
#define VIDEO_DRV_UNLOCK_PIXELS /* nothing */ |
| 57 |
> |
#define VIDEO_DRV_ROW_BYTES VIDEO_DRV_IMAGE->bytes_per_line |
| 58 |
|
#endif |
| 59 |
|
|
| 60 |
|
// Variables for Video on SEGV support |
| 61 |
|
static uint8 *the_host_buffer; // Host frame buffer in VOSF mode |
| 38 |
– |
static uint32 the_buffer_size; // Size of allocated the_buffer |
| 62 |
|
|
| 63 |
|
struct ScreenPageInfo { |
| 64 |
|
int top, bottom; // Mapping between this virtual page and Mac scanlines |
| 65 |
|
}; |
| 66 |
|
|
| 67 |
|
struct ScreenInfo { |
| 45 |
– |
uintptr memBase; // Real start address |
| 68 |
|
uintptr memStart; // Start address aligned to page boundary |
| 47 |
– |
uintptr memEnd; // Address of one-past-the-end of the screen |
| 69 |
|
uint32 memLength; // Length of the memory addressed by the screen pages |
| 70 |
|
|
| 71 |
< |
uint32 pageSize; // Size of a page |
| 71 |
> |
uintptr pageSize; // Size of a page |
| 72 |
|
int pageBits; // Shift count to get the page number |
| 73 |
|
uint32 pageCount; // Number of pages allocated to the screen |
| 74 |
|
|
| 152 |
|
#endif |
| 153 |
|
} |
| 154 |
|
|
| 155 |
< |
#ifdef HAVE_PTHREADS |
| 155 |
> |
#ifdef HAVE_SPINLOCKS |
| 156 |
> |
static spinlock_t vosf_lock = SPIN_LOCK_UNLOCKED; // Mutex to protect frame buffer (dirtyPages in fact) |
| 157 |
> |
#define LOCK_VOSF spin_lock(&vosf_lock) |
| 158 |
> |
#define UNLOCK_VOSF spin_unlock(&vosf_lock) |
| 159 |
> |
#elif defined(HAVE_PTHREADS) |
| 160 |
|
static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact) |
| 161 |
|
#define LOCK_VOSF pthread_mutex_lock(&vosf_lock); |
| 162 |
|
#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock); |
| 186 |
|
|
| 187 |
|
|
| 188 |
|
/* |
| 189 |
< |
* Initialize mainBuffer structure |
| 189 |
> |
* Check if VOSF acceleration is profitable on this platform |
| 190 |
|
*/ |
| 191 |
|
|
| 192 |
< |
static bool video_init_buffer(void) |
| 192 |
> |
const int VOSF_PROFITABLE_THRESHOLD = 8000; // 8 ms, aka (60 Hz / 2) for work processing |
| 193 |
> |
|
| 194 |
> |
static bool video_vosf_profitable(void) |
| 195 |
|
{ |
| 196 |
< |
if (use_vosf) { |
| 170 |
< |
const uint32 page_size = getpagesize(); |
| 171 |
< |
const uint32 page_mask = page_size - 1; |
| 172 |
< |
|
| 173 |
< |
mainBuffer.memBase = (uintptr) the_buffer; |
| 174 |
< |
// Round up frame buffer base to page boundary |
| 175 |
< |
mainBuffer.memStart = (uintptr)((((unsigned long) the_buffer) + page_mask) & ~page_mask); |
| 176 |
< |
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; |
| 186 |
< |
} |
| 196 |
> |
uint64 start = GetTicks_usec(); |
| 197 |
|
|
| 198 |
< |
mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2); |
| 198 |
> |
for (int i = 0; i < mainBuffer.pageCount; i++) { |
| 199 |
> |
uint8 *addr = (uint8 *)(mainBuffer.memStart + (i * mainBuffer.pageSize)); |
| 200 |
> |
memset(addr, 0, mainBuffer.pageSize); // Trigger Screen_fault_handler() |
| 201 |
> |
} |
| 202 |
|
|
| 203 |
< |
if (mainBuffer.pageInfo) { |
| 204 |
< |
free(mainBuffer.pageInfo); |
| 205 |
< |
mainBuffer.pageInfo = NULL; |
| 206 |
< |
} |
| 203 |
> |
uint64 end = GetTicks_usec(); |
| 204 |
> |
const int diff = end - start; |
| 205 |
> |
D(bug("Triggered %d screen faults in %ld usec\n", mainBuffer.pageCount, diff)); |
| 206 |
> |
|
| 207 |
> |
if (diff > (VOSF_PROFITABLE_THRESHOLD * (frame_skip + 1))) |
| 208 |
> |
return false; |
| 209 |
> |
|
| 210 |
> |
// Reset VOSF variables to initial state |
| 211 |
> |
PFLAG_CLEAR_ALL; |
| 212 |
> |
if (vm_protect((char *)mainBuffer.memStart, mainBuffer.memLength, VM_PAGE_READ) != 0) |
| 213 |
> |
return false; |
| 214 |
> |
mainBuffer.dirty = false; |
| 215 |
> |
return true; |
| 216 |
> |
} |
| 217 |
|
|
| 195 |
– |
mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo)); |
| 218 |
|
|
| 219 |
< |
if ((mainBuffer.dirtyPages == NULL) || (mainBuffer.pageInfo == NULL)) |
| 220 |
< |
return false; |
| 221 |
< |
|
| 200 |
< |
mainBuffer.dirty = false; |
| 219 |
> |
/* |
| 220 |
> |
* Initialize the VOSF system (mainBuffer structure, SIGSEGV handler) |
| 221 |
> |
*/ |
| 222 |
|
|
| 223 |
< |
PFLAG_CLEAR_ALL; |
| 224 |
< |
// Safety net to insure the loops in the update routines will terminate |
| 225 |
< |
// See "How can we deal with array overrun conditions ?" hereunder for further details |
| 226 |
< |
PFLAG_CLEAR(mainBuffer.pageCount); |
| 227 |
< |
PFLAG_SET(mainBuffer.pageCount+1); |
| 228 |
< |
|
| 229 |
< |
uint32 a = 0; |
| 230 |
< |
for (int i = 0; i < mainBuffer.pageCount; i++) { |
| 231 |
< |
int y1 = a / VideoMonitor.mode.bytes_per_row; |
| 232 |
< |
if (y1 >= VideoMonitor.mode.y) |
| 233 |
< |
y1 = VideoMonitor.mode.y - 1; |
| 234 |
< |
|
| 235 |
< |
int y2 = (a + mainBuffer.pageSize) / VideoMonitor.mode.bytes_per_row; |
| 236 |
< |
if (y2 >= VideoMonitor.mode.y) |
| 237 |
< |
y2 = VideoMonitor.mode.y - 1; |
| 238 |
< |
|
| 239 |
< |
mainBuffer.pageInfo[i].top = y1; |
| 240 |
< |
mainBuffer.pageInfo[i].bottom = y2; |
| 241 |
< |
|
| 242 |
< |
a += mainBuffer.pageSize; |
| 243 |
< |
if (a > mainBuffer.memLength) |
| 244 |
< |
a = mainBuffer.memLength; |
| 245 |
< |
} |
| 223 |
> |
static bool video_vosf_init(MONITOR_INIT) |
| 224 |
> |
{ |
| 225 |
> |
VIDEO_MODE_INIT; |
| 226 |
> |
|
| 227 |
> |
const uintptr page_size = getpagesize(); |
| 228 |
> |
const uintptr page_mask = page_size - 1; |
| 229 |
> |
|
| 230 |
> |
// Round up frame buffer base to page boundary |
| 231 |
> |
mainBuffer.memStart = (((uintptr) the_buffer) + page_mask) & ~page_mask; |
| 232 |
> |
|
| 233 |
> |
// The frame buffer size shall already be aligned to page boundary (use page_extend) |
| 234 |
> |
mainBuffer.memLength = the_buffer_size; |
| 235 |
> |
|
| 236 |
> |
mainBuffer.pageSize = page_size; |
| 237 |
> |
mainBuffer.pageBits = log_base_2(mainBuffer.pageSize); |
| 238 |
> |
mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize; |
| 239 |
> |
|
| 240 |
> |
// The "2" more bytes requested are a safety net to insure the |
| 241 |
> |
// loops in the update routines will terminate. |
| 242 |
> |
// See "How can we deal with array overrun conditions ?" hereunder for further details. |
| 243 |
> |
mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2); |
| 244 |
> |
if (mainBuffer.dirtyPages == NULL) |
| 245 |
> |
return false; |
| 246 |
|
|
| 247 |
< |
// We can now write-protect the frame buffer |
| 248 |
< |
if (vm_protect((char *)mainBuffer.memStart, mainBuffer.memLength, VM_PAGE_READ) != 0) |
| 249 |
< |
return false; |
| 247 |
> |
PFLAG_CLEAR_ALL; |
| 248 |
> |
PFLAG_CLEAR(mainBuffer.pageCount); |
| 249 |
> |
PFLAG_SET(mainBuffer.pageCount+1); |
| 250 |
> |
|
| 251 |
> |
// Allocate and fill in pageInfo with start and end (inclusive) row in number of bytes |
| 252 |
> |
mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo)); |
| 253 |
> |
if (mainBuffer.pageInfo == NULL) |
| 254 |
> |
return false; |
| 255 |
> |
|
| 256 |
> |
uint32 a = 0; |
| 257 |
> |
for (unsigned i = 0; i < mainBuffer.pageCount; i++) { |
| 258 |
> |
unsigned y1 = a / VIDEO_MODE_ROW_BYTES; |
| 259 |
> |
if (y1 >= VIDEO_MODE_Y) |
| 260 |
> |
y1 = VIDEO_MODE_Y - 1; |
| 261 |
> |
|
| 262 |
> |
unsigned y2 = (a + mainBuffer.pageSize) / VIDEO_MODE_ROW_BYTES; |
| 263 |
> |
if (y2 >= VIDEO_MODE_Y) |
| 264 |
> |
y2 = VIDEO_MODE_Y - 1; |
| 265 |
> |
|
| 266 |
> |
mainBuffer.pageInfo[i].top = y1; |
| 267 |
> |
mainBuffer.pageInfo[i].bottom = y2; |
| 268 |
> |
|
| 269 |
> |
a += mainBuffer.pageSize; |
| 270 |
> |
if (a > mainBuffer.memLength) |
| 271 |
> |
a = mainBuffer.memLength; |
| 272 |
|
} |
| 273 |
+ |
|
| 274 |
+ |
// We can now write-protect the frame buffer |
| 275 |
+ |
if (vm_protect((char *)mainBuffer.memStart, mainBuffer.memLength, VM_PAGE_READ) != 0) |
| 276 |
+ |
return false; |
| 277 |
+ |
|
| 278 |
+ |
// The frame buffer is sane, i.e. there is no write to it yet |
| 279 |
+ |
mainBuffer.dirty = false; |
| 280 |
|
return true; |
| 281 |
|
} |
| 282 |
|
|
| 283 |
|
|
| 284 |
|
/* |
| 285 |
+ |
* Deinitialize VOSF system |
| 286 |
+ |
*/ |
| 287 |
+ |
|
| 288 |
+ |
static void video_vosf_exit(void) |
| 289 |
+ |
{ |
| 290 |
+ |
if (mainBuffer.pageInfo) { |
| 291 |
+ |
free(mainBuffer.pageInfo); |
| 292 |
+ |
mainBuffer.pageInfo = NULL; |
| 293 |
+ |
} |
| 294 |
+ |
if (mainBuffer.dirtyPages) { |
| 295 |
+ |
free(mainBuffer.dirtyPages); |
| 296 |
+ |
mainBuffer.dirtyPages = NULL; |
| 297 |
+ |
} |
| 298 |
+ |
} |
| 299 |
+ |
|
| 300 |
+ |
|
| 301 |
+ |
/* |
| 302 |
|
* Screen fault handler |
| 303 |
|
*/ |
| 304 |
|
|
| 305 |
< |
static bool screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction) |
| 305 |
> |
bool Screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction) |
| 306 |
|
{ |
| 240 |
– |
// D(bug("screen_fault_handler: ADDR=0x%08X from IP=0x%08X\n", fault_address, fault_instruction)); |
| 307 |
|
const uintptr addr = (uintptr)fault_address; |
| 308 |
|
|
| 309 |
|
/* Someone attempted to write to the frame buffer. Make it writeable |
| 310 |
|
* now so that the data could actually be written to. It will be made |
| 311 |
|
* read-only back in one of the screen update_*() functions. |
| 312 |
|
*/ |
| 313 |
< |
if ((addr >= mainBuffer.memStart) && (addr < mainBuffer.memEnd)) { |
| 314 |
< |
const int page = (addr - mainBuffer.memStart) >> mainBuffer.pageBits; |
| 249 |
< |
caddr_t page_ad = (caddr_t)(addr & -mainBuffer.pageSize); |
| 313 |
> |
if (((uintptr)addr - mainBuffer.memStart) < mainBuffer.memLength) { |
| 314 |
> |
const int page = ((uintptr)addr - mainBuffer.memStart) >> mainBuffer.pageBits; |
| 315 |
|
LOCK_VOSF; |
| 316 |
|
PFLAG_SET(page); |
| 317 |
< |
vm_protect((char *)page_ad, mainBuffer.pageSize, VM_PAGE_READ | VM_PAGE_WRITE); |
| 317 |
> |
vm_protect((char *)(addr & -mainBuffer.pageSize), mainBuffer.pageSize, VM_PAGE_READ | VM_PAGE_WRITE); |
| 318 |
|
mainBuffer.dirty = true; |
| 319 |
|
UNLOCK_VOSF; |
| 320 |
|
return true; |
| 321 |
|
} |
| 322 |
|
|
| 323 |
|
/* 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 |
| 324 |
|
return false; |
| 325 |
|
} |
| 326 |
|
|
| 329 |
|
* Update display for Windowed mode and VOSF |
| 330 |
|
*/ |
| 331 |
|
|
| 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 |
– |
|
| 332 |
|
/* How can we deal with array overrun conditions ? |
| 333 |
|
|
| 334 |
|
The state of the framebuffer pages that have been touched are maintained |
| 362 |
|
than pageCount. |
| 363 |
|
*/ |
| 364 |
|
|
| 365 |
< |
static inline void update_display_window_vosf(driver_window *drv) |
| 365 |
> |
static inline void update_display_window_vosf(VIDEO_DRV_INIT) |
| 366 |
|
{ |
| 367 |
+ |
VIDEO_MODE_INIT; |
| 368 |
+ |
|
| 369 |
|
int page = 0; |
| 370 |
|
for (;;) { |
| 371 |
< |
const int first_page = find_next_page_set(page); |
| 371 |
> |
const unsigned first_page = find_next_page_set(page); |
| 372 |
|
if (first_page >= mainBuffer.pageCount) |
| 373 |
|
break; |
| 374 |
|
|
| 384 |
|
const int y1 = mainBuffer.pageInfo[first_page].top; |
| 385 |
|
const int y2 = mainBuffer.pageInfo[page - 1].bottom; |
| 386 |
|
const int height = y2 - y1 + 1; |
| 387 |
< |
|
| 388 |
< |
if (VideoMonitor.mode.depth < VDEPTH_8BIT) { |
| 387 |
> |
|
| 388 |
> |
VIDEO_DRV_LOCK_PIXELS; |
| 389 |
> |
|
| 390 |
> |
if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) { |
| 391 |
|
|
| 392 |
|
// Update the_host_buffer and copy of the_buffer |
| 393 |
< |
const int src_bytes_per_row = VideoMonitor.mode.bytes_per_row; |
| 394 |
< |
const int dst_bytes_per_row = drv->img->bytes_per_line; |
| 395 |
< |
const int pixels_per_byte = VideoMonitor.mode.x / src_bytes_per_row; |
| 393 |
> |
const int src_bytes_per_row = VIDEO_MODE_ROW_BYTES; |
| 394 |
> |
const int dst_bytes_per_row = VIDEO_DRV_ROW_BYTES; |
| 395 |
> |
const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row; |
| 396 |
|
int i1 = y1 * src_bytes_per_row, i2 = y1 * dst_bytes_per_row, j; |
| 397 |
|
for (j = y1; j <= y2; j++) { |
| 398 |
< |
Screen_blit(the_host_buffer + i2, the_buffer + i1, VideoMonitor.mode.x / pixels_per_byte); |
| 398 |
> |
Screen_blit(the_host_buffer + i2, the_buffer + i1, VIDEO_MODE_X / pixels_per_byte); |
| 399 |
|
i1 += src_bytes_per_row; |
| 400 |
|
i2 += dst_bytes_per_row; |
| 401 |
|
} |
| 403 |
|
} else { |
| 404 |
|
|
| 405 |
|
// Update the_host_buffer and copy of the_buffer |
| 406 |
< |
const int src_bytes_per_row = VideoMonitor.mode.bytes_per_row; |
| 407 |
< |
const int dst_bytes_per_row = drv->img->bytes_per_line; |
| 408 |
< |
const int bytes_per_pixel = src_bytes_per_row / VideoMonitor.mode.x; |
| 406 |
> |
const int src_bytes_per_row = VIDEO_MODE_ROW_BYTES; |
| 407 |
> |
const int dst_bytes_per_row = VIDEO_DRV_ROW_BYTES; |
| 408 |
> |
const int bytes_per_pixel = src_bytes_per_row / VIDEO_MODE_X; |
| 409 |
|
int i1 = y1 * src_bytes_per_row, i2 = y1 * dst_bytes_per_row, j; |
| 410 |
|
for (j = y1; j <= y2; j++) { |
| 411 |
< |
Screen_blit(the_host_buffer + i2, the_buffer + i1, bytes_per_pixel * VideoMonitor.mode.x); |
| 411 |
> |
Screen_blit(the_host_buffer + i2, the_buffer + i1, bytes_per_pixel * VIDEO_MODE_X); |
| 412 |
|
i1 += src_bytes_per_row; |
| 413 |
|
i2 += dst_bytes_per_row; |
| 414 |
|
} |
| 415 |
|
} |
| 416 |
|
|
| 417 |
< |
if (drv->have_shm) |
| 418 |
< |
XShmPutImage(x_display, drv->w, drv->gc, drv->img, 0, y1, 0, y1, VideoMonitor.mode.x, height, 0); |
| 417 |
> |
VIDEO_DRV_UNLOCK_PIXELS; |
| 418 |
> |
|
| 419 |
> |
#ifdef USE_SDL_VIDEO |
| 420 |
> |
SDL_UpdateRect(drv->s, 0, y1, VIDEO_MODE_X, height); |
| 421 |
> |
#else |
| 422 |
> |
if (VIDEO_DRV_HAVE_SHM) |
| 423 |
> |
XShmPutImage(x_display, VIDEO_DRV_WINDOW, VIDEO_DRV_GC, VIDEO_DRV_IMAGE, 0, y1, 0, y1, VIDEO_MODE_X, height, 0); |
| 424 |
|
else |
| 425 |
< |
XPutImage(x_display, drv->w, drv->gc, drv->img, 0, y1, 0, y1, VideoMonitor.mode.x, height); |
| 425 |
> |
XPutImage(x_display, VIDEO_DRV_WINDOW, VIDEO_DRV_GC, VIDEO_DRV_IMAGE, 0, y1, 0, y1, VIDEO_MODE_X, height); |
| 426 |
> |
#endif |
| 427 |
|
} |
| 428 |
|
mainBuffer.dirty = false; |
| 429 |
|
} |
| 437 |
|
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
| 438 |
|
static inline void update_display_dga_vosf(void) |
| 439 |
|
{ |
| 440 |
+ |
VIDEO_MODE_INIT; |
| 441 |
+ |
|
| 442 |
|
int page = 0; |
| 443 |
|
for (;;) { |
| 444 |
< |
const int first_page = find_next_page_set(page); |
| 444 |
> |
const unsigned first_page = find_next_page_set(page); |
| 445 |
|
if (first_page >= mainBuffer.pageCount) |
| 446 |
|
break; |
| 447 |
|
|
| 457 |
|
const int y1 = mainBuffer.pageInfo[first_page].top; |
| 458 |
|
const int y2 = mainBuffer.pageInfo[page - 1].bottom; |
| 459 |
|
|
| 460 |
< |
const int bytes_per_row = VideoMonitor.mode.bytes_per_row; |
| 461 |
< |
const int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x; |
| 460 |
> |
const int bytes_per_row = VIDEO_MODE_ROW_BYTES; |
| 461 |
> |
const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X; |
| 462 |
|
int i, j; |
| 463 |
|
|
| 464 |
|
// Check for first column from left and first column |
| 465 |
|
// from right that have changed |
| 466 |
< |
int x1 = VideoMonitor.mode.x * bytes_per_pixel - 1; |
| 466 |
> |
int x1 = VIDEO_MODE_X * bytes_per_pixel - 1; |
| 467 |
|
for (j = y1; j <= y2; j++) { |
| 468 |
|
uint8 * const p1 = &the_buffer[j * bytes_per_row]; |
| 469 |
|
uint8 * const p2 = &the_buffer_copy[j * bytes_per_row]; |
| 480 |
|
for (j = y2; j >= y1; j--) { |
| 481 |
|
uint8 * const p1 = &the_buffer[j * bytes_per_row]; |
| 482 |
|
uint8 * const p2 = &the_buffer_copy[j * bytes_per_row]; |
| 483 |
< |
for (i = VideoMonitor.mode.x * bytes_per_pixel - 1; i > x2; i--) { |
| 483 |
> |
for (i = VIDEO_MODE_X * bytes_per_pixel - 1; i > x2; i--) { |
| 484 |
|
if (p1[i] != p2[i]) { |
| 485 |
|
x2 = i; |
| 486 |
|
break; |
| 491 |
|
|
| 492 |
|
// Update the_host_buffer and copy of the_buffer |
| 493 |
|
// There should be at least one pixel to copy |
| 494 |
+ |
VIDEO_DRV_LOCK_PIXELS; |
| 495 |
|
const int width = x2 - x1 + 1; |
| 496 |
|
i = y1 * bytes_per_row + x1 * bytes_per_pixel; |
| 497 |
|
for (j = y1; j <= y2; j++) { |
| 499 |
|
memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * width); |
| 500 |
|
i += bytes_per_row; |
| 501 |
|
} |
| 502 |
+ |
VIDEO_DRV_UNLOCK_PIXELS; |
| 503 |
|
} |
| 504 |
|
mainBuffer.dirty = false; |
| 505 |
|
} |
