--- trunk/src/devices/dev_fb.c 2007/10/08 16:19:23 20 +++ trunk/src/devices/dev_fb.c 2007/10/08 16:19:56 24 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2005 Anders Gavare. All rights reserved. + * Copyright (C) 2003-2006 Anders Gavare. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * - * $Id: dev_fb.c,v 1.110 2005/11/13 00:14:08 debug Exp $ + * $Id: dev_fb.c,v 1.118 2006/03/04 12:38:47 debug Exp $ * * Generic framebuffer device. * @@ -37,10 +37,7 @@ * generic (any resolution, several bit depths possible) * * - * TODO: There is still a bug when redrawing the cursor. The underlying - * image is moved 1 pixel (?), or something like that. - * - * TODO: This should actually be independant of X11, but that + * TODO: This should actually be independent of X11, but that * might be too hard to do right now. * * TODO: playstation 2 pixels are stored in another format, actually @@ -153,15 +150,18 @@ d->framebuffer = new_framebuffer; d->framebuffer_size = size; - if (new_xsize > d->x11_xsize || new_ysize > d->x11_ysize) { + if (new_xsize > d->xsize || new_ysize > d->ysize) { d->update_x1 = d->update_y1 = 0; d->update_x2 = new_xsize - 1; d->update_y2 = new_ysize - 1; } d->bytes_per_line = new_bytes_per_line; - d->x11_xsize = d->visible_xsize = new_xsize; - d->x11_ysize = d->visible_ysize = new_ysize; + d->xsize = d->visible_xsize = new_xsize; + d->ysize = d->visible_ysize = new_ysize; + + d->x11_xsize = d->xsize / d->vfb_scaledown; + d->x11_ysize = d->ysize / d->vfb_scaledown; #ifdef WITH_X11 if (d->fb_window != NULL) @@ -248,14 +248,16 @@ int x; char buf[8192 * 3]; if (d->bit_depth == 24) - for (x=0; xframebuffer + dest_ofs, buf, linelen); @@ -290,323 +292,96 @@ #ifdef WITH_X11 -#define macro_put_pixel() { \ - /* Combine the color into an X11 long and display it: */ \ - /* TODO: construct color in a more portable way: */ \ - switch (d->fb_window->x11_screen_depth) { \ - case 24: \ - if (d->fb_window->fb_ximage->byte_order) \ - color = (b << 16) + (g << 8) + r; \ - else \ - color = (r << 16) + (g << 8) + b; \ - break; \ - case 16: \ - r >>= 3; g >>= 2; b >>= 3; \ - if (d->fb_window->fb_ximage->byte_order) { \ - /* Big endian 16-bit X server: */ \ - static int first = 1; \ - if (first) { \ - fprintf(stderr, "\n*** Please report " \ - "to the author whether 16-bit X11 " \ - "colors are rendered correctly or " \ - "not!\n\n"); \ - first = 0; \ - } \ - color = (b << 11) + (g << 5) + r; \ - } else { \ - /* Little endian (eg PC) X servers: */ \ - color = (r << 11) + (g << 5) + b; \ - } \ - break; \ - case 15: \ - r >>= 3; g >>= 3; b >>= 3; \ - if (d->fb_window->fb_ximage->byte_order) { \ - /* Big endian 15-bit X server: */ \ - static int first = 1; \ - if (first) { \ - fprintf(stderr, "\n*** Please report " \ - "to the author whether 15-bit X11 " \ - "colors are rendered correctly or " \ - "not!\n\n"); \ - first = 0; \ - } \ - color = (b << 10) + (g << 5) + r; \ - } else { \ - /* Little endian (eg PC) X servers: */ \ - color = (r << 10) + (g << 5) + b; \ - } \ - break; \ - default: \ - color = d->fb_window->x11_graycolor[15 * (r + g + b) \ - / (255 * 3)].pixel; \ - } \ - if (x>=0 && xx11_xsize && y>=0 && yx11_ysize) \ - XPutPixel(d->fb_window->fb_ximage, x, y, color); \ - } -#else -/* If not WITH_X11: */ -#define macro_put_pixel() { } -#endif - - -/* - * update_framebuffer(): - * - * The framebuffer memory has been updated. This function tries to make - * sure that the XImage is also updated (1 or more pixels). - */ -void update_framebuffer(struct vfb_data *d, int addr, int len) -{ - int x, y, pixel, npixels; - long color_r, color_g, color_b; -#ifdef WITH_X11 - long color; -#endif - int scaledown = d->vfb_scaledown; - int scaledownXscaledown = 1; - - if (scaledown == 1) { - /* Which framebuffer pixel does addr correspond to? */ - pixel = addr * 8 / d->bit_depth; - y = pixel / d->xsize; - x = pixel % d->xsize; - - /* How many framebuffer pixels? */ - npixels = len * 8 / d->bit_depth; - if (npixels == 0) - npixels = 1; - - if (d->bit_depth < 8) { - for (pixel=0; pixelxsize + x) * d->bit_depth; - /* fb_addr is now which _bit_ in - the framebuffer */ - - c = d->framebuffer[fb_addr >> 3]; - fb_addr &= 7; - - /* HPC is reverse: */ - if (d->vfb_type == VFB_HPC) - fb_addr = 8 - d->bit_depth - fb_addr; - - c = (c >> fb_addr) & ((1<bit_depth) - 1); - /* c <<= (8 - d->bit_depth); */ - - r = d->rgb_palette[c*3 + 0]; - g = d->rgb_palette[c*3 + 1]; - b = d->rgb_palette[c*3 + 2]; - macro_put_pixel(); - x++; - } - } else if (d->bit_depth == 8) { - for (pixel=0; pixelxsize + x; - /* fb_addr is now which byte in framebuffer */ - c = d->framebuffer[fb_addr]; - r = d->rgb_palette[c*3 + 0]; - g = d->rgb_palette[c*3 + 1]; - b = d->rgb_palette[c*3 + 2]; - - macro_put_pixel(); - x++; - } - } else { /* d->bit_depth > 8 */ - for (pixel=0; pixelxsize + x) * d->bit_depth; - /* fb_addr is now which byte in framebuffer */ - - /* > 8 bits color. */ - fb_addr >>= 3; - switch (d->bit_depth) { - case 24: - r = d->framebuffer[fb_addr]; - g = d->framebuffer[fb_addr + 1]; - b = d->framebuffer[fb_addr + 2]; - break; - /* TODO: copy to the scaledown code below */ - case 16: - if (d->vfb_type == VFB_HPC) { - b = d->framebuffer[fb_addr] + - (d->framebuffer[fb_addr+1] - << 8); - - if (d->color32k) { - r = b >> 11; - g = b >> 5; - r = r & 31; - g = (g & 31) * 2; - b = b & 31; - } else if (d->psp_15bit) { - int tmp; - r = (b >> 10) & 0x1f; - g = (b >> 5) & 0x1f; - b = b & 0x1f; - g <<= 1; - tmp = r; r = b; b = tmp; - } else { - r = (b >> 11) & 0x1f; - g = (b >> 5) & 0x3f; - b = b & 0x1f; - } - } else { - r = d->framebuffer[fb_addr] >> 3; - g = (d->framebuffer[fb_addr] << 5) + - (d->framebuffer[fb_addr + 1] >>5); - b = d->framebuffer[fb_addr + 1]&31; - } - - r *= 8; - g *= 4; - b *= 8; - break; - default: - r = g = b = random() & 255; - } - - macro_put_pixel(); - x++; - } - } - - return; - } +#define REDRAW redraw_fallback +#include "fb_include.c" +#undef REDRAW + +#define FB_24 +#define REDRAW redraw_24 +#include "fb_include.c" +#undef REDRAW +#undef FB_24 +#define FB_16 +#define REDRAW redraw_16 +#include "fb_include.c" +#undef FB_16 +#undef REDRAW +#define FB_15 +#define REDRAW redraw_15 +#include "fb_include.c" +#undef REDRAW +#undef FB_15 + +#define FB_BO +#define FB_24 +#define REDRAW redraw_24_bo +#include "fb_include.c" +#undef REDRAW +#undef FB_24 +#define FB_16 +#define REDRAW redraw_16_bo +#include "fb_include.c" +#undef FB_16 +#undef REDRAW +#define FB_15 +#define REDRAW redraw_15_bo +#include "fb_include.c" +#undef REDRAW +#undef FB_15 +#undef FB_BO + +#define FB_SCALEDOWN + +#define REDRAW redraw_fallback_sd +#include "fb_include.c" +#undef REDRAW + +#define FB_24 +#define REDRAW redraw_24_sd +#include "fb_include.c" +#undef REDRAW +#undef FB_24 +#define FB_16 +#define REDRAW redraw_16_sd +#include "fb_include.c" +#undef FB_16 +#undef REDRAW +#define FB_15 +#define REDRAW redraw_15_sd +#include "fb_include.c" +#undef REDRAW +#undef FB_15 + +#define FB_BO +#define FB_24 +#define REDRAW redraw_24_bo_sd +#include "fb_include.c" +#undef REDRAW +#undef FB_24 +#define FB_16 +#define REDRAW redraw_16_bo_sd +#include "fb_include.c" +#undef FB_16 +#undef REDRAW +#define FB_15 +#define REDRAW redraw_15_bo_sd +#include "fb_include.c" +#undef REDRAW +#undef FB_15 +#undef FB_BO + +void (*redraw[2 * 4 * 2])(struct vfb_data *, int, int) = { + redraw_fallback, redraw_fallback, + redraw_15, redraw_15_bo, + redraw_16, redraw_16_bo, + redraw_24, redraw_24_bo, + redraw_fallback_sd, redraw_fallback_sd, + redraw_15_sd, redraw_15_bo_sd, + redraw_16_sd, redraw_16_bo_sd, + redraw_24_sd, redraw_24_bo_sd }; - /* scaledown > 1: */ - - scaledown = d->vfb_scaledown; - scaledownXscaledown = scaledown * scaledown; - - /* Which framebuffer pixel does addr correspond to? */ - pixel = addr * 8 / d->bit_depth; - y = pixel / d->xsize; - x = pixel % d->xsize; - - /* How many framebuffer pixels? */ - npixels = len * 8 / d->bit_depth; - - /* Which x11 pixel? */ - x /= scaledown; - y /= scaledown; - - /* How many x11 pixels: */ - npixels /= scaledown; - if (npixels == 0) - npixels = 1; - - if (d->bit_depth < 8) { - for (pixel=0; pixelxsize + fb_x; - fb_addr = fb_addr * d->bit_depth; - /* fb_addr is now which _bit_ in - the framebuffer */ - - c = d->framebuffer[fb_addr >> 3]; - fb_addr &= 7; - - /* HPC is reverse: */ - if (d->vfb_type == VFB_HPC) - fb_addr = 8 - d->bit_depth - fb_addr; - - c = (c >> fb_addr) & ((1<bit_depth) - 1); - /* c <<= (8 - d->bit_depth); */ - - r = d->rgb_palette[c*3 + 0]; - g = d->rgb_palette[c*3 + 1]; - b = d->rgb_palette[c*3 + 2]; - - color_r += r; - color_g += g; - color_b += b; - } - - r = color_r / scaledownXscaledown; - g = color_g / scaledownXscaledown; - b = color_b / scaledownXscaledown; - macro_put_pixel(); - x++; - } - } else if (d->bit_depth == 8) { - for (pixel=0; pixelxsize + fb_x; - /* fb_addr is which _byte_ in framebuffer */ - c = d->framebuffer[fb_addr] * 3; - r = d->rgb_palette[c + 0]; - g = d->rgb_palette[c + 1]; - b = d->rgb_palette[c + 2]; - color_r += r; - color_g += g; - color_b += b; - } - - r = color_r / scaledownXscaledown; - g = color_g / scaledownXscaledown; - b = color_b / scaledownXscaledown; - macro_put_pixel(); - x++; - } - } else { - /* Generic > 8 bit bit-depth: */ - for (pixel=0; pixelxsize + fb_x; - fb_addr = (fb_addr * d->bit_depth) >> 3; - /* fb_addr is which _byte_ in framebuffer */ - - /* > 8 bits color. */ - switch (d->bit_depth) { - case 24: - r = d->framebuffer[fb_addr]; - g = d->framebuffer[fb_addr + 1]; - b = d->framebuffer[fb_addr + 2]; - break; - default: - r = g = b = random() & 255; - } - color_r += r; - color_g += g; - color_b += b; - } - r = color_r / scaledownXscaledown; - g = color_g / scaledownXscaledown; - b = color_b / scaledownXscaledown; - macro_put_pixel(); - x++; - } - } -} +#endif /* WITH_X11 */ /* @@ -738,7 +513,10 @@ #endif if (d->update_x2 != -1) { - int y, addr, addr2, q = d->vfb_scaledown; +#ifdef WITH_X11 + int y; +#endif + int addr, addr2, q = d->vfb_scaledown; if (d->update_x1 >= d->visible_xsize) d->update_x1 = d->visible_xsize - 1; @@ -763,13 +541,13 @@ addr2 = d->update_y1 * d->bytes_per_line + d->update_x2 * d->bit_depth / 8; +#ifdef WITH_X11 for (y=d->update_y1; y<=d->update_y2; y+=q) { - update_framebuffer(d, addr, addr2 - addr); + d->redraw_func(d, addr, addr2 - addr); addr += d->bytes_per_line * q; addr2 += d->bytes_per_line * q; } -#ifdef WITH_X11 XPutImage(d->fb_window->x11_display, d->fb_window-> x11_fb_window, d->fb_window->x11_fb_gc, d->fb_window-> fb_ximage, d->update_x1/d->vfb_scaledown, d->update_y1/ @@ -798,6 +576,7 @@ cursor_xsize; d->fb_window->OLD_cursor_ysize = d->fb_window-> cursor_ysize; + need_to_flush_x11 = 1; } } #endif @@ -812,12 +591,10 @@ /* * dev_fb_access(): */ -int dev_fb_access(struct cpu *cpu, struct memory *mem, - uint64_t relative_addr, unsigned char *data, size_t len, - int writeflag, void *extra) +DEVICE_ACCESS(fb) { struct vfb_data *d = extra; - int i; + size_t i; #ifdef FB_DEBUG if (writeflag == MEM_WRITE) { if (data[0]) { @@ -846,7 +623,7 @@ /* If all bytes are equal to what is already stored in the framebuffer, then simply return: */ - if (i==len-1) + if (i == len-1) return 1; } } @@ -905,15 +682,17 @@ if (writeflag == MEM_WRITE) { if (len > 8) memcpy(d->framebuffer + relative_addr, data, len); - else + else { for (i=0; iframebuffer[relative_addr + i] = data[i]; + } } else { if (len > 8) memcpy(data, d->framebuffer + relative_addr, len); - else + else { for (i=0; iframebuffer[relative_addr + i]; + } } return 1; @@ -948,6 +727,7 @@ struct vfb_data *d; size_t size, nlen; int flags; + int reverse_start = 0; char title[400]; char *name2; @@ -958,6 +738,11 @@ } memset(d, 0, sizeof(struct vfb_data)); + if (vfb_type & VFB_REVERSE_START) { + vfb_type &= ~VFB_REVERSE_START; + reverse_start = 1; + } + d->vfb_type = vfb_type; /* Defaults: */ @@ -1000,8 +785,6 @@ d->ysize = ysize; d->visible_ysize = d->ysize; d->bit_depth = 24; break; - default: - ; } if (d->bit_depth == 2 || d->bit_depth == 4) @@ -1022,14 +805,21 @@ /* Clear the framebuffer (all black pixels): */ d->framebuffer_size = size; - memset(d->framebuffer, 0, size); + memset(d->framebuffer, reverse_start? 255 : 0, size); d->x11_xsize = d->visible_xsize / d->vfb_scaledown; d->x11_ysize = d->visible_ysize / d->vfb_scaledown; - d->update_x1 = d->update_y1 = 99999; - d->update_x2 = d->update_y2 = -1; - + /* Only "update" from the start if we need to fill with white. */ + /* (The Ximage will be black from the start anyway.) */ + if (reverse_start) { + d->update_x1 = d->update_y1 = 0; + d->update_x2 = d->xsize - 1; + d->update_y2 = d->ysize - 1; + } else { + d->update_x1 = d->update_y1 = 99999; + d->update_x2 = d->update_y2 = -1; + } /* Don't set the title to include the size of the framebuffer for VGA, since then the resolution might change during runtime. */ @@ -1041,10 +831,21 @@ title[sizeof(title)-1] = '\0'; #ifdef WITH_X11 - if (machine->use_x11) + if (machine->use_x11) { + int i = 0; d->fb_window = x11_fb_init(d->x11_xsize, d->x11_ysize, title, machine->x11_scaledown, machine); - else + switch (d->fb_window->x11_screen_depth) { + case 15: i = 2; break; + case 16: i = 4; break; + case 24: i = 6; break; + } + if (d->fb_window->fb_ximage->byte_order) + i ++; + if (d->vfb_scaledown > 1) + i += 8; + d->redraw_func = redraw[i]; + } else #endif d->fb_window = NULL; @@ -1065,7 +866,7 @@ memory_device_register(mem, name2, baseaddr, size, dev_fb_access, d, flags, d->framebuffer); - machine_add_tickfunction(machine, dev_fb_tick, d, FB_TICK_SHIFT); + machine_add_tickfunction(machine, dev_fb_tick, d, FB_TICK_SHIFT, 0.0); return d; }