@samitouri / QOSamiQemu / commits / 7077c83f71

ui/sdl2: Fix assumption of EGL presence at runtime

The original commit had a section of code which worked on the assumption that if OpenGL was enabled at build, it was present on the end user machine, and calls could be made to it. This is not always the case (such as Windows on Arm devices). This line should have also included a runtime check. This commit moves the relevant line to inside a runtime check for OpenGL. Fixes: 52053b7e0a0e ("ui/sdl2: Implement dpy dmabuf functions") Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3347 Cc: qemu-stable@nongnu.org Signed-off-by: Anthony Roberts <anthony.roberts@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-ID: <20260409110256.684-1-anthony.roberts@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Anthony Roberts committed Apr 9, 2026 at 12:02 UTC 7077c83f71a7530af5d93748e998b00732f6fb36

1 file changed +4 -4

ui/sdl2.c

+4 -4

@@ -120,15 +120,15 @@ void sdl2_window_create(struct sdl2_console *scon)

120

121 scon->winctx = SDL_GL_CreateContext(scon->real_window);

122 SDL_GL_SetSwapInterval(0);

123 +

124 +#ifdef CONFIG_OPENGL

125 + qemu_egl_display = eglGetCurrentDisplay();

126 +#endif

127 } else {

128 /* The SDL renderer is only used by sdl2-2D, when OpenGL is disabled */

129 scon->real_renderer = SDL_CreateRenderer(scon->real_window, -1, 0);

130 }

131

128 -#ifdef CONFIG_OPENGL

129 - qemu_egl_display = eglGetCurrentDisplay();

130 -#endif

131 -

132 sdl_update_caption(scon);

133 }

134