[PATCH] glamor: Reinstate glamor_(egl_)destroy_textured_pixmap

Michel Dänzer michel at daenzer.net
Tue Dec 9 23:21:44 PST 2014


From: Michel Dänzer <michel.daenzer at amd.com>

They are part of the ABI.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 glamor/glamor.c     | 10 ++++++++--
 glamor/glamor.h     |  1 +
 glamor/glamor_egl.c |  6 ++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/glamor/glamor.c b/glamor/glamor.c
index 6cf9bdf..b32cc16 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -216,8 +216,8 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
     return pixmap;
 }
 
-Bool
-glamor_destroy_pixmap(PixmapPtr pixmap)
+void
+glamor_destroy_textured_pixmap(PixmapPtr pixmap)
 {
     if (pixmap->refcnt == 1) {
         glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
@@ -227,6 +227,12 @@ glamor_destroy_pixmap(PixmapPtr pixmap)
         glamor_egl_destroy_pixmap_image(pixmap);
 #endif
     }
+}
+
+Bool
+glamor_destroy_pixmap(PixmapPtr pixmap)
+{
+    glamor_destroy_textured_pixmap(pixmap);
     return fbDestroyPixmap(pixmap);
 }
 
diff --git a/glamor/glamor.h b/glamor/glamor.h
index 1683414..95c4253 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -132,6 +132,7 @@ extern _X_EXPORT void glamor_set_pixmap_texture(PixmapPtr pixmap,
 
 extern _X_EXPORT void glamor_set_pixmap_type(PixmapPtr pixmap,
                                              glamor_pixmap_type_t type);
+extern _X_EXPORT void glamor_destroy_textured_pixmap(PixmapPtr pixmap);
 extern _X_EXPORT void glamor_block_handler(ScreenPtr screen);
 
 extern _X_EXPORT PixmapPtr glamor_create_pixmap(ScreenPtr screen, int w, int h,
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index e821601..898081a 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -558,6 +558,12 @@ glamor_egl_exchange_buffers(PixmapPtr front, PixmapPtr back)
 
 }
 
+void
+glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap)
+{
+    glamor_destroy_textured_pixmap(pixmap);
+}
+
 static Bool
 glamor_egl_close_screen(ScreenPtr screen)
 {
-- 
2.1.3



More information about the xorg-devel mailing list