Changeset 33455 in vbox for trunk/src

Timestamp:

Oct 26, 2010 9:58:18 AM (14 years ago)

Author:

vboxsync

Message:

DevVGA: Removed unused code that was getting in the way.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -2948 +2948 @@
 }
 #endif /* !VBOX */
-
-
-#ifndef VBOX
-/********************************************************/
-/* vga screen dump */
-
-static int vga_save_w, vga_save_h;
-
-static void vga_save_dpy_update(DisplayState *s,
-                                int x, int y, int w, int h)
-{
-}
-
-static void vga_save_dpy_resize(DisplayState *s, int w, int h)
-{
-    s->linesize = w * 4;
-#ifndef VBOX
-    s->data = qemu_malloc(h * s->linesize);
-#else /* VBOX */
-    if (!s->data)
-    {
-        PPDMDEVINS pDevIns = VGASTATE2DEVINS((PVGASTATE)s->pvVgaState);
-        s->data = PDMDevHlpMMHeapAlloc(pDevIns, h * s->linesize);
-    }
-    else // (32-bpp buffer is allocated by the caller)
-        s->linesize = ((w * 32 + 31) / 32) * 4;
-#endif /* VBOX */
-    vga_save_w = w;
-    vga_save_h = h;
-}
-
-static void vga_save_dpy_refresh(DisplayState *s)
-{
-}
-
-static int ppm_save(const char *filename, uint8_t *data,
-                    int w, int h, int linesize)
-{
-    FILE *f;
-    uint8_t *d, *d1;
-    unsigned int v;
-    int y, x;
-
-    f = fopen(filename, "wb");
-    if (!f)
-        return -1;
-    fprintf(f, "P6\n%d %d\n%d\n",
-            w, h, 255);
-    d1 = data;
-    for(y = 0; y < h; y++) {
-        d = d1;
-        for(x = 0; x < w; x++) {
-            v = *(uint32_t *)d;
-            fputc((v >> 16) & 0xff, f);
-            fputc((v >> 8) & 0xff, f);
-            fputc((v) & 0xff, f);
-            d += 4;
-        }
-        d1 += linesize;
-    }
-    fclose(f);
-    return 0;
-}
-
-/* save the vga display in a PPM image even if no display is
-   available */
-void vga_screen_dump(const char *filename)
-{
-    VGAState *s = vga_state;
-    DisplayState *saved_ds, ds1, *ds = &ds1;
-
-    /* XXX: this is a little hackish */
-    vga_invalidate_display();
-    saved_ds = s->ds;
-
-    memset(ds, 0, sizeof(DisplayState));
-    ds->dpy_update = vga_save_dpy_update;
-    ds->dpy_resize = vga_save_dpy_resize;
-    ds->dpy_refresh = vga_save_dpy_refresh;
-    ds->depth = 32;
-
-    s->ds = ds;
-    s->graphic_mode = -1;
-    vga_update_display();
-
-    if (ds->data) {
-        ppm_save(filename, ds->data, vga_save_w, vga_save_h,
-                 s->ds->linesize);
-        qemu_free(ds->data);
-    }
-    s->ds = saved_ds;
-}
-#endif /* !VBOX */
-
-
-#if 0 //def VBOX
-/* copy the vga display contents to the given buffer. the size of the buffer
-   must be sufficient to store the screen copy (see below). the width and height
-   parameters determine the required dimensions of the copy. If they differ
-   from the actual screen dimensions, then the returned copy is shrinked or
-   stretched accordingly. The copy is always a 32-bit image, so the size of
-   the buffer supplied must be at least (((width * 32 + 31) / 32) * 4) * height,
-   i.e. dword-aligned. returns zero if the operation was successfull and -1
-   otherwise. */
-
-static int vga_copy_screen_to(PVGASTATE s, uint8_t *buf, int width, int height)
-{
-    DisplayState *saved_ds, ds1, *ds = &ds1;
-    if (!buf || width <= 0 || height <= 0)
-        return -1;
-
-    /* XXX: this is a little hackish */
-    vga_invalidate_display(s);
-    saved_ds = s->ds;
-
-    memset(ds, 0, sizeof(DisplayState));
-    ds->dpy_update = vga_save_dpy_update;
-    ds->dpy_resize = vga_save_dpy_resize;
-    ds->dpy_refresh = vga_save_dpy_refresh;
-    ds->depth = 32;
-    ds->data = buf;
-    ds->pvVgaState = s;
-
-    s->ds = ds;
-    s->graphic_mode = -1;
-    vga_update_display(s);
-
-//@@TODO (dmik): implement stretching/shrinking!
-
-    s->ds = saved_ds;
-    return 0;
-}
-
-/* copy the given buffer to the vga display. width and height define the
-   dimensions of the image in the buffer. x and y define the point on the
-   vga display to copy the image to. the buffer is assumed to contain a 32-bit
-   image, so the size of one scanline must be ((width * 32 + 31) / 32) * 4),
-   i.e. dword-aligned. returns zero if the operation was successfull and -1
-   otherwise. */
-static int vga_copy_screen_from(PVGASTATE s, uint8_t *buf, int x, int y, int width, int height)
-{
-    int                 bpl = ((width * 32 + 31) / 32) * 4;
-    int                 linesize = s->ds->linesize;
-    uint8_t            *dst;
-    uint8_t            *src;
-    int                 bpp;
-    vga_draw_line_func *vga_draw_line;
-
-    if (!buf || x < 0 || y < 0 || width <= 0 || height <= 0
-        || x + width > s->ds->width || y + height > s->ds->height)
-        return -1;
-
-    vga_draw_line = vga_draw_line_table[VGA_DRAW_LINE32 * 4 + get_depth_index(s->ds->depth)];
-    switch (s->ds->depth) {
-        case 8: bpp = 1; break;
-        case 15:
-        case 16: bpp = 2; break;
-        case 32: bpp = 4; break;
-        default: return -1;
-    }
-
-    dst = s->ds->data + y * linesize + x * bpp;
-    src = buf;
-    for (y = 0; y < height; y ++)
-    {
-        vga_draw_line(s, dst, src, width);
-        dst += linesize;
-        src += bpl;
-    }
-
-    return 0;
-}
-#endif
 
 #endif /* !VBOX || !IN_RC || !IN_RING0 */