diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-05-11 11:42:17 +0400 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2023-05-31 09:43:56 +0300 |
| commit | d4d91ae902199d991572c4cf3f4ede28e82cc0fd (patch) | |
| tree | df874ca0c74fc1204b241511ffbdde2b5b1b680b | |
| parent | b15e44adebc21d968c7f7f57b55636ee04150ad5 (diff) | |
ui/sdl2: fix surface_gl_update_texture: Assertion 'gls' failed
Before sdl2_gl_update() is called, sdl2_gl_switch() may decide to
destroy the console window and its associated shaders.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1644
Fixes: c84ab0a500a8 ("ui/console: optionally update after gfx switch")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Bin Meng <bin.meng@windriver.com>
Message-Id: <20230511074217.4171842-1-marcandre.lureau@redhat.com>
(cherry picked from commit b3a654d82ecf276b59a67b2fd688e11a0d8a0064)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | ui/sdl2-gl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c index 39cab8cde7..bbfa70eac3 100644 --- a/ui/sdl2-gl.c +++ b/ui/sdl2-gl.c @@ -67,6 +67,10 @@ void sdl2_gl_update(DisplayChangeListener *dcl, assert(scon->opengl); + if (!scon->real_window) { + return; + } + SDL_GL_MakeCurrent(scon->real_window, scon->winctx); surface_gl_update_texture(scon->gls, scon->surface, x, y, w, h); scon->updates++; |