diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-03-04 12:58:50 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-03-04 12:58:50 +0000 |
| commit | fe352f5c0056b4d21ae033ec49acc0bce9897e53 (patch) | |
| tree | 5dabd93c86901bac296940d138ed7bb9b1b680df /ui/sdl2-gl.c | |
| parent | cb90ecf9349198558569f6c86c4c27d215406095 (diff) | |
| parent | ed8f3fe6898e0f3fea2ece7c87464a06098b2300 (diff) | |
| download | focaccia-qemu-fe352f5c0056b4d21ae033ec49acc0bce9897e53.tar.gz focaccia-qemu-fe352f5c0056b4d21ae033ec49acc0bce9897e53.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210304-pull-request' into staging
ui/console: message surface tweaks. ui/cocoa: bugfixes and cleanups. # gpg: Signature made Thu 04 Mar 2021 08:36:53 GMT # gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20210304-pull-request: virtio-gpu: Do not distinguish the primary console ui/console: Pass placeholder surface to displays ui/console: Add placeholder flag to message surface ui/cocoa: Replace fprintf with error_report configure: Improve OpenGL dependency detections ui/cocoa: Fix stride resolution of pixman image ui/gtk: vte: fix sending multiple characeters ui/cocoa: Remove the uses of full screen APIs Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl2-gl.c')
| -rw-r--r-- | ui/sdl2-gl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c index fd594d7461..a21d2deed9 100644 --- a/ui/sdl2-gl.c +++ b/ui/sdl2-gl.c @@ -86,7 +86,7 @@ void sdl2_gl_switch(DisplayChangeListener *dcl, scon->surface = new_surface; - if (!new_surface) { + if (is_placeholder(new_surface) && qemu_console_get_index(dcl->con)) { qemu_gl_fini_shader(scon->gls); scon->gls = NULL; sdl2_window_destroy(scon); @@ -112,7 +112,7 @@ void sdl2_gl_refresh(DisplayChangeListener *dcl) assert(scon->opengl); graphic_hw_update(dcl->con); - if (scon->updates && scon->surface) { + if (scon->updates && scon->real_window) { scon->updates = 0; sdl2_gl_render_surface(scon); } |