From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 13/14] pixman/vnc: remove dead code.
Date: Wed, 17 Oct 2012 15:29:13 +0200 [thread overview]
Message-ID: <1350480554-23281-14-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1350480554-23281-1-git-send-email-kraxel@redhat.com>
Switching the vnc server framebuffer to use 32bpp unconditionally
turns the code bits which handle 8 and 16 bpp into dead code.
Remove them.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/vnc-enc-hextile.c | 32 -------------------------
ui/vnc-enc-tight.c | 64 +++++++++++++++++++++-----------------------------
ui/vnc.c | 18 --------------
3 files changed, 27 insertions(+), 87 deletions(-)
diff --git a/ui/vnc-enc-hextile.c b/ui/vnc-enc-hextile.c
index 263a0ce..2e768fd 100644
--- a/ui/vnc-enc-hextile.c
+++ b/ui/vnc-enc-hextile.c
@@ -32,31 +32,11 @@ static void hextile_enc_cord(uint8_t *ptr, int x, int y, int w, int h)
ptr[1] = (((w - 1) & 0x0F) << 4) | ((h - 1) & 0x0F);
}
-#define BPP 8
-#include "vnc-enc-hextile-template.h"
-#undef BPP
-
-#define BPP 16
-#include "vnc-enc-hextile-template.h"
-#undef BPP
-
#define BPP 32
#include "vnc-enc-hextile-template.h"
#undef BPP
#define GENERIC
-#define BPP 8
-#include "vnc-enc-hextile-template.h"
-#undef BPP
-#undef GENERIC
-
-#define GENERIC
-#define BPP 16
-#include "vnc-enc-hextile-template.h"
-#undef BPP
-#undef GENERIC
-
-#define GENERIC
#define BPP 32
#include "vnc-enc-hextile-template.h"
#undef BPP
@@ -89,24 +69,12 @@ void vnc_hextile_set_pixel_conversion(VncState *vs, int generic)
{
if (!generic) {
switch (VNC_SERVER_FB_BITS) {
- case 8:
- vs->hextile.send_tile = send_hextile_tile_8;
- break;
- case 16:
- vs->hextile.send_tile = send_hextile_tile_16;
- break;
case 32:
vs->hextile.send_tile = send_hextile_tile_32;
break;
}
} else {
switch (VNC_SERVER_FB_BITS) {
- case 8:
- vs->hextile.send_tile = send_hextile_tile_generic_8;
- break;
- case 16:
- vs->hextile.send_tile = send_hextile_tile_generic_16;
- break;
case 32:
vs->hextile.send_tile = send_hextile_tile_generic_32;
break;
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index 9fd2556..9ae4cab 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -671,41 +671,35 @@ DEFINE_GRADIENT_FILTER_FUNCTION(32)
* that case new color will be stored in *colorPtr.
*/
-#define DEFINE_CHECK_SOLID_FUNCTION(bpp) \
- \
- static bool \
- check_solid_tile##bpp(VncState *vs, int x, int y, int w, int h, \
- uint32_t* color, bool samecolor) \
- { \
- VncDisplay *vd = vs->vd; \
- uint##bpp##_t *fbptr; \
- uint##bpp##_t c; \
- int dx, dy; \
- \
- fbptr = vnc_server_fb_ptr(vd, x, y); \
- \
- c = *fbptr; \
- if (samecolor && (uint32_t)c != *color) { \
- return false; \
- } \
- \
- for (dy = 0; dy < h; dy++) { \
- for (dx = 0; dx < w; dx++) { \
- if (c != fbptr[dx]) { \
- return false; \
- } \
- } \
- fbptr = (uint##bpp##_t *) \
- ((uint8_t *)fbptr + vnc_server_fb_stride(vd)); \
- } \
- \
- *color = (uint32_t)c; \
- return true; \
+static bool
+check_solid_tile32(VncState *vs, int x, int y, int w, int h,
+ uint32_t *color, bool samecolor)
+{
+ VncDisplay *vd = vs->vd;
+ uint32_t *fbptr;
+ uint32_t c;
+ int dx, dy;
+
+ fbptr = vnc_server_fb_ptr(vd, x, y);
+
+ c = *fbptr;
+ if (samecolor && (uint32_t)c != *color) {
+ return false;
}
-DEFINE_CHECK_SOLID_FUNCTION(32)
-DEFINE_CHECK_SOLID_FUNCTION(16)
-DEFINE_CHECK_SOLID_FUNCTION(8)
+ for (dy = 0; dy < h; dy++) {
+ for (dx = 0; dx < w; dx++) {
+ if (c != fbptr[dx]) {
+ return false;
+ }
+ }
+ fbptr = (uint32_t *)
+ ((uint8_t *)fbptr + vnc_server_fb_stride(vd));
+ }
+
+ *color = (uint32_t)c;
+ return true;
+}
static bool check_solid_tile(VncState *vs, int x, int y, int w, int h,
uint32_t* color, bool samecolor)
@@ -713,10 +707,6 @@ static bool check_solid_tile(VncState *vs, int x, int y, int w, int h,
switch (VNC_SERVER_FB_BYTES) {
case 4:
return check_solid_tile32(vs, x, y, w, h, color, samecolor);
- case 2:
- return check_solid_tile16(vs, x, y, w, h, color, samecolor);
- default:
- return check_solid_tile8(vs, x, y, w, h, color, samecolor);
}
}
diff --git a/ui/vnc.c b/ui/vnc.c
index 0cf164a..869ad46 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -666,24 +666,6 @@ static void vnc_write_pixels_generic(VncState *vs,
vnc_convert_pixel(vs, buf, pixels[i]);
vnc_write(vs, buf, vs->client_pf.bytes_per_pixel);
}
- } else if (VNC_SERVER_FB_BYTES == 2) {
- uint16_t *pixels = pixels1;
- int n, i;
- n = size >> 1;
- for (i = 0; i < n; i++) {
- vnc_convert_pixel(vs, buf, pixels[i]);
- vnc_write(vs, buf, vs->client_pf.bytes_per_pixel);
- }
- } else if (VNC_SERVER_FB_BYTES == 1) {
- uint8_t *pixels = pixels1;
- int n, i;
- n = size;
- for (i = 0; i < n; i++) {
- vnc_convert_pixel(vs, buf, pixels[i]);
- vnc_write(vs, buf, vs->client_pf.bytes_per_pixel);
- }
- } else {
- fprintf(stderr, "%s: VncState color depth not supported\n", __func__);
}
}
--
1.7.1
next prev parent reply other threads:[~2012-10-17 13:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-17 13:29 [Qemu-devel] [PATCH 00/14] pixman patch series Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 01/14] console: remove DisplayAllocator Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 02/14] pixman: add submodule Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 03/14] pixman: windup in configure & makefiles Gerd Hoffmann
2012-10-17 14:26 ` Paolo Bonzini
2012-11-22 12:34 ` Stefano Stabellini
2012-11-22 12:59 ` Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 04/14] pixman: helper functions Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 05/14] pixman: add pixman image to DisplaySurface Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 06/14] console: make qemu_alloc_display static Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 07/14] console: don't set PixelFormat alpha fields for 32bpp Gerd Hoffmann
2012-10-19 17:02 ` Stefano Stabellini
2012-10-22 5:26 ` Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 08/14] qxl: stop direct access to DisplaySurface fields Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 09/14] vga: " Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 10/14] pixman: switch screendump function Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 11/14] pixman/vnc: use pixman images in vnc Gerd Hoffmann
2012-10-19 18:04 ` Stefano Stabellini
2012-10-22 5:40 ` Gerd Hoffmann
2012-10-17 13:29 ` [Qemu-devel] [PATCH 12/14] pixman/vnc: remove rgb_prepare_row* functions Gerd Hoffmann
2012-10-17 13:29 ` Gerd Hoffmann [this message]
2012-10-17 13:29 ` [Qemu-devel] [PATCH 14/14] pixman: drop obsolete fields from DisplaySurface Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350480554-23281-14-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).