frontend/dri: replace the DestroyScreen 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 d57284d673
commit f408bb647c
5 changed files with 1 additions and 7 deletions

View file

@ -2435,7 +2435,6 @@ dri2_create_buffer(__DRIscreen * sPriv,
static const struct __DRIDriverVtableExtensionRec galliumdrm_vtable = {
.base = { __DRI_DRIVER_VTABLE, 1 },
.InitScreen = dri2_init_screen,
.DestroyScreen = dri_destroy_screen,
.CreateBuffer = dri2_create_buffer,
.DestroyBuffer = dri_destroy_buffer,
@ -2463,7 +2462,6 @@ const __DRIextension *galliumdrm_driver_extensions[] = {
static const struct __DRIDriverVtableExtensionRec dri_swrast_kms_vtable = {
.base = { __DRI_DRIVER_VTABLE, 1 },
.InitScreen = dri_swrast_kms_init_screen,
.DestroyScreen = dri_destroy_screen,
.CreateBuffer = dri2_create_buffer,
.DestroyBuffer = dri_destroy_buffer,

View file

@ -230,7 +230,7 @@ static void driDestroyScreen(__DRIscreen *psp)
* stream open to the X-server anymore.
*/
psp->driver->DestroyScreen(psp);
dri_destroy_screen(psp);
driDestroyOptionCache(&psp->optionCache);
driDestroyOptionInfo(&psp->optionInfo);

View file

@ -69,8 +69,6 @@ typedef struct __DRIDriverVtableExtensionRec {
const __DRIconfig **(*InitScreen) (__DRIscreen * priv);
void (*DestroyScreen)(__DRIscreen *driScrnPriv);
GLboolean (*CreateBuffer)(__DRIscreen *driScrnPriv,
__DRIdrawable *driDrawPriv,
const struct gl_config *glVis,

View file

@ -643,7 +643,6 @@ drisw_create_buffer(__DRIscreen * sPriv,
static const struct __DRIDriverVtableExtensionRec galliumsw_vtable = {
.base = { __DRI_DRIVER_VTABLE, 1 },
.InitScreen = drisw_init_screen,
.DestroyScreen = dri_destroy_screen,
.CreateBuffer = drisw_create_buffer,
.DestroyBuffer = dri_destroy_buffer,
.SwapBuffers = drisw_swap_buffers,

View file

@ -1046,7 +1046,6 @@ const __DRIkopperExtension driKopperExtension = {
static const struct __DRIDriverVtableExtensionRec galliumvk_vtable = {
.base = { __DRI_DRIVER_VTABLE, 1 },
.InitScreen = kopper_init_screen,
.DestroyScreen = dri_destroy_screen,
.CreateBuffer = kopper_create_buffer,
.DestroyBuffer = dri_destroy_buffer,
.SwapBuffers = kopper_swap_buffers,