diff options
| author | Keith Packard <keithp@keithp.com> | 2014-09-26 18:36:19 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-11-05 14:36:25 -0800 |
| commit | a9fec776d330da29600a3781431d2cdd21bbd191 (patch) | |
| tree | 7a8b32a7e1882b8807399e37ea03ad6afb80a648 | |
| parent | ede06a0e083d7273b1273a88196f567115e26c6f (diff) | |
glamor: Export glamor_copy for driversglamor-fixes
Export glamor_copy so that it can be used before the server is fully
initialized to copy console frame buffer contents to the screen frame
buffer when using the -background none command line option.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | glamor/glamor.h | 14 | ||||
| -rw-r--r-- | glamor/glamor_priv.h | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/glamor/glamor.h b/glamor/glamor.h index 405dbe8ed..8738a5452 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -322,6 +322,20 @@ extern _X_EXPORT void glamor_destroy_gc(GCPtr gc); extern Bool _X_EXPORT glamor_change_window_attributes(WindowPtr pWin, unsigned long mask); extern void _X_EXPORT glamor_copy_window(WindowPtr window, DDXPointRec old_origin, RegionPtr src_region); +#define HAS_GLAMOR_COPY 1 + +extern void _X_EXPORT glamor_copy(DrawablePtr src, + DrawablePtr dst, + GCPtr gc, + BoxPtr box, + int nbox, + int dx, + int dy, + Bool reverse, + Bool upsidedown, + Pixel bitplane, + void *closure); + /* Glamor rendering/drawing functions with XXX_nf. * nf means no fallback within glamor internal if possible. If glamor * fail to accelerate the operation, glamor will return a false, and the diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 885f12a6d..6570367d8 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -966,18 +966,6 @@ glamor_poly_segment(DrawablePtr drawable, GCPtr gc, int nseg, xSegment *segs); /* glamor_copy.c */ -void -glamor_copy(DrawablePtr src, - DrawablePtr dst, - GCPtr gc, - BoxPtr box, - int nbox, - int dx, - int dy, - Bool reverse, - Bool upsidedown, - Pixel bitplane, - void *closure); RegionPtr glamor_copy_area(DrawablePtr src, DrawablePtr dst, GCPtr gc, |