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

xlib: Remove screen->has_render

Browse source 
Use the info from the display instead.
This commit is contained in:
Chris Wilson 2010-05-06 10:03:36 +01:00
parent 9e0b716ecf
commit 20d75bdadc
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cairo-xlib-private.h
View file

@ -101,7 +101,6 @@ struct _cairo_xlib_screen {
cairo_device_t *device;
Screen *screen;
cairo_bool_t has_render;
cairo_bool_t has_font_options;
cairo_font_options_t font_options;

17
src/cairo-xlib-screen.c
View file

@ -167,16 +167,16 @@ _cairo_xlib_init_screen_font_options (Display *dpy,
if (!get_integer_default (dpy, "rgba", &xft_rgba))
{
cairo_xlib_display_t *display = (cairo_xlib_display_t *) info->device;
xft_rgba = FC_RGBA_UNKNOWN;
#if RENDER_MAJOR > 0 || RENDER_MINOR >= 6
if (info->has_render)
{
if (display->render_major > 0 || display->render_minor >= 6) {
int render_order = XRenderQuerySubpixelOrder (dpy,
XScreenNumberOfScreen (info->screen));
switch (render_order)
{
switch (render_order) {
default:
case SubPixelUnknown:
xft_rgba = FC_RGBA_UNKNOWN;
@ -350,7 +350,6 @@ _cairo_xlib_screen_get (Display *dpy,
CAIRO_REFERENCE_COUNT_INIT (&info->ref_count, 2); /* Add one for display cache */
info->device = device;
info->screen = screen;
info->has_render = FALSE;
info->has_font_options = FALSE;
info->gc_depths = 0;
memset (info->gc, 0, sizeof (info->gc));
@ -358,14 +357,6 @@ _cairo_xlib_screen_get (Display *dpy,
_cairo_array_init (&info->visuals,
sizeof (cairo_xlib_visual_info_t*));
if (screen) {
int event_base, error_base;
info->has_render =
XRenderQueryExtension (dpy, &event_base, &error_base) &&
(XRenderFindVisualFormat (dpy, DefaultVisual (dpy, DefaultScreen (dpy))) != 0);
}
_cairo_xlib_display_add_screen (display, info);
*out = info;