From ff700f8c22c6c51e7c591c481ef3d91a5c16f340 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 16 Aug 2016 17:33:41 +0100 Subject: [PATCH] egl/surfaceless: remove unused dri2_loader_extension implementation Earlier commit introduced support for image_loader and left the dri2_loader code dangling/unused. Let's remove it. Fixes: 63c5d5c6c46 ("Added pbuffer hooks for surfaceless platform") Signed-off-by: Emil Velikov Reviewed-by: Gurchetan Singh --- src/egl/drivers/dri2/platform_surfaceless.c | 33 --------------------- 1 file changed, 33 deletions(-) diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index 797c013133a..2afcbd75bea 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -248,31 +248,6 @@ surfaceless_flush_front_buffer(__DRIdrawable *driDrawable, void *loaderPrivate) { } -static __DRIbuffer * -surfaceless_get_buffers_with_format(__DRIdrawable * driDrawable, - int *width, int *height, - unsigned int *attachments, int count, - int *out_count, void *loaderPrivate) -{ - struct dri2_egl_surface *dri2_surf = loaderPrivate; - - dri2_surf->buffer_count = 1; - if (width) - *width = dri2_surf->base.Width; - if (height) - *height = dri2_surf->base.Height; - *out_count = dri2_surf->buffer_count; - return dri2_surf->buffers; -} - -static const __DRIdri2LoaderExtension droid_dri2_loader_extension = { - .base = { __DRI_DRI2_LOADER, 3 }, - - .getBuffers = NULL, - .flushFrontBuffer = droid_flush_front_buffer, - .getBuffersWithFormat = droid_get_buffers_with_format, -}; - static const __DRIimageLoaderExtension image_loader_extension = { .base = { __DRI_IMAGE_LOADER, 1 }, .getBuffers = surfaceless_image_get_buffers, @@ -326,14 +301,6 @@ dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp) goto cleanup_display; } - dri2_dpy->dri2_loader_extension.base.name = __DRI_DRI2_LOADER; - dri2_dpy->dri2_loader_extension.base.version = 3; - dri2_dpy->dri2_loader_extension.getBuffers = NULL; - dri2_dpy->dri2_loader_extension.flushFrontBuffer = - surfaceless_flush_front_buffer; - dri2_dpy->dri2_loader_extension.getBuffersWithFormat = - surfaceless_get_buffers_with_format; - dri2_dpy->extensions[0] = &image_loader_extension.base; dri2_dpy->extensions[1] = &image_lookup_extension.base; dri2_dpy->extensions[2] = &use_invalidate.base; -- 2.30.2