Remove bg_thread from ui (#1347)

* remove bg_thread

* debug print app

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: ef8aaa77b7

selfdrive/ui/paint.cc

@@ -824,9 +824,6 @@ static void ui_draw_vision(UIState *s) {
   int ui_viz_rw = scene->ui_viz_rw;
   int ui_viz_ro = scene->ui_viz_ro;
 
-  glClearColor(0.0, 0.0, 0.0, 0.0);
-  glClear(GL_STENCIL_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-
   // Draw video frames
   glEnable(GL_SCISSOR_TEST);
   glViewport(ui_viz_rx+ui_viz_ro, s->fb_h-(box_y+box_h), viz_w, box_h);
@@ -869,11 +866,6 @@ static void ui_draw_vision(UIState *s) {
   glDisable(GL_BLEND);
 }
 
-static void ui_draw_blank(UIState *s) {
-  glClearColor(0.0, 0.0, 0.0, 0.0);
-  glClear(GL_STENCIL_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-}
-
 static void ui_draw_background(UIState *s) {
   int bg_status = s->status;
   assert(bg_status < ARRAYSIZE(bg_colors));
@@ -884,12 +876,7 @@ static void ui_draw_background(UIState *s) {
 }
 
 void ui_draw(UIState *s) {
-#ifdef QCOM
-  // TODO: once offroad can become transparent, we can remove bg_thread and this
-  ui_draw_blank(s);
-#else
   ui_draw_background(s);
-#endif
   if (s->vision_connected && s->active_app == cereal_UiLayoutState_App_none && s->status != STATUS_STOPPED) {
     ui_draw_sidebar(s);
     ui_draw_vision(s);

selfdrive/ui/ui.cc

@@ -79,6 +79,7 @@ static void update_offroad_layout_state(UIState *s) {
     .sidebarCollapsed = s->scene.uilayout_sidebarcollapsed,
   };
   cereal_write_UiLayoutState(&layoutd, layoutp);
+  LOGD("setting active app to %d with sidebar %d", layoutd.activeApp, layoutd.sidebarCollapsed);
 
   cereal_Event_ptr eventp = cereal_new_Event(cs);
   struct cereal_Event event = {
@@ -206,7 +207,6 @@ static void ui_init(UIState *s) {
   memset(s, 0, sizeof(UIState));
 
   pthread_mutex_init(&s->lock, NULL);
-  pthread_cond_init(&s->bg_cond, NULL);
 
   s->ctx = Context::create();
   s->model_sock = SubSocket::create(s->ctx, "model");
@@ -249,7 +249,7 @@ static void ui_init(UIState *s) {
   s->ipc_fd = -1;
 
   // init display
-  s->fb = framebuffer_init("ui", 0x00010000, true, &s->fb_w, &s->fb_h);
+  s->fb = framebuffer_init("ui", 0, true, &s->fb_w, &s->fb_h);
   assert(s->fb);
 
   set_awake(s, true);
@@ -361,8 +361,6 @@ static ModelData read_model(cereal_ModelData_ptr modelp) {
 static void update_status(UIState *s, int status) {
   if (s->status != status) {
     s->status = status;
-    // wake up bg thread to change
-    pthread_cond_signal(&s->bg_cond);
   }
 }
 
@@ -521,7 +519,6 @@ void handle_message(UIState *s, Message * msg) {
     s->scene.uilayout_sidebarcollapsed = datad.sidebarCollapsed;
     if (datad.mockEngaged != s->scene.uilayout_mockengaged) {
       s->scene.uilayout_mockengaged = datad.mockEngaged;
-      pthread_cond_signal(&s->bg_cond);
     }
   } else if (eventd.which == cereal_Event_liveMapData) {
     struct cereal_LiveMapData datad;
@@ -866,38 +863,6 @@ fail:
   return NULL;
 }
 
-static void* bg_thread(void* args) {
-  UIState *s = (UIState*)args;
-  set_thread_name("bg");
-
-  FramebufferState *bg_fb = framebuffer_init("bg", 0x00001000, false, NULL, NULL);
-  assert(bg_fb);
-
-  int bg_status = -1;
-  while(!do_exit) {
-    pthread_mutex_lock(&s->lock);
-    if (bg_status == s->status) {
-      // will always be signaled if it changes?
-      pthread_cond_wait(&s->bg_cond, &s->lock);
-    }
-    bg_status = s->status;
-    pthread_mutex_unlock(&s->lock);
-
-    assert(bg_status < ARRAYSIZE(bg_colors));
-    const uint8_t *color = bg_colors[bg_status];
-    if (s->scene.uilayout_mockengaged) {
-      color = bg_colors[STATUS_ENGAGED];
-    }
-
-    glClearColor(color[0]/256.0, color[1]/256.0, color[2]/256.0, 0.0);
-    glClear(GL_COLOR_BUFFER_BIT);
-
-    framebuffer_swap(bg_fb);
-  }
-
-  return NULL;
-}
-
 #endif
 
 int is_leon() {
@@ -940,11 +905,6 @@ int main(int argc, char* argv[]) {
   err = pthread_create(&light_sensor_thread_handle, NULL,
                        light_sensor_thread, s);
   assert(err == 0);
-
-  pthread_t bg_thread_handle;
-  err = pthread_create(&bg_thread_handle, NULL,
-                       bg_thread, s);
-  assert(err == 0);
 #endif
 
   TouchState touch = {0};
@@ -1120,14 +1080,10 @@ int main(int argc, char* argv[]) {
 
   // wake up bg thread to exit
   pthread_mutex_lock(&s->lock);
-  pthread_cond_signal(&s->bg_cond);
   pthread_mutex_unlock(&s->lock);
 
 #ifdef QCOM
   // join light_sensor_thread?
-
-  err = pthread_join(bg_thread_handle, NULL);
-  assert(err == 0);
 #endif
 
   err = pthread_join(connect_thread_handle, NULL);

selfdrive/ui/ui.hpp

@@ -182,7 +182,6 @@ typedef struct {
 
 typedef struct UIState {
   pthread_mutex_t lock;
-  pthread_cond_t bg_cond;
 
   // framebuffer
   FramebufferState *fb;