[PATCH 15/20] glamor: Provide a placeholder for glamor_pushpixels

[Keith Packard]

This just calls miPushPixels until glamor uses FBOs for bitmaps

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 glamor/glamor_copy.c | 8 ++++++++
 glamor/glamor_core.c | 2 +-
 glamor/glamor_priv.h | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/glamor/glamor_copy.c b/glamor/glamor_copy.c
index a26c4a7..2af0a76 100644
--- a/glamor/glamor_copy.c
+++ b/glamor/glamor_copy.c
@@ -483,6 +483,14 @@ glamor_copyplane(DrawablePtr src, DrawablePtr dst, GCPtr gc,
 }
 
 void
+glamor_pushpixels(GCPtr gc, PixmapPtr bitmap,
+                  DrawablePtr drawable, int w, int h, int x, int y)
+{
+    /* Until we have bitmaps in the GPU, this is about as good as we can manage */
+    miPushPixels(gc, bitmap, drawable, w, h, x, y);
+}
+
+void
 glamor_copywindow(WindowPtr window, DDXPointRec old_origin, RegionPtr src_region)
 {
     PixmapPtr pixmap = glamor_get_drawable_pixmap(&window->drawable);
diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
index 1536c54..f907df5 100644
--- a/glamor/glamor_core.c
+++ b/glamor/glamor_core.c
@@ -451,7 +451,7 @@ GCOps glamor_gc_ops = {
     .ImageText16 = glamor_image_text16,
     .ImageGlyphBlt = glamor_image_glyph_blt,    //miImageGlyphBlt,
     .PolyGlyphBlt = glamor_poly_glyph_blt,      //miPolyGlyphBlt,
-    .PushPixels = glamor_push_pixels,   //miPushPixels,
+    .PushPixels = glamor_pushpixels,
 };
 
 /**
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index c0fd096..1778d04 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -1047,6 +1047,10 @@ glamor_copyplane(DrawablePtr src, DrawablePtr dst, GCPtr gc,
 void
 glamor_copywindow(WindowPtr window, DDXPointRec old_origin, RegionPtr src_region);
 
+void
+glamor_pushpixels(GCPtr gc, PixmapPtr bitmap,
+                  DrawablePtr drawable, int w, int h, int x, int y);
+
 /* glamor_glyphblt.c */
 void glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
                             int x, int y, unsigned int nglyph,
-- 
1.9.0