[PATCH] glamor: Export glamor_copy for drivers

Keith Packard keithp at keithp.com
Fri Sep 26 19:40:03 PDT 2014


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 at keithp.com>
---
 glamor/glamor.h      | 14 ++++++++++++++
 glamor/glamor_priv.h | 12 ------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/glamor/glamor.h b/glamor/glamor.h
index 405dbe8..8738a54 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 c089db8..947e376 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -964,18 +964,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,
-- 
2.1.1



More information about the xorg-devel mailing list