forked from enlightenment/efl
parent
62d1bb0190
commit
da0cce6c2c
|
@ -19,13 +19,6 @@ struct _Evas_Engine_Info_XRender_X11
|
||||||
Visual *visual;
|
Visual *visual;
|
||||||
unsigned char destination_alpha : 1;
|
unsigned char destination_alpha : 1;
|
||||||
} info;
|
} info;
|
||||||
/* engine specific function calls to query stuff about the destination */
|
|
||||||
/* engine (what visual & colormap & depth to use, performance info etc. */
|
|
||||||
struct {
|
|
||||||
Visual * (*best_visual_get) (Display *disp, int screen);
|
|
||||||
Colormap (*best_colormap_get) (Display *disp, int screen);
|
|
||||||
int (*best_depth_get) (Display *disp, int screen);
|
|
||||||
} func;
|
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -74,10 +74,6 @@ static void evas_engine_xrender_x11_font_cache_flush(void *data);
|
||||||
static void evas_engine_xrender_x11_font_cache_set(void *data, int bytes);
|
static void evas_engine_xrender_x11_font_cache_set(void *data, int bytes);
|
||||||
static int evas_engine_xrender_x11_font_cache_get(void *data);
|
static int evas_engine_xrender_x11_font_cache_get(void *data);
|
||||||
|
|
||||||
static Visual *evas_engine_xrender_x11_best_visual_get(Display *disp, int screen);
|
|
||||||
static Colormap evas_engine_xrender_x11_best_colormap_get(Display *disp, int screen);
|
|
||||||
static int evas_engine_xrender_x11_best_depth_get(Display *disp, int screen);
|
|
||||||
|
|
||||||
typedef struct _Render_Engine Render_Engine;
|
typedef struct _Render_Engine Render_Engine;
|
||||||
|
|
||||||
struct _Render_Engine
|
struct _Render_Engine
|
||||||
|
@ -188,9 +184,6 @@ evas_engine_xrender_x11_info(Evas *e)
|
||||||
info = calloc(1, sizeof(Evas_Engine_Info_XRender_X11));
|
info = calloc(1, sizeof(Evas_Engine_Info_XRender_X11));
|
||||||
if (!info) return NULL;
|
if (!info) return NULL;
|
||||||
info->magic.magic = rand();
|
info->magic.magic = rand();
|
||||||
info->func.best_visual_get = evas_engine_xrender_x11_best_visual_get;
|
|
||||||
info->func.best_colormap_get = evas_engine_xrender_x11_best_colormap_get;
|
|
||||||
info->func.best_depth_get = evas_engine_xrender_x11_best_depth_get;
|
|
||||||
return info;
|
return info;
|
||||||
e = NULL;
|
e = NULL;
|
||||||
}
|
}
|
||||||
|
@ -262,11 +255,11 @@ evas_engine_xrender_x11_output_free(void *data)
|
||||||
re = (Render_Engine *)data;
|
re = (Render_Engine *)data;
|
||||||
evas_common_font_shutdown();
|
evas_common_font_shutdown();
|
||||||
evas_common_image_shutdown();
|
evas_common_image_shutdown();
|
||||||
if (re->xinf) _xr_image_info_free(re->xinf);
|
|
||||||
if (re->tb) evas_common_tilebuf_free(re->tb);
|
if (re->tb) evas_common_tilebuf_free(re->tb);
|
||||||
if (re->output) _xr_render_surface_free(re->output);
|
if (re->output) _xr_render_surface_free(re->output);
|
||||||
if (re->mask_output) _xr_render_surface_free(re->mask_output);
|
if (re->mask_output) _xr_render_surface_free(re->mask_output);
|
||||||
if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
|
if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
|
||||||
|
if (re->xinf) _xr_image_info_free(re->xinf);
|
||||||
free(re);
|
free(re);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1044,34 +1037,3 @@ evas_engine_xrender_x11_font_cache_get(void *data)
|
||||||
re = (Render_Engine *)data;
|
re = (Render_Engine *)data;
|
||||||
return evas_common_font_cache_get();
|
return evas_common_font_cache_get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* private engine functions the calling prog can use */
|
|
||||||
|
|
||||||
static Visual *
|
|
||||||
evas_engine_xrender_x11_best_visual_get(Display *disp, int screen)
|
|
||||||
{
|
|
||||||
if (!disp) return NULL;
|
|
||||||
return DefaultVisual(disp, screen);
|
|
||||||
}
|
|
||||||
|
|
||||||
static Colormap
|
|
||||||
evas_engine_xrender_x11_best_colormap_get(Display *disp, int screen)
|
|
||||||
{
|
|
||||||
if (!disp) return 0;
|
|
||||||
return DefaultColormap(disp, screen);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
evas_engine_xrender_x11_best_depth_get(Display *disp, int screen)
|
|
||||||
{
|
|
||||||
if (!disp) return 0;
|
|
||||||
return DefaultDepth(disp, screen);
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue