Merge branch 'master' into PA-testing

Edison-CBS · Nov 26, 2023 · 14da88a · 14da88a
2 parents 6ccd3b8 + e25f788
commit 14da88a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/panda b/panda
diff --git a/selfdrive/ui/qt/widgets/cameraview.cc b/selfdrive/ui/qt/widgets/cameraview.cc
@@ -31,8 +31,8 @@ const char frame_vertex_shader[] =
  " vTexCoord = aTexCoord;\n"
  "}\n";
 
-#ifdef QCOM2
 const char frame_fragment_shader[] =
+#ifdef QCOM2
  "#version 300 es\n"
  "#extension GL_OES_EGL_image_external_essl3 : enable\n"
  "precision mediump float;\n"
@@ -43,7 +43,6 @@ const char frame_fragment_shader[] =
  " colorOut = texture(uTexture, vTexCoord);\n"
  "}\n";
 #else
-const char frame_fragment_shader[] =
 #ifdef __APPLE__
  "#version 330 core\n"
 #else