fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-09 08:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[xlib] Remove redundant code to query a xrender_format from a visual

Browse source 
We always query an xrender_format for a Visual upon surface creation, so
checking again in create_similar() is redundant. (It also interferes with
disabling XRender...)
This commit is contained in:
Chris Wilson 2009-06-19 16:09:26 +01:00
parent dd842a2bed
commit cec8579348
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cairo-xlib-surface.c
View file

@ -210,7 +210,7 @@ _cairo_xlib_surface_create_similar (void *abstract_src,
int height) int height)
{ {
cairo_xlib_surface_t *src = abstract_src; cairo_xlib_surface_t *src = abstract_src;
XRenderPictFormat *xrender_format = src->xrender_format; XRenderPictFormat *xrender_format;
cairo_xlib_surface_t *surface; cairo_xlib_surface_t *surface;
Pixmap pix; Pixmap pix;
@ -219,17 +219,12 @@ _cairo_xlib_surface_create_similar (void *abstract_src,
_cairo_xlib_display_notify (src->display); _cairo_xlib_display_notify (src->display);
/* Start by examining the surface's XRenderFormat, or if it
* doesn't have one, then look one up through its visual (in the
* case of a bitmap, it won't even have that). */
if (xrender_format == NULL && src->visual != NULL)
xrender_format = XRenderFindVisualFormat (src->dpy, src->visual);
/* If we never found an XRenderFormat or if it isn't compatible /* If we never found an XRenderFormat or if it isn't compatible
* with the content being requested, then we fallback to just * with the content being requested, then we fallback to just
* constructing a cairo_format_t instead, (which will fairly * constructing a cairo_format_t instead, (which will fairly
* arbitrarily pick a visual/depth for the similar surface. * arbitrarily pick a visual/depth for the similar surface.
*/ */
xrender_format = src->xrender_format;
if (xrender_format == NULL || if (xrender_format == NULL ||
_xrender_format_to_content (xrender_format) != content) _xrender_format_to_content (xrender_format) != content)
{ {