From 44b843b68aba3a2d3fb5328ad88c1dd44ab65327 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 26 Jul 2024 15:41:19 -0400 Subject: [PATCH] egl: collapse driCreateNewDrawable conditional these are all the same case Reviewed-by: Adam Jackson Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 1d5b7eb866f..ba7855dc2de 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1563,17 +1563,7 @@ dri2_create_drawable(struct dri2_egl_display *dri2_dpy, dri2_surf->base.Type == EGL_PIXMAP_BIT, }); } else { - __DRIcreateNewDrawableFunc createNewDrawable; - if (dri2_dpy->image_driver) - createNewDrawable = dri2_dpy->image_driver->createNewDrawable; - else if (dri2_dpy->dri2) - createNewDrawable = dri2_dpy->dri2->createNewDrawable; - else if (dri2_dpy->swrast) - createNewDrawable = driCreateNewDrawable; - else - return _eglError(EGL_BAD_ALLOC, "no createNewDrawable"); - - dri2_surf->dri_drawable = createNewDrawable( + dri2_surf->dri_drawable = driCreateNewDrawable( dri2_dpy->dri_screen_render_gpu, config, loaderPrivate); } if (dri2_surf->dri_drawable == NULL)