diff --git a/common/SConscript b/common/SConscript index ebc0ec79e9..8aee6f42a7 100644 --- a/common/SConscript +++ b/common/SConscript @@ -19,7 +19,6 @@ _common = fxn('common', common_libs, LIBS="json11") files = [ 'clutil.cc', - 'visionimg.cc', ] _gpucommon = fxn('gpucommon', files) diff --git a/common/visionimg.cc b/common/visionimg.cc deleted file mode 100644 index 1009767e0d..0000000000 --- a/common/visionimg.cc +++ /dev/null @@ -1,14 +0,0 @@ -#include "common/visionimg.h" - -#include - -EGLImageTexture::EGLImageTexture(const VisionBuf *buf) { - glGenTextures(1, &frame_tex); - glBindTexture(GL_TEXTURE_2D, frame_tex); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, buf->width, buf->height, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr); - glGenerateMipmap(GL_TEXTURE_2D); -} - -EGLImageTexture::~EGLImageTexture() { - glDeleteTextures(1, &frame_tex); -} diff --git a/common/visionimg.h b/common/visionimg.h deleted file mode 100644 index 0cb41a32b8..0000000000 --- a/common/visionimg.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "cereal/visionipc/visionbuf.h" - -#ifdef __APPLE__ -#include -#else -#include -#endif - -class EGLImageTexture { - public: - EGLImageTexture(const VisionBuf *buf); - ~EGLImageTexture(); - GLuint frame_tex = 0; -}; diff --git a/release/files_common b/release/files_common index 982194d774..974ea27711 100644 --- a/release/files_common +++ b/release/files_common @@ -146,15 +146,11 @@ common/modeldata.h common/mat.h common/timing.h -common/visionimg.cc -common/visionimg.h - common/gpio.cc common/gpio.h common/i2c.cc common/i2c.h - selfdrive/controls/__init__.py selfdrive/controls/controlsd.py selfdrive/controls/plannerd.py diff --git a/selfdrive/camerad/cameras/camera_common.h b/selfdrive/camerad/cameras/camera_common.h index 85c55f4b03..74d6a6eb3f 100644 --- a/selfdrive/camerad/cameras/camera_common.h +++ b/selfdrive/camerad/cameras/camera_common.h @@ -13,7 +13,6 @@ #include "common/mat.h" #include "common/queue.h" #include "common/swaglog.h" -#include "common/visionimg.h" #include "selfdrive/hardware/hw.h" #define CAMERA_ID_IMX298 0 diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 6b9db34b4d..47c4ac2a51 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -1,8 +1,8 @@ import os -Import('qt_env', 'arch', 'common', 'messaging', 'gpucommon', 'visionipc', +Import('qt_env', 'arch', 'common', 'messaging', 'visionipc', 'cereal', 'transformations') -base_libs = [gpucommon, common, messaging, cereal, visionipc, transformations, 'zmq', +base_libs = [common, messaging, cereal, visionipc, transformations, 'zmq', 'capnp', 'kj', 'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"] maps = arch in ['larch64', 'x86_64']