WIP

Author: misl6

.github/workflows/manylinux_wheels.yml

@@ -140,6 +140,7 @@ jobs:
         python: [ '3.9', '3.10', '3.11', '3.12', '3.13', '3.14' ]
     env:
       DISPLAY: ':99.0'
+      SDL_VIDEO_X11_VISUALID: 0x00
     steps:
     - uses: actions/checkout@v6
     - name: Set up Python
@@ -185,6 +186,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DISPLAY: ':99.0'
+      SDL_VIDEO_X11_VISUALID: 0x00
       KIVY_SPLIT_EXAMPLES: 0
     steps:
       - uses: actions/checkout@v6

.github/workflows/test_ubuntu_python.yml

@@ -28,6 +28,7 @@ jobs:
         python: [ '3.13', '3.14' ]
     env:
       DISPLAY: ':99.0'
+      SDL_VIDEO_X11_VISUALID: 0x00
       # TODO: Only run tests on 3.14 once "ffpyplayer" works with Python 3.14
       KIVY_TEST_AUDIO: ${{ matrix.python == '3.14' && '0' || '1' }}
     steps:
@@ -53,17 +54,6 @@ jobs:
         source .ci/ubuntu_ci.sh
         export KIVY_DEPS_ROOT=$(pwd)/kivy-dependencies
         install_kivy
-    - name: Install xvfb
-      run: |
-        sudo apt-get install -y xvfb
-    - name: Print OpenGL info
-      run: |
-        sudo apt install -y mesa-utils
-        glxinfo
-    - name: Test example app
-      run: |
-        source .ci/ubuntu_ci.sh
-        SDL_LOGGING="video=verbose,*=verbose" python examples/demo/touchtracer/main.py
     - name: Test Kivy
       run: |
         source .ci/ubuntu_ci.sh

kivy/core/window/_window_sdl3.pyx

@@ -93,6 +93,21 @@ cdef class _WindowSDL3Storage:
         cdef SDL_Window *win
         cdef int _win_flags = self.win_flags
 
+        if multisamples:
+            if self.sdl_manages_egl_context:
+                SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1)
+                SDL_GL_SetAttribute(
+                    SDL_GL_MULTISAMPLESAMPLES, min(multisamples, 4)
+                )
+            else:
+                # Non-SDL GL context, so we can't set the multisample
+                # attributes.
+                return NULL
+        else:
+            if self.sdl_manages_egl_context:
+                SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0)
+                SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0)
+
         if shaped:
             _win_flags |= SDL_WINDOW_TRANSPARENT
 
@@ -150,6 +165,7 @@ cdef class _WindowSDL3Storage:
         config_alpha_size = Config.getint('graphics', 'alpha_size')
         SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, config_alpha_size)
 
+        SDL_GL_SetAttribute(SDL_GL_RETAINED_BACKING, 0)
         SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1)
 
         SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2)
@@ -211,9 +227,7 @@ cdef class _WindowSDL3Storage:
                                 SDL_HINT_OVERRIDE)
 
         if SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0:
-            logger.error("WindowSDL: SDL_Init failed")
             self.die()
-        print("WindowSDL: SDL initialized with video and joystick support")
 
         # Set default orientation (force landscape for now)
         orientations = 'LandscapeLeft LandscapeRight'
@@ -254,12 +268,12 @@ cdef class _WindowSDL3Storage:
         # 3. Ordinary window with multisampling
         # 4. Ordinary window without multisampling
         sdl_window_configs = []
-        # if config_multisamples and config_shaped:
-        #     sdl_window_configs.append((config_multisamples, config_shaped))
-        # if config_shaped:
-        #     sdl_window_configs.append((0, config_shaped))
-        # if config_multisamples:
-        #     sdl_window_configs.append((config_multisamples, 0))
+        if config_multisamples and config_shaped:
+            sdl_window_configs.append((config_multisamples, config_shaped))
+        if config_shaped:
+            sdl_window_configs.append((0, config_shaped))
+        if config_multisamples:
+            sdl_window_configs.append((config_multisamples, 0))
         sdl_window_configs.append((0, 0))
 
         for multisamples, shaped in sdl_window_configs:
@@ -273,7 +287,6 @@ cdef class _WindowSDL3Storage:
                 break
 
         if not self.win:
-            logger.error("WindowSDL: SDL_Init failed at end")
             self.die()
 
         # Set shape in case the user requested a shaped window and the window