From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 09/24] ui: remove extra #ifdef CONFIG_OPENGL
Date: Fri, 5 Feb 2021 07:56:05 +0100 [thread overview]
Message-ID: <20210205065620.1726554-10-kraxel@redhat.com> (raw)
In-Reply-To: <20210205065620.1726554-1-kraxel@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Since commit 5cb69566daa8081abb82a13403dcc0fffed02007 ("gtk: remove
CONFIG_GTK_GL"), some #ifdef are redundants.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210204105232.834642-6-marcandre.lureau@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/gtk.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 26665cd2e657..e1ee0840b377 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -625,8 +625,6 @@ static const DisplayChangeListenerOps dcl_ops = {
/** DisplayState Callbacks (opengl version) **/
-#if defined(CONFIG_OPENGL)
-
static const DisplayChangeListenerOps dcl_gl_area_ops = {
.dpy_name = "gtk-egl",
.dpy_gfx_update = gd_gl_area_update,
@@ -644,8 +642,6 @@ static const DisplayChangeListenerOps dcl_gl_area_ops = {
.dpy_gl_update = gd_gl_area_scanout_flush,
};
-#endif /* CONFIG_OPENGL */
-
static const DisplayChangeListenerOps dcl_egl_ops = {
.dpy_name = "gtk-egl",
.dpy_gfx_update = gd_egl_update,
@@ -1993,13 +1989,10 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
#if defined(CONFIG_OPENGL)
if (display_opengl) {
-#if defined(CONFIG_OPENGL)
if (gtk_use_gl_area) {
vc->gfx.drawing_area = gtk_gl_area_new();
vc->gfx.dcl.ops = &dcl_gl_area_ops;
- } else
-#endif /* CONFIG_OPENGL */
- {
+ } else {
vc->gfx.drawing_area = gtk_drawing_area_new();
/*
* gtk_widget_set_double_buffered() was deprecated in 3.14.
--
2.29.2
next prev parent reply other threads:[~2021-02-05 6:58 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 6:55 [PULL 00/24] Vga ui 20210205 patches Gerd Hoffmann
2021-02-05 6:55 ` [PULL 01/24] hw/display/qxl: Fix bad printf format specifiers Gerd Hoffmann
2021-02-05 6:55 ` [PULL 02/24] qxl: set qxl.ssd.dcl.con on secondary devices Gerd Hoffmann
2021-02-05 6:55 ` [PULL 03/24] qxl: also notify the rendering is done when skipping it Gerd Hoffmann
2021-02-05 6:56 ` [PULL 04/24] spice: delay starting until display are initialized Gerd Hoffmann
2021-02-05 6:56 ` [PULL 05/24] vhost-user-gpu: check backend for EDID support Gerd Hoffmann
2021-02-05 6:56 ` [PULL 06/24] vhost-user-gpu: handle vhost-user-gpu features in a callback Gerd Hoffmann
2021-02-05 6:56 ` [PULL 07/24] vhost-user-gpu: use an extandable state enum for commands Gerd Hoffmann
2021-02-05 6:56 ` [PULL 08/24] vhost-user-gpu: handle display-info in a callback Gerd Hoffmann
2021-02-05 6:56 ` Gerd Hoffmann [this message]
2021-02-05 6:56 ` [PULL 10/24] ui: remove gl_ctx_get_current Gerd Hoffmann
2021-02-05 6:56 ` [PULL 11/24] ui: add gd_gl_area_scanout_disable Gerd Hoffmann
2021-02-05 6:56 ` [PULL 12/24] ui: annotate DCLOps callback requirements Gerd Hoffmann
2021-02-05 6:56 ` [PULL 13/24] ui: remove console_has_gl_dmabuf() Gerd Hoffmann
2021-02-05 6:56 ` [PULL 14/24] vhost-user-gpu: add a configuration flag for dmabuf usage Gerd Hoffmann
2021-02-05 6:56 ` [PULL 15/24] ui: add an optional get_flags callback to GraphicHwOps Gerd Hoffmann
2021-02-05 6:56 ` [PULL 16/24] ui: add a DCLOps callback to check dmabuf support Gerd Hoffmann
2021-02-05 6:56 ` [PULL 17/24] ui: check hw requirements during DCL registration Gerd Hoffmann
2021-02-05 6:56 ` [PULL 18/24] ui: add qemu_egl_has_dmabuf helper Gerd Hoffmann
2021-02-05 6:56 ` [PULL 19/24] ui: check gtk-egl dmabuf support Gerd Hoffmann
2021-02-05 6:56 ` [PULL 20/24] ui: add egl dmabuf import to gtkglarea Gerd Hoffmann
2021-02-05 6:56 ` [PULL 21/24] virtio-gpu: avoid re-entering cmdq processing Gerd Hoffmann
2021-02-05 6:56 ` [PULL 22/24] display/ui: add a callback to indicate GL state is flushed Gerd Hoffmann
2021-02-05 6:56 ` [PULL 23/24] chardev: check if the chardev is registered for yanking Gerd Hoffmann
2021-02-05 6:56 ` [PULL 24/24] tests: add some virtio-gpu & vhost-user-gpu acceptance test Gerd Hoffmann
2021-02-05 11:56 ` [PULL 00/24] Vga ui 20210205 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210205065620.1726554-10-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=crosa@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.