From d0675e96f1fc8501324c88afa648a9d394f35587 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 16 May 2017 11:37:23 -0700 Subject: [PATCH] glamor_egl: Drop glamor_egl_create_textured_screen_ext(). The function hasn't been doing anything useful since keithp's resource freeing fixes in 2014. Reviewed-by: Adam Jackson Signed-off-by: Eric Anholt --- glamor/glamor.h | 14 ++++---------- glamor/glamor_egl.c | 8 -------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/glamor/glamor.h b/glamor/glamor.h index bdd2374cf..b4fd76a6a 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -299,17 +299,11 @@ extern _X_EXPORT Bool glamor_egl_init_textured_pixmap(ScreenPtr screen); extern _X_EXPORT Bool glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride); -/* @glamor_egl_create_textured_screen_ext: - * - * extent one parameter to track the pointer of the DDX layer's back pixmap. - * We need this pointer during the closing screen stage. As before back to - * the DDX's close screen, we have to free all the glamor related resources. +/* Obsolete entrypoint, temporarily left here for API compatibility + * for xf86-video-ati. */ -extern _X_EXPORT Bool glamor_egl_create_textured_screen_ext(ScreenPtr screen, - int handle, - int stride, - PixmapPtr - *back_pixmap); +#define glamor_egl_create_textured_screen_ext(a, b, c, d) \ + glamor_egl_create_textured_screen(a, b, c) /* * @glamor_egl_create_textured_pixmap: Try to create a textured pixmap from diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 4043dcfe8..354c30f68 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -149,14 +149,6 @@ glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride) return TRUE; } -Bool -glamor_egl_create_textured_screen_ext(ScreenPtr screen, - int handle, - int stride, PixmapPtr *back_pixmap) -{ - return glamor_egl_create_textured_screen(screen, handle, stride); -} - static void glamor_egl_set_pixmap_image(PixmapPtr pixmap, EGLImageKHR image) {