diff options
-rw-r--r-- | hw/display/goldfish_fb.c | 11 | ||||
-rw-r--r-- | hw/display/goldfish_fb_template.h | 78 |
2 files changed, 83 insertions, 6 deletions
diff --git a/hw/display/goldfish_fb.c b/hw/display/goldfish_fb.c index 66fdb217dd..a9c0325d79 100644 --- a/hw/display/goldfish_fb.c +++ b/hw/display/goldfish_fb.c @@ -16,17 +16,16 @@ #include "ui/pixel_ops.h" #include "trace.h" -/* milkymist-vgafb also uses RGB565, so borrow its drawfn helpers */ #define BITS 8 -#include "milkymist-vgafb_template.h" +#include "goldfish_fb_template.h" #define BITS 15 -#include "milkymist-vgafb_template.h" +#include "goldfish_fb_template.h" #define BITS 16 -#include "milkymist-vgafb_template.h" +#include "goldfish_fb_template.h" #define BITS 24 -#include "milkymist-vgafb_template.h" +#include "goldfish_fb_template.h" #define BITS 32 -#include "milkymist-vgafb_template.h" +#include "goldfish_fb_template.h" #define TYPE_GOLDFISH_FB "goldfish_fb" #define GOLDFISH_FB(obj) OBJECT_CHECK(struct goldfish_fb_state, (obj), TYPE_GOLDFISH_FB) diff --git a/hw/display/goldfish_fb_template.h b/hw/display/goldfish_fb_template.h new file mode 100644 index 0000000000..8579e68e4f --- /dev/null +++ b/hw/display/goldfish_fb_template.h @@ -0,0 +1,78 @@ +/* + * QEMU model of the Goldfish framebuffer: drawing templates. + * + * Copyright (c) 2014 Linaro Limited + * + * Based heavily on the milkymist drawing templates, which are: + * + * Copyright (c) 2010 Michael Walle <michael@walle.cc> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + */ + +#if BITS == 8 +#define COPY_PIXEL(to, r, g, b) \ + do { \ + *to = rgb_to_pixel8(r, g, b); \ + to += 1; \ + } while (0) +#elif BITS == 15 +#define COPY_PIXEL(to, r, g, b) \ + do { \ + *(uint16_t *)to = rgb_to_pixel15(r, g, b); \ + to += 2; \ + } while (0) +#elif BITS == 16 +#define COPY_PIXEL(to, r, g, b) \ + do { \ + *(uint16_t *)to = rgb_to_pixel16(r, g, b); \ + to += 2; \ + } while (0) +#elif BITS == 24 +#define COPY_PIXEL(to, r, g, b) \ + do { \ + uint32_t tmp = rgb_to_pixel24(r, g, b); \ + *(to++) = tmp & 0xff; \ + *(to++) = (tmp >> 8) & 0xff; \ + *(to++) = (tmp >> 16) & 0xff; \ + } while (0) +#elif BITS == 32 +#define COPY_PIXEL(to, r, g, b) \ + do { \ + *(uint32_t *)to = rgb_to_pixel32(r, g, b); \ + to += 4; \ + } while (0) +#else +#error unknown bit depth +#endif + +static void glue(draw_line_, BITS)(void *opaque, uint8_t *d, const uint8_t *s, + int width, int deststep) +{ + uint16_t rgb565; + uint8_t r, g, b; + + while (width--) { + rgb565 = lduw_le_p(s); + r = ((rgb565 >> 11) & 0x1f) << 3; + g = ((rgb565 >> 5) & 0x3f) << 2; + b = ((rgb565 >> 0) & 0x1f) << 3; + COPY_PIXEL(d, r, g, b); + s += 2; + } +} + +#undef BITS +#undef COPY_PIXEL |