use std::unique_ptr

Author: deanlee

selfdrive/ui/qt/widgets/cameraview.cc

@@ -106,11 +106,6 @@ CameraViewWidget::~CameraViewWidget() {
     glDeleteVertexArrays(1, &frame_vao);
     glDeleteBuffers(1, &frame_vbo);
     glDeleteBuffers(1, &frame_ibo);
-    for (auto sync : gl_fences) {
-      if (glIsSync(sync)) {
-        glDeleteSync(sync);
-      }
-    }
   }
   doneCurrent();
 }
@@ -210,13 +205,11 @@ void CameraViewWidget::paintGL() {
   int texture_id = latest_texture_id;
   if (texture_id == -1) return;
 
-  // sync with the PBO
-  if (glIsSync(gl_fences[texture_id])) {
-    glWaitSync(gl_fences[texture_id], 0, GL_TIMEOUT_IGNORED);
-  }
-
   glViewport(0, 0, width(), height());
 
+  // sync with the PBO
+  glWaitSync(gl_fences[texture_id]->sync, 0, GL_TIMEOUT_IGNORED);
+
   glBindVertexArray(frame_vao);
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_2D, texture[texture_id]->frame_tex);
@@ -311,10 +304,7 @@ void CameraViewWidget::vipcThread() {
         glBindTexture(GL_TEXTURE_2D, 0);
         assert(glGetError() == GL_NO_ERROR);
 
-        if (glIsSync(gl_fences[buf->idx])) {
-          glDeleteSync(gl_fences[buf->idx]);
-        }
-        gl_fences[buf->idx] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+        gl_fences[buf->idx].reset(new WaitFence());
       }
       latest_texture_id = buf->idx;
       // Schedule update. update() will be invoked on the gui thread.

selfdrive/ui/qt/widgets/cameraview.h

@@ -36,12 +36,18 @@ class CameraViewWidget : public QOpenGLWidget, protected QOpenGLFunctions {
   virtual void updateFrameMat(int w, int h);
   void vipcThread();
 
+  struct WaitFence {
+    WaitFence() { sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); }
+    ~WaitFence() { glDeleteSync(sync); }
+    GLsync sync;
+  };
+
   bool zoomed_view;
   std::atomic<int> latest_texture_id = -1;
   GLuint frame_vao, frame_vbo, frame_ibo;
   mat4 frame_mat;
   std::unique_ptr<EGLImageTexture> texture[UI_BUF_COUNT];
-  GLsync gl_fences[UI_BUF_COUNT] = {};
+  std::unique_ptr<WaitFence> gl_fences[UI_BUF_COUNT];
   std::unique_ptr<QOpenGLShaderProgram> program;
   QColor bg = QColor("#000000");