Module: Mesa Branch: master Commit: 9eb109f4d3b3b145c544eb69ac21cb69e0a5e2be URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9eb109f4d3b3b145c544eb69ac21cb69e0a5e2be
Author: Emil Velikov <[email protected]> Date: Fri Nov 6 22:45:38 2015 +0000 st/omx: use the vl_screen dispatch Signed-off-by: Emil Velikov <[email protected]> Acked-by: Alex Deucher <[email protected]> --- src/gallium/state_trackers/omx/entrypoint.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gallium/state_trackers/omx/entrypoint.c b/src/gallium/state_trackers/omx/entrypoint.c index dd72b29..da9ca10 100644 --- a/src/gallium/state_trackers/omx/entrypoint.c +++ b/src/gallium/state_trackers/omx/entrypoint.c @@ -119,14 +119,13 @@ void omx_put_screen(void) { pipe_mutex_lock(omx_lock); if ((--omx_usecount) == 0) { - if (omx_render_node) { - vl_drm_screen_destroy(omx_screen); + omx_screen->destroy(omx_screen); + omx_screen = NULL; + + if (omx_render_node) close(drm_fd); - } else { - vl_screen_destroy(omx_screen); + else XCloseDisplay(omx_display); - } - omx_screen = NULL; } pipe_mutex_unlock(omx_lock); } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
