[PATCH xserver 04/11] glamor: Unexport glamor_destroy_textured_pixmap().

Eric Anholt eric at anholt.net
Fri Nov 6 12:51:58 PST 2015


This is just a bit of the DestroyPixmap chain.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 glamor/glamor.c | 9 ++-------
 glamor/glamor.h | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/glamor/glamor.c b/glamor/glamor.c
index d4a0236..dbaee46 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -202,8 +202,8 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
     return pixmap;
 }
 
-void
-glamor_destroy_textured_pixmap(PixmapPtr pixmap)
+Bool
+glamor_destroy_pixmap(PixmapPtr pixmap)
 {
     if (pixmap->refcnt == 1) {
 #if GLAMOR_HAS_GBM
@@ -211,12 +211,7 @@ glamor_destroy_textured_pixmap(PixmapPtr pixmap)
 #endif
         glamor_pixmap_destroy_fbo(pixmap);
     }
-}
 
-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 54fec1d..6d135df 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -110,7 +110,6 @@ 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,
-- 
2.6.2



More information about the xorg-devel mailing list