Revision 0e1f5a0c hw/vmware_vga.c
| b/hw/vmware_vga.c | ||
|---|---|---|
| 319 | 319 |
width = s->bypp * w; |
| 320 | 320 |
start = s->bypp * x + bypl * y; |
| 321 | 321 |
src = s->vram + start; |
| 322 |
dst = s->ds->data + start;
|
|
| 322 |
dst = ds_get_data(s->ds) + start;
|
|
| 323 | 323 |
|
| 324 | 324 |
for (; line > 0; line --, src += bypl, dst += bypl) |
| 325 | 325 |
memcpy(dst, src, width); |
| ... | ... | |
| 331 | 331 |
static inline void vmsvga_update_screen(struct vmsvga_state_s *s) |
| 332 | 332 |
{
|
| 333 | 333 |
#ifndef DIRECT_VRAM |
| 334 |
memcpy(s->ds->data, s->vram, s->bypp * s->width * s->height);
|
|
| 334 |
memcpy(ds_get_data(s->ds), s->vram, s->bypp * s->width * s->height);
|
|
| 335 | 335 |
#endif |
| 336 | 336 |
|
| 337 | 337 |
dpy_update(s->ds, 0, 0, s->width, s->height); |
| ... | ... | |
| 373 | 373 |
int x0, int y0, int x1, int y1, int w, int h) |
| 374 | 374 |
{
|
| 375 | 375 |
# ifdef DIRECT_VRAM |
| 376 |
uint8_t *vram = s->ds->data;
|
|
| 376 |
uint8_t *vram = ds_get_data(s->ds);
|
|
| 377 | 377 |
# else |
| 378 | 378 |
uint8_t *vram = s->vram; |
| 379 | 379 |
# endif |
| ... | ... | |
| 410 | 410 |
uint32_t c, int x, int y, int w, int h) |
| 411 | 411 |
{
|
| 412 | 412 |
# ifdef DIRECT_VRAM |
| 413 |
uint8_t *vram = s->ds->data;
|
|
| 413 |
uint8_t *vram = ds_get_data(s->ds);
|
|
| 414 | 414 |
# else |
| 415 | 415 |
uint8_t *vram = s->vram; |
| 416 | 416 |
# endif |
| ... | ... | |
| 915 | 915 |
s->width = -1; |
| 916 | 916 |
s->height = -1; |
| 917 | 917 |
s->svgaid = SVGA_ID; |
| 918 |
s->depth = s->ds->depth ? s->ds->depth : 24;
|
|
| 918 |
s->depth = ds_get_bits_per_pixel(s->ds) ? ds_get_bits_per_pixel(s->ds) : 24;
|
|
| 919 | 919 |
s->bypp = (s->depth + 7) >> 3; |
| 920 | 920 |
s->cursor.on = 0; |
| 921 | 921 |
s->redraw_fifo_first = 0; |
| ... | ... | |
| 976 | 976 |
} |
| 977 | 977 |
|
| 978 | 978 |
if (s->depth == 32) {
|
| 979 |
ppm_save(filename, s->vram, s->width, s->height, s->ds->linesize);
|
|
| 979 |
ppm_save(filename, s->vram, s->width, s->height, ds_get_linesize(s->ds));
|
|
| 980 | 980 |
} |
| 981 | 981 |
} |
| 982 | 982 |
|
| ... | ... | |
| 994 | 994 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| 995 | 995 |
addr -= s->vram_base; |
| 996 | 996 |
if (addr < s->fb_size) |
| 997 |
return *(uint8_t *) (s->ds->data + addr);
|
|
| 997 |
return *(uint8_t *) (ds_get_data(s->ds) + addr);
|
|
| 998 | 998 |
else |
| 999 | 999 |
return *(uint8_t *) (s->vram + addr); |
| 1000 | 1000 |
} |
| ... | ... | |
| 1004 | 1004 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| 1005 | 1005 |
addr -= s->vram_base; |
| 1006 | 1006 |
if (addr < s->fb_size) |
| 1007 |
return *(uint16_t *) (s->ds->data + addr);
|
|
| 1007 |
return *(uint16_t *) (ds_get_data(s->ds) + addr);
|
|
| 1008 | 1008 |
else |
| 1009 | 1009 |
return *(uint16_t *) (s->vram + addr); |
| 1010 | 1010 |
} |
| ... | ... | |
| 1014 | 1014 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| 1015 | 1015 |
addr -= s->vram_base; |
| 1016 | 1016 |
if (addr < s->fb_size) |
| 1017 |
return *(uint32_t *) (s->ds->data + addr);
|
|
| 1017 |
return *(uint32_t *) (ds_get_data(s->ds) + addr);
|
|
| 1018 | 1018 |
else |
| 1019 | 1019 |
return *(uint32_t *) (s->vram + addr); |
| 1020 | 1020 |
} |
| ... | ... | |
| 1025 | 1025 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| 1026 | 1026 |
addr -= s->vram_base; |
| 1027 | 1027 |
if (addr < s->fb_size) |
| 1028 |
*(uint8_t *) (s->ds->data + addr) = value;
|
|
| 1028 |
*(uint8_t *) (ds_get_data(s->ds) + addr) = value;
|
|
| 1029 | 1029 |
else |
| 1030 | 1030 |
*(uint8_t *) (s->vram + addr) = value; |
| 1031 | 1031 |
} |
| ... | ... | |
| 1036 | 1036 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| 1037 | 1037 |
addr -= s->vram_base; |
| 1038 | 1038 |
if (addr < s->fb_size) |
| 1039 |
*(uint16_t *) (s->ds->data + addr) = value;
|
|
| 1039 |
*(uint16_t *) (ds_get_data(s->ds) + addr) = value;
|
|
| 1040 | 1040 |
else |
| 1041 | 1041 |
*(uint16_t *) (s->vram + addr) = value; |
| 1042 | 1042 |
} |
| ... | ... | |
| 1047 | 1047 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| 1048 | 1048 |
addr -= s->vram_base; |
| 1049 | 1049 |
if (addr < s->fb_size) |
| 1050 |
*(uint32_t *) (s->ds->data + addr) = value;
|
|
| 1050 |
*(uint32_t *) (ds_get_data(s->ds) + addr) = value;
|
|
| 1051 | 1051 |
else |
| 1052 | 1052 |
*(uint32_t *) (s->vram + addr) = value; |
| 1053 | 1053 |
} |
Also available in: Unified diff