forked from enlightenment/efl
ecore_wl2: Fix dmabuf test failure
We need to destroy the buffer manager on fail, since it will exist but only be able to create buffers we can't actually use.
This commit is contained in:
parent
c08920820b
commit
925be86f9e
|
@ -456,7 +456,6 @@ _buffer_manager_deref(void)
|
||||||
if (drm_fd >=0) close(drm_fd);
|
if (drm_fd >=0) close(drm_fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Currently no callers, but that will change...
|
|
||||||
static void
|
static void
|
||||||
_buffer_manager_destroy(void)
|
_buffer_manager_destroy(void)
|
||||||
{
|
{
|
||||||
|
@ -464,7 +463,6 @@ _buffer_manager_destroy(void)
|
||||||
buffer_manager->destroyed = EINA_TRUE;
|
buffer_manager->destroyed = EINA_TRUE;
|
||||||
_buffer_manager_deref();
|
_buffer_manager_deref();
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
|
|
||||||
static Buffer_Handle *
|
static Buffer_Handle *
|
||||||
_buffer_manager_alloc(const char *name, int w, int h, unsigned long *stride, int32_t *fd)
|
_buffer_manager_alloc(const char *name, int w, int h, unsigned long *stride, int32_t *fd)
|
||||||
|
@ -585,6 +583,8 @@ _create_failed(void *data, struct zwp_linux_buffer_params_v1 *params)
|
||||||
Ecore_Wl2_Display *ewd = data;
|
Ecore_Wl2_Display *ewd = data;
|
||||||
|
|
||||||
zwp_linux_buffer_params_v1_destroy(params);
|
zwp_linux_buffer_params_v1_destroy(params);
|
||||||
|
_buffer_manager_deref();
|
||||||
|
_buffer_manager_destroy();
|
||||||
ewd->wl.dmabuf = NULL;
|
ewd->wl.dmabuf = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -614,5 +614,6 @@ _ecore_wl2_buffer_test(Ecore_Wl2_Display *ewd)
|
||||||
|
|
||||||
return;
|
return;
|
||||||
fail:
|
fail:
|
||||||
|
_buffer_manager_destroy();
|
||||||
ewd->wl.dmabuf = NULL;
|
ewd->wl.dmabuf = NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue