Browse Source

st/xorg: New libkms destroy api

tags/mesa-7.7-rc2-1
Jakob Bornecrantz 15 years ago
parent
commit
d5b94b49f6

+ 2
- 2
src/gallium/state_trackers/xorg/xorg_crtc.c View File

@@ -257,7 +257,7 @@ crtc_load_cursor_argb_kms(xf86CrtcPtr crtc, CARD32 * image)
return;

err_bo_destroy:
kms_bo_destroy(crtcp->cursor_bo);
kms_bo_destroy(&crtcp->cursor_bo);
}
#endif

@@ -305,7 +305,7 @@ xorg_crtc_cursor_destroy(xf86CrtcPtr crtc)
pipe_texture_reference(&crtcp->cursor_tex, NULL);
#ifdef HAVE_LIBKMS
if (crtcp->cursor_bo)
kms_bo_destroy(crtcp->cursor_bo);
kms_bo_destroy(&crtcp->cursor_bo);
#endif

xfree(crtcp);

+ 3
- 5
src/gallium/state_trackers/xorg/xorg_driver.c View File

@@ -260,8 +260,7 @@ drv_close_resource_management(ScrnInfoPtr pScrn)

#ifdef HAVE_LIBKMS
if (ms->kms)
kms_destroy(ms->kms);
ms->kms = NULL;
kms_destroy(&ms->kms);
#endif

return TRUE;
@@ -898,8 +897,7 @@ drv_destroy_front_buffer_kms(ScrnInfoPtr pScrn)
return TRUE;

kms_bo_unmap(ms->root_bo);
kms_bo_destroy(ms->root_bo);
ms->root_bo = NULL;
kms_bo_destroy(&ms->root_bo);
return TRUE;
}

@@ -945,7 +943,7 @@ drv_create_front_buffer_kms(ScrnInfoPtr pScrn)
return TRUE;

err_destroy:
kms_bo_destroy(bo);
kms_bo_destroy(&bo);
return FALSE;
}


Loading…
Cancel
Save