working on device

Author: Comma Device

selfdrive/loggerd/SConscript

@@ -3,7 +3,7 @@ Import('env', 'arch', 'cereal', 'messaging', 'common', 'visionipc')
 libs = [common, cereal, messaging, visionipc,
         'zmq', 'capnp', 'kj', 'z',
         'avformat', 'avcodec', 'swscale', 'avutil',
-        'yuv', 'OpenCL', 'pthread']
+        'yuv', 'OpenCL', 'EGL', 'pthread']
 
 src = ['logger.cc', 'video_writer.cc', 'encoder/encoder.cc']
 if arch == "larch64":

selfdrive/modeld/SConscript

@@ -4,7 +4,7 @@ Import('env', 'arch', 'cereal', 'messaging', 'common', 'gpucommon', 'visionipc')
 lenv = env.Clone()
 
 libs = [cereal, messaging, common, visionipc, gpucommon,
-        'OpenCL', 'SNPE', 'capnp', 'zmq', 'kj', 'yuv']
+        'OpenCL', 'EGL', 'SNPE', 'capnp', 'zmq', 'kj', 'yuv']
 
 def get_dlsym_offset():
   """Returns the offset between dlopen and dlsym in libdl.so"""

selfdrive/ui/SConscript

@@ -3,7 +3,7 @@ Import('qt_env', 'arch', 'common', 'messaging', 'visionipc',
        'cereal', 'transformations')
 
 base_libs = [common, messaging, cereal, visionipc, transformations, 'zmq',
-             'capnp', 'kj', 'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"]
+             'capnp', 'kj', 'm', 'OpenCL', 'EGL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"]
 
 maps = arch in ['larch64', 'x86_64']
 
@@ -114,7 +114,7 @@ if arch in ['x86_64', 'Darwin'] or GetOption('extras'):
   replay_lib = qt_env.Library("qt_replay", replay_lib_src, LIBS=base_libs)
   replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'bz2', 'curl', 'yuv', 'ncurses'] + qt_libs
   qt_env.Program("replay/replay", ["replay/main.cc"], LIBS=replay_libs)
-  qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'json11', 'zmq', 'visionipc', 'messaging', 'EGL'])
+  qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'json11', 'zmq', 'visionipc', 'messaging'])
 
   if GetOption('test'):
     qt_env.Program('replay/tests/test_replay', ['replay/tests/test_runner.cc', 'replay/tests/test_replay.cc'], LIBS=[replay_libs])

selfdrive/ui/qt/widgets/cameraview.cc

@@ -46,7 +46,7 @@ const char frame_fragment_shader[] =
   "void main() {\n"
   "  float y = texture(uTexture, vTexCoord).r;\n"
   "  float u = texture(uTexture, vTexCoord).g - 0.5;\n"
-  "  float v = texture(uTexture, vTexCoord).g - 0.5;\n"
+  "  float v = texture(uTexture, vTexCoord).b - 0.5;\n"
   "  float r = y + 1.402 * v;\n"
   "  float g = y - 0.344 * u - 0.714 * v;\n"
   "  float b = y + 1.772 * u;\n"
@@ -237,7 +237,7 @@ void CameraViewWidget::paintGL() {
 
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_2D, textures[0]);
-  glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, latest_frame->egl_image);
+  glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, frame->egl_image);
   assert(glGetError() == GL_NO_ERROR);
 
   glUniformMatrix4fv(program->uniformLocation("uTransform"), 1, GL_TRUE, frame_mat.v);