From d9eae369e9830d9b1b7eea1c6e924ea507f2df11 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 26 Jul 2024 15:22:08 -0400 Subject: [PATCH] egl: inline DRI_SWRAST Reviewed-by: Adam Jackson Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 2 +- src/egl/drivers/dri2/platform_wayland.c | 4 ++-- src/egl/drivers/dri2/platform_x11.c | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 36a40b48452..86536b7132a 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1568,7 +1568,7 @@ dri2_create_drawable(struct dri2_egl_display *dri2_dpy, else if (dri2_dpy->dri2) createNewDrawable = dri2_dpy->dri2->createNewDrawable; else if (dri2_dpy->swrast) - createNewDrawable = dri2_dpy->swrast->createNewDrawable; + createNewDrawable = driCreateNewDrawable; else return _eglError(EGL_BAD_ALLOC, "no createNewDrawable"); diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 9e0b85d1786..1ad6ee1c97b 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -2788,7 +2788,7 @@ dri2_wl_kopper_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surface) if (dri2_dpy->kopper) return kopperQueryBufferAge(dri2_surf->dri_drawable); else - return dri2_dpy->swrast->queryBufferAge(dri2_surf->dri_drawable); + return driSWRastQueryBufferAge(dri2_surf->dri_drawable); return 0; } @@ -2799,7 +2799,7 @@ dri2_wl_swrast_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surface) struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface); assert(dri2_dpy->swrast); - return dri2_dpy->swrast->queryBufferAge(dri2_surf->dri_drawable); + return driSWRastQueryBufferAge(dri2_surf->dri_drawable); } static void diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 3c27dc613c7..33768ac637b 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1527,7 +1527,7 @@ dri2_kopper_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surf) if (dri2_dpy->kopper) return kopperQueryBufferAge(dri2_surf->dri_drawable); else - return dri2_dpy->swrast->queryBufferAge(dri2_surf->dri_drawable); + return driSWRastQueryBufferAge(dri2_surf->dri_drawable); return 0; } @@ -1535,11 +1535,9 @@ dri2_kopper_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surf) static EGLint dri2_swrast_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surf) { - struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); - assert(dri2_dpy->swrast); - return dri2_dpy->swrast->queryBufferAge(dri2_surf->dri_drawable); + return driSWRastQueryBufferAge(dri2_surf->dri_drawable); } static const struct dri2_egl_display_vtbl dri2_x11_swrast_display_vtbl = {