mawei
/
tsl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "ui/cameraview: merge EGL Image Clearing code into `clearEGLImages()` (#32292)" 

This reverts commit 44486989b061fbbe31aff217ec82e7ce7b604950.

old-commit-hash: d56f188854
This commit is contained in:
Adeeb Shihadeh 2024-04-25 11:14:03 -07:00
parent 2772be8303
commit 32ea4667c2
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
selfdrive/ui/qt/widgets/cameraview.cc
View File

@ -6,6 +6,14 @@
#include <GLES3/gl3.h>
#endif
#include <cmath>
#include <set>
#include <string>
#include <utility>
#include <QOpenGLBuffer>
#include <QOffscreenSurface>
namespace {
const char frame_vertex_shader[] =
@ -189,7 +197,15 @@ void CameraWidget::stopVipcThread() {
vipc_thread = nullptr;
}
clearEGLImages();
#ifdef QCOM2
EGLDisplay egl_display = eglGetCurrentDisplay();
assert(egl_display != EGL_NO_DISPLAY);
for (auto &pair : egl_images) {
eglDestroyImageKHR(egl_display, pair.second);
assert(eglGetError() == EGL_SUCCESS);
}
egl_images.clear();
#endif
}
void CameraWidget::availableStreamsUpdated(std::set<VisionStreamType> streams) {
@ -320,7 +336,12 @@ void CameraWidget::vipcConnected(VisionIpcClient *vipc_client) {
stream_stride = vipc_client->buffers[0].stride;
#ifdef QCOM2
clearEGLImages();
EGLDisplay egl_display = eglGetCurrentDisplay();
assert(egl_display != EGL_NO_DISPLAY);
for (auto &pair : egl_images) {
eglDestroyImageKHR(egl_display, pair.second);
}
egl_images.clear();
for (int i = 0; i < vipc_client->num_buffers; i++) { // import buffers into OpenGL
int fd = dup(vipc_client->buffers[i].fd); // eglDestroyImageKHR will close, so duplicate
@ -414,15 +435,3 @@ void CameraWidget::clearFrames() {
frames.clear();
available_streams.clear();
}
void CameraWidget::clearEGLImages() {
#ifdef QCOM2
EGLDisplay egl_display = eglGetCurrentDisplay();
assert(egl_display != EGL_NO_DISPLAY);
for (auto &pair : egl_images) {
eglDestroyImageKHR(egl_display, pair.second);
}
egl_images.clear();
#endif
}

1
selfdrive/ui/qt/widgets/cameraview.h
View File

@ -58,7 +58,6 @@ protected:
void updateCalibration(const mat3 &calib);
void vipcThread();
void clearFrames();
void clearEGLImages();
int glWidth();
int glHeight();