fix shaders

Author: adeebshihadeh

selfdrive/ui/onroad/cameraview.py

@@ -1,3 +1,4 @@
+import platform
 import numpy as np
 import pyray as rl
 
@@ -9,8 +10,17 @@
 
 CONNECTION_RETRY_INTERVAL = 0.2  # seconds between connection attempts
 
-VERTEX_SHADER = """
+VERSION = """
 #version 300 es
+precision mediump float;
+"""
+if platform.system() == "Darwin":
+  VERSION = """
+    #version 330 core
+  """
+
+
+VERTEX_SHADER = VERSION + """
 in vec3 vertexPosition;
 in vec2 vertexTexCoord;
 in vec3 vertexNormal;
@@ -40,9 +50,7 @@
     }
     """
 else:
-  FRAME_FRAGMENT_SHADER = """
-    #version 300 es
-    precision mediump float;
+  FRAME_FRAGMENT_SHADER = VERSION + """
     in vec2 fragTexCoord;
     uniform sampler2D texture0;
     uniform sampler2D texture1;
@@ -72,6 +80,7 @@ def __init__(self, name: str, stream_type: VisionStreamType):
     self._texture_needs_update = True
     self.last_connection_attempt: float = 0.0
     self.shader = rl.load_shader_from_memory(VERTEX_SHADER, FRAME_FRAGMENT_SHADER)
+    assert self.shader.id > 0
     self._texture1_loc: int = rl.get_shader_location(self.shader, "texture1") if not TICI else -1
 
     self.frame: VisionBuf | None = None

system/ui/lib/application.py

@@ -99,7 +99,7 @@ def init_window(self, title: str, fps: int = DEFAULT_FPS):
     HARDWARE.set_display_power(True)
     HARDWARE.set_screen_brightness(65)
 
-    self._set_log_callback()
+    #self._set_log_callback()
     rl.set_trace_log_level(rl.TraceLogLevel.LOG_ALL)
 
     flags = rl.ConfigFlags.FLAG_MSAA_4X_HINT
@@ -140,6 +140,7 @@ def _load_texture_from_image(self, image_path: str, width: int, height: int, alp
 
     # Resize with aspect ratio preservation if requested
     if keep_aspect_ratio:
+      print(image.width, image.height)
       orig_width = image.width
       orig_height = image.height
 

system/ui/lib/shader_polygon.py

@@ -1,13 +1,20 @@
+import platform
 import pyray as rl
 import numpy as np
 from typing import Any
 
 MAX_GRADIENT_COLORS = 15
 
-FRAGMENT_SHADER = """
+VERSION = """
 #version 300 es
 precision mediump float;
+"""
+if platform.system() == "Darwin":
+  VERSION = """
+    #version 330 core
+  """
 
+FRAGMENT_SHADER = VERSION + """
 in vec2 fragTexCoord;
 out vec4 finalColor;