[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 8/8] console: Remove unused QEMU_BIG_ENDIAN_FLAG
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL v2 8/8] console: Remove unused QEMU_BIG_ENDIAN_FLAG |
Date: |
Wed, 10 Sep 2014 12:56:43 +0200 |
From: Benjamin Herrenschmidt <address@hidden>
If we need to, we should use the pixman formats instead but for
now this is unused except in commented out code so take it out
to avoid further confusion about surface endianness.
Signed-off-by: Benjamin Herrenschmidt <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/console.h | 3 +--
ui/console.c | 7 -------
ui/vnc-enc-tight.c | 12 ++++--------
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 58a7d4b..cde0faf 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -102,8 +102,7 @@ struct QemuConsoleClass {
ObjectClass parent_class;
};
-#define QEMU_BIG_ENDIAN_FLAG 0x01
-#define QEMU_ALLOCATED_FLAG 0x02
+#define QEMU_ALLOCATED_FLAG 0x01
struct PixelFormat {
uint8_t bits_per_pixel;
diff --git a/ui/console.c b/ui/console.c
index d1342ca..5d73d81 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1237,9 +1237,6 @@ static void qemu_alloc_display(DisplaySurface *surface,
int width, int height)
assert(surface->image != NULL);
surface->flags = QEMU_ALLOCATED_FLAG;
-#ifdef HOST_WORDS_BIGENDIAN
- surface->flags |= QEMU_BIG_ENDIAN_FLAG;
-#endif
}
DisplaySurface *qemu_create_displaysurface(int width, int height)
@@ -1264,10 +1261,6 @@ DisplaySurface *qemu_create_displaysurface_from(int
width, int height,
(void *)data, linesize);
assert(surface->image != NULL);
-#ifdef HOST_WORDS_BIGENDIAN
- surface->flags = QEMU_BIG_ENDIAN_FLAG;
-#endif
-
return surface;
}
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index f02352c..3d1b5cd 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -220,8 +220,7 @@ tight_detect_smooth_image24(VncState *vs, int w, int h)
unsigned int errors; \
unsigned char *buf = vs->tight.tight.buffer; \
\
- endian = 0; /* FIXME: ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) != \
- (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG)); */ \
+ endian = 0; /* FIXME */ \
\
\
max[0] = vs->client_pf.rmax; \
@@ -563,8 +562,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w,
int h)
buf32 = (uint32_t *)buf;
memset(vs->tight.gradient.buffer, 0, w * 3 * sizeof(int));
- if (1 /* FIXME: (vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
- (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG) */) {
+ if (1 /* FIXME */) {
shift[0] = vs->client_pf.rshift;
shift[1] = vs->client_pf.gshift;
shift[2] = vs->client_pf.bshift;
@@ -621,8 +619,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w,
int h)
\
memset (vs->tight.gradient.buffer, 0, w * 3 * sizeof(int)); \
\
- endian = 0; /* FIXME: ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) != \
- (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG)); */ \
+ endian = 0; /* FIXME */ \
\
max[0] = vs->client_pf.rmax; \
max[1] = vs->client_pf.gmax; \
@@ -898,8 +895,7 @@ static void tight_pack24(VncState *vs, uint8_t *buf, size_t
count, size_t *ret)
buf32 = (uint32_t *)buf;
- if (1 /* FIXME: (vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
- (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG) */) {
+ if (1 /* FIXME */) {
rshift = vs->client_pf.rshift;
gshift = vs->client_pf.gshift;
bshift = vs->client_pf.bshift;
--
1.8.3.1
- [Qemu-devel] [PULL v2 0/8] console: pixman conversion continued, Gerd Hoffmann, 2014/09/10
- [Qemu-devel] [PULL v2 1/8] console: add qemu_pixelformat_from_pixman, Gerd Hoffmann, 2014/09/10
- [Qemu-devel] [PULL v2 2/8] console: add qemu_default_pixman_format, Gerd Hoffmann, 2014/09/10
- [Qemu-devel] [PULL v2 3/8] console: reimplement qemu_default_pixelformat, Gerd Hoffmann, 2014/09/10
- [Qemu-devel] [PULL v2 8/8] console: Remove unused QEMU_BIG_ENDIAN_FLAG,
Gerd Hoffmann <=
- [Qemu-devel] [PULL v2 5/8] console: add qemu_create_displaysurface_guestmem, Gerd Hoffmann, 2014/09/10
- [Qemu-devel] [PULL v2 6/8] console: add dpy_gfx_update_dirty, Gerd Hoffmann, 2014/09/10
- [Qemu-devel] [PULL v2 7/8] console: add qemu_pixman_linebuf_copy, Gerd Hoffmann, 2014/09/10
- [Qemu-devel] [PULL v2 4/8] console: stop using PixelFormat, Gerd Hoffmann, 2014/09/10
- Re: [Qemu-devel] [PULL v2 0/8] console: pixman conversion continued, Peter Maydell, 2014/09/11