Skip to content

Commit 6d09b24

Browse files
raylib: fix shaders on macOS (#35411)
* fix shaders * runs now
1 parent 8220599 commit 6d09b24

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

selfdrive/ui/onroad/cameraview.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import platform
12
import numpy as np
23
import pyray as rl
34

@@ -9,8 +10,17 @@
910

1011
CONNECTION_RETRY_INTERVAL = 0.2 # seconds between connection attempts
1112

12-
VERTEX_SHADER = """
13+
VERSION = """
1314
#version 300 es
15+
precision mediump float;
16+
"""
17+
if platform.system() == "Darwin":
18+
VERSION = """
19+
#version 330 core
20+
"""
21+
22+
23+
VERTEX_SHADER = VERSION + """
1424
in vec3 vertexPosition;
1525
in vec2 vertexTexCoord;
1626
in vec3 vertexNormal;
@@ -40,9 +50,7 @@
4050
}
4151
"""
4252
else:
43-
FRAME_FRAGMENT_SHADER = """
44-
#version 300 es
45-
precision mediump float;
53+
FRAME_FRAGMENT_SHADER = VERSION + """
4654
in vec2 fragTexCoord;
4755
uniform sampler2D texture0;
4856
uniform sampler2D texture1;

system/ui/lib/shader_polygon.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1+
import platform
12
import pyray as rl
23
import numpy as np
34
from typing import Any
45

56
MAX_GRADIENT_COLORS = 15
67

7-
FRAGMENT_SHADER = """
8+
VERSION = """
89
#version 300 es
910
precision mediump float;
11+
"""
12+
if platform.system() == "Darwin":
13+
VERSION = """
14+
#version 330 core
15+
"""
1016

17+
FRAGMENT_SHADER = VERSION + """
1118
in vec2 fragTexCoord;
1219
out vec4 finalColor;
1320
@@ -111,8 +118,7 @@
111118
"""
112119

113120
# Default vertex shader
114-
VERTEX_SHADER = """
115-
#version 300 es
121+
VERTEX_SHADER = VERSION + """
116122
in vec3 vertexPosition;
117123
in vec2 vertexTexCoord;
118124
out vec2 fragTexCoord;

0 commit comments

Comments
 (0)