hw/display/blizzard: Remove blizzard_template.h
We no longer need to do the "multiply include this header" trick with blizzard_template.h, and it is only used in a single .c file, so just put its contents inline in blizzard.c. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 1462371352-21498-3-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell
parent
5c8759087d
commit
4274d821ff
@ -925,8 +925,83 @@ static void blizzard_update_display(void *opaque)
|
|||||||
s->my[1] = 0;
|
s->my[1] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define DEPTH 32
|
static void blizzard_draw_line16_32(uint32_t *dest,
|
||||||
#include "blizzard_template.h"
|
const uint16_t *src, unsigned int width)
|
||||||
|
{
|
||||||
|
uint16_t data;
|
||||||
|
unsigned int r, g, b;
|
||||||
|
const uint16_t *end = (const void *) src + width;
|
||||||
|
while (src < end) {
|
||||||
|
data = *src ++;
|
||||||
|
b = (data & 0x1f) << 3;
|
||||||
|
data >>= 5;
|
||||||
|
g = (data & 0x3f) << 2;
|
||||||
|
data >>= 6;
|
||||||
|
r = (data & 0x1f) << 3;
|
||||||
|
data >>= 5;
|
||||||
|
*dest++ = rgb_to_pixel32(r, g, b);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void blizzard_draw_line24mode1_32(uint32_t *dest,
|
||||||
|
const uint8_t *src, unsigned int width)
|
||||||
|
{
|
||||||
|
/* TODO: check if SDL 24-bit planes are not in the same format and
|
||||||
|
* if so, use memcpy */
|
||||||
|
unsigned int r[2], g[2], b[2];
|
||||||
|
const uint8_t *end = src + width;
|
||||||
|
while (src < end) {
|
||||||
|
g[0] = *src ++;
|
||||||
|
r[0] = *src ++;
|
||||||
|
r[1] = *src ++;
|
||||||
|
b[0] = *src ++;
|
||||||
|
*dest++ = rgb_to_pixel32(r[0], g[0], b[0]);
|
||||||
|
b[1] = *src ++;
|
||||||
|
g[1] = *src ++;
|
||||||
|
*dest++ = rgb_to_pixel32(r[1], g[1], b[1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void blizzard_draw_line24mode2_32(uint32_t *dest,
|
||||||
|
const uint8_t *src, unsigned int width)
|
||||||
|
{
|
||||||
|
unsigned int r, g, b;
|
||||||
|
const uint8_t *end = src + width;
|
||||||
|
while (src < end) {
|
||||||
|
r = *src ++;
|
||||||
|
src ++;
|
||||||
|
b = *src ++;
|
||||||
|
g = *src ++;
|
||||||
|
*dest++ = rgb_to_pixel32(r, g, b);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* No rotation */
|
||||||
|
static blizzard_fn_t blizzard_draw_fn_32[0x10] = {
|
||||||
|
NULL,
|
||||||
|
/* RGB 5:6:5*/
|
||||||
|
(blizzard_fn_t) blizzard_draw_line16_32,
|
||||||
|
/* RGB 6:6:6 mode 1 */
|
||||||
|
(blizzard_fn_t) blizzard_draw_line24mode1_32,
|
||||||
|
/* RGB 8:8:8 mode 1 */
|
||||||
|
(blizzard_fn_t) blizzard_draw_line24mode1_32,
|
||||||
|
NULL, NULL,
|
||||||
|
/* RGB 6:6:6 mode 2 */
|
||||||
|
(blizzard_fn_t) blizzard_draw_line24mode2_32,
|
||||||
|
/* RGB 8:8:8 mode 2 */
|
||||||
|
(blizzard_fn_t) blizzard_draw_line24mode2_32,
|
||||||
|
/* YUV 4:2:2 */
|
||||||
|
NULL,
|
||||||
|
/* YUV 4:2:0 */
|
||||||
|
NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL, NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
/* 90deg, 180deg and 270deg rotation */
|
||||||
|
static blizzard_fn_t blizzard_draw_fn_r_32[0x10] = {
|
||||||
|
/* TODO */
|
||||||
|
[0 ... 0xf] = NULL,
|
||||||
|
};
|
||||||
|
|
||||||
static const GraphicHwOps blizzard_ops = {
|
static const GraphicHwOps blizzard_ops = {
|
||||||
.invalidate = blizzard_invalidate_display,
|
.invalidate = blizzard_invalidate_display,
|
||||||
|
|||||||
@ -1,97 +0,0 @@
|
|||||||
/*
|
|
||||||
* QEMU Epson S1D13744/S1D13745 templates
|
|
||||||
*
|
|
||||||
* Copyright (C) 2008 Nokia Corporation
|
|
||||||
* Written by Andrzej Zaborowski <andrew@openedhand.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public License as
|
|
||||||
* published by the Free Software Foundation; either version 2 or
|
|
||||||
* (at your option) version 3 of the License.
|
|
||||||
*
|
|
||||||
* This program 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 General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along
|
|
||||||
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static void blizzard_draw_line16_32(uint32_t *dest,
|
|
||||||
const uint16_t *src, unsigned int width)
|
|
||||||
{
|
|
||||||
uint16_t data;
|
|
||||||
unsigned int r, g, b;
|
|
||||||
const uint16_t *end = (const void *) src + width;
|
|
||||||
while (src < end) {
|
|
||||||
data = *src ++;
|
|
||||||
b = (data & 0x1f) << 3;
|
|
||||||
data >>= 5;
|
|
||||||
g = (data & 0x3f) << 2;
|
|
||||||
data >>= 6;
|
|
||||||
r = (data & 0x1f) << 3;
|
|
||||||
data >>= 5;
|
|
||||||
*dest++ = rgb_to_pixel32(r, g, b);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void blizzard_draw_line24mode1_32(uint32_t *dest,
|
|
||||||
const uint8_t *src, unsigned int width)
|
|
||||||
{
|
|
||||||
/* TODO: check if SDL 24-bit planes are not in the same format and
|
|
||||||
* if so, use memcpy */
|
|
||||||
unsigned int r[2], g[2], b[2];
|
|
||||||
const uint8_t *end = src + width;
|
|
||||||
while (src < end) {
|
|
||||||
g[0] = *src ++;
|
|
||||||
r[0] = *src ++;
|
|
||||||
r[1] = *src ++;
|
|
||||||
b[0] = *src ++;
|
|
||||||
*dest++ = rgb_to_pixel32(r[0], g[0], b[0]);
|
|
||||||
b[1] = *src ++;
|
|
||||||
g[1] = *src ++;
|
|
||||||
*dest++ = rgb_to_pixel32(r[1], g[1], b[1]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void blizzard_draw_line24mode2_32(uint32_t *dest,
|
|
||||||
const uint8_t *src, unsigned int width)
|
|
||||||
{
|
|
||||||
unsigned int r, g, b;
|
|
||||||
const uint8_t *end = src + width;
|
|
||||||
while (src < end) {
|
|
||||||
r = *src ++;
|
|
||||||
src ++;
|
|
||||||
b = *src ++;
|
|
||||||
g = *src ++;
|
|
||||||
*dest++ = rgb_to_pixel32(r, g, b);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* No rotation */
|
|
||||||
static blizzard_fn_t blizzard_draw_fn_32[0x10] = {
|
|
||||||
NULL,
|
|
||||||
/* RGB 5:6:5*/
|
|
||||||
(blizzard_fn_t) blizzard_draw_line16_32,
|
|
||||||
/* RGB 6:6:6 mode 1 */
|
|
||||||
(blizzard_fn_t) blizzard_draw_line24mode1_32,
|
|
||||||
/* RGB 8:8:8 mode 1 */
|
|
||||||
(blizzard_fn_t) blizzard_draw_line24mode1_32,
|
|
||||||
NULL, NULL,
|
|
||||||
/* RGB 6:6:6 mode 2 */
|
|
||||||
(blizzard_fn_t) blizzard_draw_line24mode2_32,
|
|
||||||
/* RGB 8:8:8 mode 2 */
|
|
||||||
(blizzard_fn_t) blizzard_draw_line24mode2_32,
|
|
||||||
/* YUV 4:2:2 */
|
|
||||||
NULL,
|
|
||||||
/* YUV 4:2:0 */
|
|
||||||
NULL,
|
|
||||||
NULL, NULL, NULL, NULL, NULL, NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
/* 90deg, 180deg and 270deg rotation */
|
|
||||||
static blizzard_fn_t blizzard_draw_fn_r_32[0x10] = {
|
|
||||||
/* TODO */
|
|
||||||
[0 ... 0xf] = NULL,
|
|
||||||
};
|
|
||||||
Loading…
x
Reference in New Issue
Block a user