Skip to content

Commit

Permalink
ui: remove extra #ifdef CONFIG_OPENGL
Browse files Browse the repository at this point in the history
Since commit 5cb6956 ("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>
  • Loading branch information
elmarco authored and kraxel committed Feb 4, 2021
1 parent bd690fe commit f988e3c
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions ui/gtk.c
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit f988e3c

Please sign in to comment.