re-enable mock and avoid using OpenGL/OpenGLES libraries via SDL2 whe…

…n in mock
misl6 · Apr 21, 2024 · 196ca36 · 196ca36
1 parent 5b22782
commit 196ca36
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/osx_wheels_app.yml b/.github/workflows/osx_wheels_app.yml
@@ -87,6 +87,8 @@ jobs:
     runs-on: macos-latest
     needs: osx_wheels_create
     if: github.event_name != 'pull_request'
+    env:
+      KIVY_GL_BACKEND: 'mock'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python
@@ -137,6 +139,8 @@ jobs:
             python: '3.8'
           - runs_on: apple-silicon-m1
             python: '3.9'
+    env:
+      KIVY_GL_BACKEND: 'mock'
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python }} on ${{ matrix.runs_on }}
@@ -209,6 +213,8 @@ jobs:
   osx_app_upload_test:
     runs-on: macos-latest
     needs: [osx_app_create, kivy_examples_create]
+    env:
+      KIVY_GL_BACKEND: 'mock'
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python

diff --git a/.github/workflows/test_osx_python.yml b/.github/workflows/test_osx_python.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 env:
   KIVY_SPLIT_EXAMPLES: 1
+  KIVY_GL_BACKEND: 'mock'
   CC: clang
   CXX: clang
   FFLAGS: '-ff2c'

diff --git a/kivy/core/window/_window_sdl2.pyx b/kivy/core/window/_window_sdl2.pyx
@@ -168,7 +168,7 @@ cdef class _WindowSDL2Storage:
 
     def setup_window(self, x, y, width, height, borderless, fullscreen, resizable, state, gl_backend):
         self.gl_backend_name = gl_backend
-        self.sdl_manages_egl_context = gl_backend != "angle"
+        self.sdl_manages_egl_context = gl_backend not in ("mock", "angle")
 
         self.win_flags  = SDL_WINDOW_SHOWN | SDL_WINDOW_ALLOW_HIGHDPI