[Mesa-dev] [PATCH 07/13] st/omx: use the vl_screen dispatch

Emil Velikov emil.l.velikov at gmail.com
Mon Nov 9 05:31:58 PST 2015


Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 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 d369cec..883a2a1 100644
--- a/src/gallium/state_trackers/omx/entrypoint.c
+++ b/src/gallium/state_trackers/omx/entrypoint.c
@@ -122,14 +122,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);
 }
-- 
2.6.2



More information about the mesa-dev mailing list