Commit fbcaca99 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20141002-1' into staging 



vga: cleanups, prepare for endianness switching

# gpg: Signature made Thu 02 Oct 2014 08:10:49 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-vga-20141002-1:
  vga: Add endian to vmstate
  vga: Make fb endian a common state variable
  vga: Rename vga_template.h to vga-helpers.h
  vga: Remove some "should be done in BIOS" comments
  cirrus: Remove non-32bpp cursor drawing
  vga: Simplify vga_draw_blank() a bit
  vga: Remove rgb_to_pixel indirection
  vga: Separate LE and BE conversion functions
  vga: Remove remainder of old conversion cruft
  vga: Start cutting out non-32bpp conversion support

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1831e150 c3b10605

hw/display/cirrus_vga.c

+45 −34
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "hw/hw.h"

#include "hw/pci/pci.h"

#include "ui/console.h"

#include "ui/pixel_ops.h"

#include "vga_int.h"

#include "hw/loader.h"
@@ -2170,20 +2171,44 @@ static void cirrus_cursor_invalidate(VGACommonState *s1) 
    }

}



#define DEPTH 8

#include "cirrus_vga_template.h"



#define DEPTH 16

#include "cirrus_vga_template.h"



#define DEPTH 32

#include "cirrus_vga_template.h"

static void vga_draw_cursor_line(uint8_t *d1,

                                 const uint8_t *src1,

                                 int poffset, int w,

                                 unsigned int color0,

                                 unsigned int color1,

                                 unsigned int color_xor)

{

    const uint8_t *plane0, *plane1;

    int x, b0, b1;

    uint8_t *d;



    d = d1;

    plane0 = src1;

    plane1 = src1 + poffset;

    for (x = 0; x < w; x++) {

        b0 = (plane0[x >> 3] >> (7 - (x & 7))) & 1;

        b1 = (plane1[x >> 3] >> (7 - (x & 7))) & 1;

        switch (b0 | (b1 << 1)) {

        case 0:

            break;

        case 1:

            ((uint32_t *)d)[0] ^= color_xor;

            break;

        case 2:

            ((uint32_t *)d)[0] = color0;

            break;

        case 3:

            ((uint32_t *)d)[0] = color1;

            break;

        }

        d += 4;

    }

}



static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y)

{

    CirrusVGAState *s = container_of(s1, CirrusVGAState, vga);

    DisplaySurface *surface = qemu_console_surface(s->vga.con);

    int w, h, bpp, x1, x2, poffset;

    int w, h, x1, x2, poffset;

    unsigned int color0, color1;

    const uint8_t *palette, *src;

    uint32_t content;
@@ -2212,6 +2237,8 @@ static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y) 
    } else {

        src += (s->vga.sr[0x13] & 0x3f) * 256;

        src += (scr_y - s->hw_cursor_y) * 4;





        poffset = 128;

        content = ((uint32_t *)src)[0] |

            ((uint32_t *)(src + 128))[0];
@@ -2229,30 +2256,14 @@ static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y) 
        x2 = s->vga.last_scr_width;

    w = x2 - x1;

    palette = s->cirrus_hidden_palette;

    color0 = s->vga.rgb_to_pixel(c6_to_8(palette[0x0 * 3]),

    color0 = rgb_to_pixel32(c6_to_8(palette[0x0 * 3]),

                            c6_to_8(palette[0x0 * 3 + 1]),

                            c6_to_8(palette[0x0 * 3 + 2]));

    color1 = s->vga.rgb_to_pixel(c6_to_8(palette[0xf * 3]),

    color1 = rgb_to_pixel32(c6_to_8(palette[0xf * 3]),

                            c6_to_8(palette[0xf * 3 + 1]),

                            c6_to_8(palette[0xf * 3 + 2]));

    bpp = surface_bytes_per_pixel(surface);

    d1 += x1 * bpp;

    switch (surface_bits_per_pixel(surface)) {

    default:

        break;

    case 8:

        vga_draw_cursor_line_8(d1, src, poffset, w, color0, color1, 0xff);

        break;

    case 15:

        vga_draw_cursor_line_16(d1, src, poffset, w, color0, color1, 0x7fff);

        break;

    case 16:

        vga_draw_cursor_line_16(d1, src, poffset, w, color0, color1, 0xffff);

        break;

    case 32:

        vga_draw_cursor_line_32(d1, src, poffset, w, color0, color1, 0xffffff);

        break;

    }

    d1 += x1 * 4;

    vga_draw_cursor_line(d1, src, poffset, w, color0, color1, 0xffffff);

}



/***************************************

hw/display/cirrus_vga_template.h

deleted100644 → 0
+0 −102
Original line number Diff line number Diff line 
/*

 * QEMU Cirrus VGA Emulator templates

 *

 * Copyright (c) 2003 Fabrice Bellard

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#if DEPTH == 8

#define BPP 1

#elif DEPTH == 15 || DEPTH == 16

#define BPP 2

#elif DEPTH == 32

#define BPP 4

#else

#error unsupported depth

#endif



static void glue(vga_draw_cursor_line_, DEPTH)(uint8_t *d1,

                                               const uint8_t *src1,

                                               int poffset, int w,

                                               unsigned int color0,

                                               unsigned int color1,

                                               unsigned int color_xor)

{

    const uint8_t *plane0, *plane1;

    int x, b0, b1;

    uint8_t *d;



    d = d1;

    plane0 = src1;

    plane1 = src1 + poffset;

    for (x = 0; x < w; x++) {

        b0 = (plane0[x >> 3] >> (7 - (x & 7))) & 1;

        b1 = (plane1[x >> 3] >> (7 - (x & 7))) & 1;

#if DEPTH == 8

        switch (b0 | (b1 << 1)) {

        case 0:

            break;

        case 1:

            d[0] ^= color_xor;

            break;

        case 2:

            d[0] = color0;

            break;

        case 3:

            d[0] = color1;

            break;

        }

#elif DEPTH == 16

        switch (b0 | (b1 << 1)) {

        case 0:

            break;

        case 1:

            ((uint16_t *)d)[0] ^= color_xor;

            break;

        case 2:

            ((uint16_t *)d)[0] = color0;

            break;

        case 3:

            ((uint16_t *)d)[0] = color1;

            break;

        }

#elif DEPTH == 32

        switch (b0 | (b1 << 1)) {

        case 0:

            break;

        case 1:

            ((uint32_t *)d)[0] ^= color_xor;

            break;

        case 2:

            ((uint32_t *)d)[0] = color0;

            break;

        case 3:

            ((uint32_t *)d)[0] = color1;

            break;

        }

#else

#error unsupported depth

#endif

        d += BPP;

    }

}



#undef DEPTH

#undef BPP

hw/display/vga_template.h→hw/display/vga-helpers.h

+148 −170
Original line number Diff line number Diff line
@@ -22,41 +22,9 @@ 
 * THE SOFTWARE.

 */



#if DEPTH == 8

#define BPP 1

#define PIXEL_TYPE uint8_t

#elif DEPTH == 15 || DEPTH == 16

#define BPP 2

#define PIXEL_TYPE uint16_t

#elif DEPTH == 32

#define BPP 4

#define PIXEL_TYPE uint32_t

#else

#error unsupport depth

#endif



#ifdef BGR_FORMAT

#define PIXEL_NAME glue(DEPTH, bgr)

#else

#define PIXEL_NAME DEPTH

#endif /* BGR_FORMAT */



#if DEPTH != 15 && !defined(BGR_FORMAT)



static inline void glue(vga_draw_glyph_line_, DEPTH)(uint8_t *d,

                                                     uint32_t font_data,

                                                     uint32_t xorcol,

                                                     uint32_t bgcol)

static inline void vga_draw_glyph_line(uint8_t *d, uint32_t font_data,

                                       uint32_t xorcol, uint32_t bgcol)

{

#if BPP == 1

        ((uint32_t *)d)[0] = (dmask16[(font_data >> 4)] & xorcol) ^ bgcol;

        ((uint32_t *)d)[1] = (dmask16[(font_data >> 0) & 0xf] & xorcol) ^ bgcol;

#elif BPP == 2

        ((uint32_t *)d)[0] = (dmask4[(font_data >> 6)] & xorcol) ^ bgcol;

        ((uint32_t *)d)[1] = (dmask4[(font_data >> 4) & 3] & xorcol) ^ bgcol;

        ((uint32_t *)d)[2] = (dmask4[(font_data >> 2) & 3] & xorcol) ^ bgcol;

        ((uint32_t *)d)[3] = (dmask4[(font_data >> 0) & 3] & xorcol) ^ bgcol;

#else

        ((uint32_t *)d)[0] = (-((font_data >> 7)) & xorcol) ^ bgcol;

        ((uint32_t *)d)[1] = (-((font_data >> 6) & 1) & xorcol) ^ bgcol;

        ((uint32_t *)d)[2] = (-((font_data >> 5) & 1) & xorcol) ^ bgcol;
@@ -65,10 +33,9 @@ static inline void glue(vga_draw_glyph_line_, DEPTH)(uint8_t *d, 
        ((uint32_t *)d)[5] = (-((font_data >> 2) & 1) & xorcol) ^ bgcol;

        ((uint32_t *)d)[6] = (-((font_data >> 1) & 1) & xorcol) ^ bgcol;

        ((uint32_t *)d)[7] = (-((font_data >> 0) & 1) & xorcol) ^ bgcol;

#endif

}



static void glue(vga_draw_glyph8_, DEPTH)(uint8_t *d, int linesize,

static void vga_draw_glyph8(uint8_t *d, int linesize,

                            const uint8_t *font_ptr, int h,

                            uint32_t fgcol, uint32_t bgcol)

{
@@ -77,13 +44,13 @@ static void glue(vga_draw_glyph8_, DEPTH)(uint8_t *d, int linesize, 
    xorcol = bgcol ^ fgcol;

    do {

        font_data = font_ptr[0];

        glue(vga_draw_glyph_line_, DEPTH)(d, font_data, xorcol, bgcol);

        vga_draw_glyph_line(d, font_data, xorcol, bgcol);

        font_ptr += 4;

        d += linesize;

    } while (--h);

}



static void glue(vga_draw_glyph16_, DEPTH)(uint8_t *d, int linesize,

static void vga_draw_glyph16(uint8_t *d, int linesize,

                                          const uint8_t *font_ptr, int h,

                                          uint32_t fgcol, uint32_t bgcol)

{
@@ -92,18 +59,16 @@ static void glue(vga_draw_glyph16_, DEPTH)(uint8_t *d, int linesize, 
    xorcol = bgcol ^ fgcol;

    do {

        font_data = font_ptr[0];

        glue(vga_draw_glyph_line_, DEPTH)(d,

                                          expand4to8[font_data >> 4],

        vga_draw_glyph_line(d, expand4to8[font_data >> 4],

                            xorcol, bgcol);

        glue(vga_draw_glyph_line_, DEPTH)(d + 8 * BPP,

                                          expand4to8[font_data & 0x0f],

        vga_draw_glyph_line(d + 32, expand4to8[font_data & 0x0f],

                            xorcol, bgcol);

        font_ptr += 4;

        d += linesize;

    } while (--h);

}



static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize,

static void vga_draw_glyph9(uint8_t *d, int linesize,

                            const uint8_t *font_ptr, int h,

                            uint32_t fgcol, uint32_t bgcol, int dup9)

{
@@ -112,28 +77,6 @@ static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize, 
    xorcol = bgcol ^ fgcol;

    do {

        font_data = font_ptr[0];

#if BPP == 1

        stl_p((uint32_t *)d, (dmask16[(font_data >> 4)] & xorcol) ^ bgcol);

        v = (dmask16[(font_data >> 0) & 0xf] & xorcol) ^ bgcol;

        stl_p(((uint32_t *)d)+1, v);

        if (dup9)

            ((uint8_t *)d)[8] = v >> (24 * (1 - BIG));

        else

            ((uint8_t *)d)[8] = bgcol;



#elif BPP == 2

        stl_p(((uint32_t *)d)+0, (dmask4[(font_data >> 6)] & xorcol) ^ bgcol);

        stl_p(((uint32_t *)d)+1,

              (dmask4[(font_data >> 4) & 3] & xorcol) ^ bgcol);

        stl_p(((uint32_t *)d)+2,

              (dmask4[(font_data >> 2) & 3] & xorcol) ^ bgcol);

        v = (dmask4[(font_data >> 0) & 3] & xorcol) ^ bgcol;

        stl_p(((uint32_t *)d)+3, v);

        if (dup9)

            ((uint16_t *)d)[8] = v >> (16 * (1 - BIG));

        else

            ((uint16_t *)d)[8] = bgcol;

#else

        ((uint32_t *)d)[0] = (-((font_data >> 7)) & xorcol) ^ bgcol;

        ((uint32_t *)d)[1] = (-((font_data >> 6) & 1) & xorcol) ^ bgcol;

        ((uint32_t *)d)[2] = (-((font_data >> 5) & 1) & xorcol) ^ bgcol;
@@ -147,7 +90,6 @@ static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize, 
            ((uint32_t *)d)[8] = v;

        else

            ((uint32_t *)d)[8] = bgcol;

#endif

        font_ptr += 4;

        d += linesize;

    } while (--h);
@@ -156,7 +98,7 @@ static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize, 
/*

 * 4 color mode

 */

static void glue(vga_draw_line2_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line2(VGACommonState *s1, uint8_t *d,

                           const uint8_t *s, int width)

{

    uint32_t plane_mask, *palette, data, v;
@@ -170,35 +112,29 @@ static void glue(vga_draw_line2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
        data &= plane_mask;

        v = expand2[GET_PLANE(data, 0)];

        v |= expand2[GET_PLANE(data, 2)] << 2;

        ((PIXEL_TYPE *)d)[0] = palette[v >> 12];

        ((PIXEL_TYPE *)d)[1] = palette[(v >> 8) & 0xf];

        ((PIXEL_TYPE *)d)[2] = palette[(v >> 4) & 0xf];

        ((PIXEL_TYPE *)d)[3] = palette[(v >> 0) & 0xf];

        ((uint32_t *)d)[0] = palette[v >> 12];

        ((uint32_t *)d)[1] = palette[(v >> 8) & 0xf];

        ((uint32_t *)d)[2] = palette[(v >> 4) & 0xf];

        ((uint32_t *)d)[3] = palette[(v >> 0) & 0xf];



        v = expand2[GET_PLANE(data, 1)];

        v |= expand2[GET_PLANE(data, 3)] << 2;

        ((PIXEL_TYPE *)d)[4] = palette[v >> 12];

        ((PIXEL_TYPE *)d)[5] = palette[(v >> 8) & 0xf];

        ((PIXEL_TYPE *)d)[6] = palette[(v >> 4) & 0xf];

        ((PIXEL_TYPE *)d)[7] = palette[(v >> 0) & 0xf];

        d += BPP * 8;

        ((uint32_t *)d)[4] = palette[v >> 12];

        ((uint32_t *)d)[5] = palette[(v >> 8) & 0xf];

        ((uint32_t *)d)[6] = palette[(v >> 4) & 0xf];

        ((uint32_t *)d)[7] = palette[(v >> 0) & 0xf];

        d += 32;

        s += 4;

    }

}



#if BPP == 1

#define PUT_PIXEL2(d, n, v) ((uint16_t *)d)[(n)] = (v)

#elif BPP == 2

#define PUT_PIXEL2(d, n, v) ((uint32_t *)d)[(n)] = (v)

#else

#define PUT_PIXEL2(d, n, v) \

((uint32_t *)d)[2*(n)] = ((uint32_t *)d)[2*(n)+1] = (v)

#endif



/*

 * 4 color mode, dup2 horizontal

 */

static void glue(vga_draw_line2d2_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line2d2(VGACommonState *s1, uint8_t *d,

                             const uint8_t *s, int width)

{

    uint32_t plane_mask, *palette, data, v;
@@ -223,7 +159,7 @@ static void glue(vga_draw_line2d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
        PUT_PIXEL2(d, 5, palette[(v >> 8) & 0xf]);

        PUT_PIXEL2(d, 6, palette[(v >> 4) & 0xf]);

        PUT_PIXEL2(d, 7, palette[(v >> 0) & 0xf]);

        d += BPP * 16;

        d += 64;

        s += 4;

    }

}
@@ -231,7 +167,7 @@ static void glue(vga_draw_line2d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
/*

 * 16 color mode

 */

static void glue(vga_draw_line4_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line4(VGACommonState *s1, uint8_t *d,

                           const uint8_t *s, int width)

{

    uint32_t plane_mask, data, v, *palette;
@@ -247,15 +183,15 @@ static void glue(vga_draw_line4_, DEPTH)(VGACommonState *s1, uint8_t *d, 
        v |= expand4[GET_PLANE(data, 1)] << 1;

        v |= expand4[GET_PLANE(data, 2)] << 2;

        v |= expand4[GET_PLANE(data, 3)] << 3;

        ((PIXEL_TYPE *)d)[0] = palette[v >> 28];

        ((PIXEL_TYPE *)d)[1] = palette[(v >> 24) & 0xf];

        ((PIXEL_TYPE *)d)[2] = palette[(v >> 20) & 0xf];

        ((PIXEL_TYPE *)d)[3] = palette[(v >> 16) & 0xf];

        ((PIXEL_TYPE *)d)[4] = palette[(v >> 12) & 0xf];

        ((PIXEL_TYPE *)d)[5] = palette[(v >> 8) & 0xf];

        ((PIXEL_TYPE *)d)[6] = palette[(v >> 4) & 0xf];

        ((PIXEL_TYPE *)d)[7] = palette[(v >> 0) & 0xf];

        d += BPP * 8;

        ((uint32_t *)d)[0] = palette[v >> 28];

        ((uint32_t *)d)[1] = palette[(v >> 24) & 0xf];

        ((uint32_t *)d)[2] = palette[(v >> 20) & 0xf];

        ((uint32_t *)d)[3] = palette[(v >> 16) & 0xf];

        ((uint32_t *)d)[4] = palette[(v >> 12) & 0xf];

        ((uint32_t *)d)[5] = palette[(v >> 8) & 0xf];

        ((uint32_t *)d)[6] = palette[(v >> 4) & 0xf];

        ((uint32_t *)d)[7] = palette[(v >> 0) & 0xf];

        d += 32;

        s += 4;

    }

}
@@ -263,7 +199,7 @@ static void glue(vga_draw_line4_, DEPTH)(VGACommonState *s1, uint8_t *d, 
/*

 * 16 color mode, dup2 horizontal

 */

static void glue(vga_draw_line4d2_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line4d2(VGACommonState *s1, uint8_t *d,

                             const uint8_t *s, int width)

{

    uint32_t plane_mask, data, v, *palette;
@@ -287,7 +223,7 @@ static void glue(vga_draw_line4d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
        PUT_PIXEL2(d, 5, palette[(v >> 8) & 0xf]);

        PUT_PIXEL2(d, 6, palette[(v >> 4) & 0xf]);

        PUT_PIXEL2(d, 7, palette[(v >> 0) & 0xf]);

        d += BPP * 16;

        d += 64;

        s += 4;

    }

}
@@ -297,7 +233,7 @@ static void glue(vga_draw_line4d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
 *

 * XXX: add plane_mask support (never used in standard VGA modes)

 */

static void glue(vga_draw_line8d2_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line8d2(VGACommonState *s1, uint8_t *d,

                             const uint8_t *s, int width)

{

    uint32_t *palette;
@@ -310,7 +246,7 @@ static void glue(vga_draw_line8d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
        PUT_PIXEL2(d, 1, palette[s[1]]);

        PUT_PIXEL2(d, 2, palette[s[2]]);

        PUT_PIXEL2(d, 3, palette[s[3]]);

        d += BPP * 8;

        d += 32;

        s += 4;

    }

}
@@ -320,7 +256,7 @@ static void glue(vga_draw_line8d2_, DEPTH)(VGACommonState *s1, uint8_t *d, 
 *

 * XXX: add plane_mask support (never used in standard VGA modes)

 */

static void glue(vga_draw_line8_, DEPTH)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line8(VGACommonState *s1, uint8_t *d,

                           const uint8_t *s, int width)

{

    uint32_t *palette;
@@ -329,78 +265,101 @@ static void glue(vga_draw_line8_, DEPTH)(VGACommonState *s1, uint8_t *d, 
    palette = s1->last_palette;

    width >>= 3;

    for(x = 0; x < width; x++) {

        ((PIXEL_TYPE *)d)[0] = palette[s[0]];

        ((PIXEL_TYPE *)d)[1] = palette[s[1]];

        ((PIXEL_TYPE *)d)[2] = palette[s[2]];

        ((PIXEL_TYPE *)d)[3] = palette[s[3]];

        ((PIXEL_TYPE *)d)[4] = palette[s[4]];

        ((PIXEL_TYPE *)d)[5] = palette[s[5]];

        ((PIXEL_TYPE *)d)[6] = palette[s[6]];

        ((PIXEL_TYPE *)d)[7] = palette[s[7]];

        d += BPP * 8;

        ((uint32_t *)d)[0] = palette[s[0]];

        ((uint32_t *)d)[1] = palette[s[1]];

        ((uint32_t *)d)[2] = palette[s[2]];

        ((uint32_t *)d)[3] = palette[s[3]];

        ((uint32_t *)d)[4] = palette[s[4]];

        ((uint32_t *)d)[5] = palette[s[5]];

        ((uint32_t *)d)[6] = palette[s[6]];

        ((uint32_t *)d)[7] = palette[s[7]];

        d += 32;

        s += 8;

    }

}



#endif /* DEPTH != 15 */





/* XXX: optimize */



/*

 * 15 bit color

 */

static void glue(vga_draw_line15_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line15_le(VGACommonState *s1, uint8_t *d,

                               const uint8_t *s, int width)

{

#if DEPTH == 15 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)

    memcpy(d, s, width * 2);

#else

    int w;

    uint32_t v, r, g, b;



    w = width;

    do {

        v = lduw_p((void *)s);

        v = lduw_le_p((void *)s);

        r = (v >> 7) & 0xf8;

        g = (v >> 2) & 0xf8;

        b = (v << 3) & 0xf8;

        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 2;

        d += BPP;

        d += 4;

    } while (--w != 0);

}



static void vga_draw_line15_be(VGACommonState *s1, uint8_t *d,

                               const uint8_t *s, int width)

{

    int w;

    uint32_t v, r, g, b;



    w = width;

    do {

        v = lduw_be_p((void *)s);

        r = (v >> 7) & 0xf8;

        g = (v >> 2) & 0xf8;

        b = (v << 3) & 0xf8;

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 2;

        d += 4;

    } while (--w != 0);

#endif

}



/*

 * 16 bit color

 */

static void glue(vga_draw_line16_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line16_le(VGACommonState *s1, uint8_t *d,

                               const uint8_t *s, int width)

{

#if DEPTH == 16 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)

    memcpy(d, s, width * 2);

#else

    int w;

    uint32_t v, r, g, b;



    w = width;

    do {

        v = lduw_p((void *)s);

        v = lduw_le_p((void *)s);

        r = (v >> 8) & 0xf8;

        g = (v >> 3) & 0xfc;

        b = (v << 3) & 0xf8;

        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 2;

        d += BPP;

        d += 4;

    } while (--w != 0);

}



static void vga_draw_line16_be(VGACommonState *s1, uint8_t *d,

                               const uint8_t *s, int width)

{

    int w;

    uint32_t v, r, g, b;



    w = width;

    do {

        v = lduw_be_p((void *)s);

        r = (v >> 8) & 0xf8;

        g = (v >> 3) & 0xfc;

        b = (v << 3) & 0xf8;

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 2;

        d += 4;

    } while (--w != 0);

#endif

}



/*

 * 24 bit color

 */

static void glue(vga_draw_line24_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line24_le(VGACommonState *s1, uint8_t *d,

                               const uint8_t *s, int width)

{

    int w;
@@ -408,28 +367,39 @@ static void glue(vga_draw_line24_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d, 


    w = width;

    do {

#if defined(TARGET_WORDS_BIGENDIAN)

        r = s[0];

        g = s[1];

        b = s[2];

#else

        b = s[0];

        g = s[1];

        r = s[2];

#endif

        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 3;

        d += BPP;

        d += 4;

    } while (--w != 0);

}



static void vga_draw_line24_be(VGACommonState *s1, uint8_t *d,

                               const uint8_t *s, int width)

{

    int w;

    uint32_t r, g, b;



    w = width;

    do {

        r = s[0];

        g = s[1];

        b = s[2];

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 3;

        d += 4;

    } while (--w != 0);

}



/*

 * 32 bit color

 */

static void glue(vga_draw_line32_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d,

static void vga_draw_line32_le(VGACommonState *s1, uint8_t *d,

                               const uint8_t *s, int width)

{

#if DEPTH == 32 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) && !defined(BGR_FORMAT)

#ifndef HOST_WORDS_BIGENDIAN

    memcpy(d, s, width * 4);

#else

    int w;
@@ -437,25 +407,33 @@ static void glue(vga_draw_line32_, PIXEL_NAME)(VGACommonState *s1, uint8_t *d, 


    w = width;

    do {

#if defined(TARGET_WORDS_BIGENDIAN)

        r = s[1];

        g = s[2];

        b = s[3];

#else

        b = s[0];

        g = s[1];

        r = s[2];

#endif

        ((PIXEL_TYPE *)d)[0] = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 4;

        d += BPP;

        d += 4;

    } while (--w != 0);

#endif

}



#undef PUT_PIXEL2

#undef DEPTH

#undef BPP

#undef PIXEL_TYPE

#undef PIXEL_NAME

#undef BGR_FORMAT
 
static void vga_draw_line32_be(VGACommonState *s1, uint8_t *d,

                               const uint8_t *s, int width)

{

#ifdef HOST_WORDS_BIGENDIAN

    memcpy(d, s, width * 4);

#else

    int w;

    uint32_t r, g, b;



    w = width;

    do {

        r = s[1];

        g = s[2];

        b = s[3];

        ((uint32_t *)d)[0] = rgb_to_pixel32(r, g, b);

        s += 4;

        d += 4;

    } while (--w != 0);

#endif

}

hw/display/vga.c

+100 −282

File changed.

Preview size limit exceeded, changes collapsed.

hw/display/vga_int.h

+3 −2
Original line number Diff line number Diff line
@@ -150,15 +150,16 @@ typedef struct VGACommonState { 
    uint32_t last_width, last_height; /* in chars or pixels */

    uint32_t last_scr_width, last_scr_height; /* in pixels */

    uint32_t last_depth; /* in bits */

    bool last_byteswap;

    uint8_t cursor_start, cursor_end;

    bool cursor_visible_phase;

    int64_t cursor_blink_time;

    uint32_t cursor_offset;

    unsigned int (*rgb_to_pixel)(unsigned int r,

                                 unsigned int g, unsigned b);

    const GraphicHwOps *hw_ops;

    bool full_update_text;

    bool full_update_gfx;

    bool big_endian_fb;

    bool default_endian_fb;

    /* hardware mouse cursor support */

    uint32_t invalidated_y_table[VGA_MAX_HEIGHT / 32];

    void (*cursor_invalidate)(struct VGACommonState *s);