frontend/dri: replace the DestroyBuffer callback with a direct call

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19741>
This commit is contained in:
Marek Olšák 2022-11-15 00:15:24 -05:00 committed by Marge Bot
parent f408bb647c
commit 2941eacb22
5 changed files with 2 additions and 7 deletions

View file

@ -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,

View file

@ -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);
}
}

View file

@ -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,

View file

@ -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,
};

View file

@ -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,
};