Skia now supports initialisation with EGL on Linux

Need to use the latest version, but can now run the ES tests on Linux.

Author: jonathanhogg

pyproject.toml

@@ -49,7 +49,7 @@ dependencies = [
     "regex",
     "rtmidi2",
     "scipy",
-    "skia-python>=117.0b3",
+    "skia-python>=138.0rc1",
     "trimesh",
 ]
 

src/flitter/render/window/canvas.pyx

@@ -878,7 +878,7 @@ class Canvas(WindowNode):
         if self._target is not None:
             self._target.release()
 
-    def create(self, engine, node, resized, **kwargs):
+    def create(self, engine, node, resized, opengl_es=False, **kwargs):
         colorbits = node.get('colorbits', 1, int, 8)
         srgb = not node.get('linear', 1, bool, False)
         if srgb or colorbits not in COLOR_FORMATS:
@@ -889,7 +889,10 @@ class Canvas(WindowNode):
                 self._target.release()
             self._target = RenderTarget.get(self.glctx, self.width, self.height, colorbits, srgb=srgb)
             if self._graphics_context is None:
-                self._graphics_context = skia.GrDirectContext.MakeGL()
+                if opengl_es:
+                    self._graphics_context = skia.GrDirectContext.MakeGL(skia.GrGLInterface.MakeEGL())
+                else:
+                    self._graphics_context = skia.GrDirectContext.MakeGL()
                 if self._graphics_context is None:
                     logger.error("Failed to create GL context for Skia (is this OpenGL ES?)")
                     self._surface = None

tests/test_engine.py

@@ -251,46 +251,8 @@ def test_translucency(self):
     def test_video(self):
         self.assertScriptOutputMatchesImage(self.EXAMPLES / 'video.fl')
 
-    @unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
-    def test_bauble_opengl_es(self):
-        self.assertScriptOutputMatchesImage(self.EXAMPLES / 'bauble.fl', opengl_es=True, suffix='.es.png')
 
-    @unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
-    def test_bounce_opengl_es(self):
-        self.assertScriptOutputMatchesImage(self.EXAMPLES / 'bounce.fl', target_fps=10, opengl_es=True, suffix='.es.png')
-
-    @unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
-    def test_canvas3d_opengl_es(self):
-        self.assertScriptOutputMatchesImage(self.EXAMPLES / 'canvas3d.fl', opengl_es=True, suffix='.es.png')
-
-    @unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
-    def test_linelight_opengl_es(self):
-        self.assertScriptOutputMatchesImage(self.EXAMPLES / 'linelight.fl', opengl_es=True, suffix='.es.png')
-
-    @unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
-    def test_oklch_opengl_es(self):
-        self.assertScriptOutputMatchesImage(self.EXAMPLES / 'oklch.fl', opengl_es=True, suffix='.es.png')
-
-    @unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
-    def test_physics_opengl_es(self):
-        self.assertScriptOutputMatchesImage(self.EXAMPLES / 'physics.fl', target_fps=10, opengl_es=True, suffix='.es.png')
-
-    @unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
-    def test_sdf_opengl_es(self):
-        self.assertScriptOutputMatchesImage(self.EXAMPLES / 'sdf.fl', opengl_es=True, suffix='.es.png')
-
-    @unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
-    def test_solidgeometry_opengl_es(self):
-        self.assertScriptOutputMatchesImage(self.EXAMPLES / 'solidgeometry.fl', opengl_es=True, suffix='.es.png')
-
-    @unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
-    def test_teaset_opengl_es(self):
-        self.assertScriptOutputMatchesImage(self.EXAMPLES / 'teaset.fl', opengl_es=True, suffix='.es.png')
-
-    @unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
-    def test_textures_opengl_es(self):
-        self.assertScriptOutputMatchesImage(self.EXAMPLES / 'textures.fl', target_fps=2, opengl_es=True, suffix='.es.png')
-
-    @unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
-    def test_translucency_opengl_es(self):
-        self.assertScriptOutputMatchesImage(self.EXAMPLES / 'translucency.fl', opengl_es=True, suffix='.es.png')
+@unittest.skipIf(sys.platform != 'linux', 'OpenGL ES only available on Linux')
+class TestExamplesOpenGLES(TestExamples):
+    def assertScriptOutputMatchesImage(self, script, suffix='.es.png', target_fps=1, run_time=1, **kwargs):
+        super().assertScriptOutputMatchesImage(script, suffix, target_fps, run_time, opengl_es=True, **kwargs)