diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c index 00553fd111a..37acbff3eb8 100644 --- a/src/gallium/frontends/dri/dri2.c +++ b/src/gallium/frontends/dri/dri2.c @@ -2436,7 +2436,6 @@ static const struct __DRIDriverVtableExtensionRec galliumdrm_vtable = { .base = { __DRI_DRIVER_VTABLE, 1 }, .InitScreen = dri2_init_screen, .CreateBuffer = dri2_create_buffer, - .DestroyBuffer = dri_destroy_buffer, .AllocateBuffer = dri2_allocate_buffer, .ReleaseBuffer = dri2_release_buffer, @@ -2463,7 +2462,6 @@ static const struct __DRIDriverVtableExtensionRec dri_swrast_kms_vtable = { .base = { __DRI_DRIVER_VTABLE, 1 }, .InitScreen = dri_swrast_kms_init_screen, .CreateBuffer = dri2_create_buffer, - .DestroyBuffer = dri_destroy_buffer, .AllocateBuffer = dri2_allocate_buffer, .ReleaseBuffer = dri2_release_buffer, diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c index 0d2f29d8535..1d2894970f8 100644 --- a/src/gallium/frontends/dri/dri_util.c +++ b/src/gallium/frontends/dri/dri_util.c @@ -43,6 +43,7 @@ #include "dri_util.h" #include "dri_context.h" #include "dri_screen.h" +#include "dri_drawable.h" #include "util/u_endian.h" #include "util/driconf.h" #include "main/framebuffer.h" @@ -815,7 +816,7 @@ static void dri_put_drawable(__DRIdrawable *pdp) if (pdp->refcount) return; - pdp->driScreenPriv->driver->DestroyBuffer(pdp); + dri_destroy_buffer(pdp); free(pdp); } } diff --git a/src/gallium/frontends/dri/dri_util.h b/src/gallium/frontends/dri/dri_util.h index c008bfd4873..9d9bea2b29d 100644 --- a/src/gallium/frontends/dri/dri_util.h +++ b/src/gallium/frontends/dri/dri_util.h @@ -74,8 +74,6 @@ typedef struct __DRIDriverVtableExtensionRec { const struct gl_config *glVis, GLboolean pixmapBuffer); - void (*DestroyBuffer)(__DRIdrawable *driDrawPriv); - void (*SwapBuffers)(__DRIdrawable *driDrawPriv); __DRIbuffer *(*AllocateBuffer) (__DRIscreen *screenPrivate, diff --git a/src/gallium/frontends/dri/drisw.c b/src/gallium/frontends/dri/drisw.c index ff7433e8766..d8eee01f0e3 100644 --- a/src/gallium/frontends/dri/drisw.c +++ b/src/gallium/frontends/dri/drisw.c @@ -644,7 +644,6 @@ static const struct __DRIDriverVtableExtensionRec galliumsw_vtable = { .base = { __DRI_DRIVER_VTABLE, 1 }, .InitScreen = drisw_init_screen, .CreateBuffer = drisw_create_buffer, - .DestroyBuffer = dri_destroy_buffer, .SwapBuffers = drisw_swap_buffers, .CopySubBuffer = drisw_copy_sub_buffer, }; diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c index 8813a33d732..a75442abc24 100644 --- a/src/gallium/frontends/dri/kopper.c +++ b/src/gallium/frontends/dri/kopper.c @@ -1047,7 +1047,6 @@ static const struct __DRIDriverVtableExtensionRec galliumvk_vtable = { .base = { __DRI_DRIVER_VTABLE, 1 }, .InitScreen = kopper_init_screen, .CreateBuffer = kopper_create_buffer, - .DestroyBuffer = dri_destroy_buffer, .SwapBuffers = kopper_swap_buffers, .CopySubBuffer = NULL, };