UI: remove unused lock and fence (#24355)

pull/24391/head
Joost Wooning 3 years ago committed by GitHub
parent 39cf862435
commit 7ac92938d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      selfdrive/ui/qt/widgets/cameraview.cc
  2. 9
      selfdrive/ui/qt/widgets/cameraview.h

@ -214,16 +214,9 @@ void CameraViewWidget::paintGL() {
glClearColor(bg.redF(), bg.greenF(), bg.blueF(), bg.alphaF()); glClearColor(bg.redF(), bg.greenF(), bg.blueF(), bg.alphaF());
glClear(GL_STENCIL_BUFFER_BIT | GL_COLOR_BUFFER_BIT); glClear(GL_STENCIL_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
std::lock_guard lk(lock);
if (latest_frame == nullptr) return; if (latest_frame == nullptr) return;
glViewport(0, 0, width(), height()); glViewport(0, 0, width(), height());
// sync with the PBO
if (wait_fence) {
wait_fence->wait();
}
glBindVertexArray(frame_vao); glBindVertexArray(frame_vao);
glUseProgram(program->programId()); glUseProgram(program->programId());

@ -35,19 +35,10 @@ protected:
virtual void updateFrameMat(int w, int h); virtual void updateFrameMat(int w, int h);
void vipcThread(); void vipcThread();
struct WaitFence {
WaitFence() { sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); }
~WaitFence() { glDeleteSync(sync); }
void wait() { glWaitSync(sync, 0, GL_TIMEOUT_IGNORED); }
GLsync sync = 0;
};
bool zoomed_view; bool zoomed_view;
std::mutex lock;
VisionBuf *latest_frame = nullptr; VisionBuf *latest_frame = nullptr;
GLuint frame_vao, frame_vbo, frame_ibo; GLuint frame_vao, frame_vbo, frame_ibo;
mat4 frame_mat; mat4 frame_mat;
std::unique_ptr<WaitFence> wait_fence;
std::unique_ptr<QOpenGLShaderProgram> program; std::unique_ptr<QOpenGLShaderProgram> program;
QColor bg = QColor("#000000"); QColor bg = QColor("#000000");

Loading…
Cancel
Save