Attachment 40254 Details for Bug 31603 – Proposal to avoid going through the slowest possible path

[patch] Proposal to avoid going through the slowest possible path

0002-cairo-xlib-surface-Avoid-slow-RGB24-RGB16-color-conv.patch (text/plain), 3.03 KB, created by holger+fdo on 2010-11-13 08:19:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: holger+fdo

Created: 2010-11-13 08:19:11 UTC

Size: 3.03 KB

patch

obsolete

>From 01c91c0a28168196483d21e227a5b745711f6786 Mon Sep 17 00:00:00 2001
>From: Holger Hans Peter Freyther <zecke@selfish.org>
>Date: Sat, 6 Nov 2010 16:45:55 +0100
>Subject: [PATCH 2/4] cairo-xlib-surface: Avoid slow RGB24 -> RGB16 color conversion in cairo
>
>This is restoring the cairo 1.8 behavior and will use a 24bit
>depth xlib-surface when trying to draw a CAIRO_FORMAT_RGB24
>surface.
>---
> src/cairo-xlib-surface.c |   39 +++++++++++++++++++++++++++------------
> 1 files changed, 27 insertions(+), 12 deletions(-)
>
>diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
>index 6d593c0..24f0912 100644
>--- a/src/cairo-xlib-surface.c
>+++ b/src/cairo-xlib-surface.c
>@@ -353,12 +353,12 @@ _xrender_format_to_content (XRenderPictFormat *xrender_format)
> }
> 
> static cairo_surface_t *
>-_cairo_xlib_surface_create_similar (void	       *abstract_src,
>-				    cairo_content_t	content,
>-				    int			width,
>-				    int			height)
>+_cairo_xlib_surface_create_similar_clever (cairo_xlib_surface_t		*src,
>+					   cairo_content_t		content,
>+					   int				width,
>+					   int				height,
>+					   cairo_image_surface_t 	*image)
> {
>-    cairo_xlib_surface_t *src = abstract_src;
>     XRenderPictFormat *xrender_format;
>     cairo_xlib_surface_t *surface;
>     cairo_xlib_display_t *display;
>@@ -379,11 +379,16 @@ _cairo_xlib_surface_create_similar (void	       *abstract_src,
>      * arbitrarily pick a visual/depth for the similar surface.
>      */
>     xrender_format = src->xrender_format;
>-    if ((xrender_format != NULL &&
>-	_xrender_format_to_content (xrender_format) == content) ||
>-	(xrender_format =
>-	 _cairo_xlib_display_get_xrender_format (display,
>-						 _cairo_format_from_content (content))))
>+    if (xrender_format) {
>+	cairo_content_t src_content = _xrender_format_to_content(xrender_format);
>+	if ((image && src_content == content && xrender_format->depth != image->depth) ||
>+             src_content != content) {
>+		xrender_format = _cairo_xlib_display_get_xrender_format (display,
>+						_cairo_format_from_content(content));
>+	}
>+    }
>+
>+    if (xrender_format)
>     {
> 	Visual *visual;
> 
>@@ -451,6 +456,16 @@ _cairo_xlib_surface_create_similar (void	       *abstract_src,
>     return &surface->base;
> }
> 
>+static cairo_surface_t *
>+_cairo_xlib_surface_create_similar (void	       *abstract_src,
>+				    cairo_content_t	content,
>+				    int			width,
>+				    int			height)
>+{
>+    cairo_xlib_surface_t *src = abstract_src;
>+    return _cairo_xlib_surface_create_similar_clever(src, content, width, height, NULL);
>+}
>+
> static cairo_status_t
> _cairo_xlib_surface_finish (void *abstract_surface)
> {
>@@ -1496,9 +1511,9 @@ _cairo_xlib_surface_clone_similar (void			*abstract_surface,
> 	    return UNSUPPORTED ("roi too large for xlib");
> 
> 	clone = (cairo_xlib_surface_t *)
>-	    _cairo_xlib_surface_create_similar (surface,
>+	    _cairo_xlib_surface_create_similar_clever (surface,
> 						image_src->base.content,
>-						width, height);
>+						width, height, image_src);
> 	if (clone == NULL)
> 	    return UNSUPPORTED ("unhandled image format, no similar surface");
> 
>-- 
>1.7.3.2
>

Actions: View | Splinter Review

Attachments on bug 31603: 40253 | 40254 | 40268 | 40286

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.