We are currently experiencing downtime impacting viewing & cloning the Mesa repo, and some GitLab pages returning 503. Please see #freedesktop on IRC for more updates.

Commit 91651e7c authored by Michel Dänzer's avatar Michel Dänzer Committed by Keith Packard

glamor: Reinstate glamor_(egl_)destroy_textured_pixmap

They are part of the ABI.
Signed-off-by: Michel Dänzer's avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
parent c1455f76
......@@ -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);
}
......
......@@ -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,
......
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment