diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2014-12-10 16:21:44 +0900 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-12-10 19:29:08 -0800 |
| commit | 91651e7c15892aa846fc406fbb13b37f094dd3f0 (patch) | |
| tree | 94f40c9eb971fe62e751b2552e7ca1c88e5910d5 | |
| parent | c1455f76c6b1aa4ecaacb2221a687244285aa44b (diff) | |
glamor: Reinstate glamor_(egl_)destroy_textured_pixmap
They are part of the ABI.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | glamor/glamor.c | 10 | ||||
| -rw-r--r-- | glamor/glamor.h | 1 | ||||
| -rw-r--r-- | glamor/glamor_egl.c | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/glamor/glamor.c b/glamor/glamor.c index 6cf9bdf9d..b32cc1668 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 168341443..95c425306 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 e821601ac..898081a4a 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) { |