[Spice-commits] 2 commits - src/spice-widget-egl.c

[GitLab Mirror]

 src/spice-widget-egl.c |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit a2c01ea403a7c4d2bd1cc13882d0122ec60aeca6
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri Jan 18 12:36:47 2019 +0000

    spice-widget-egl: Simplify gl_make_current reducing indentation
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Marc-André Lureau <marcandre.lureau at gmail.com>

diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
index 5ad84bf..43fccd7 100644
--- a/src/spice-widget-egl.c
+++ b/src/spice-widget-egl.c
@@ -306,14 +306,13 @@ gl_make_current(SpiceDisplay *display, GError **err)
                                 "failed to activate context");
             return FALSE;
         }
+        return TRUE;
     }
-    else
 #endif
-    {
-        GtkWidget *area = gtk_stack_get_child_by_name(d->stack, "gl-area");
 
-        gtk_gl_area_make_current(GTK_GL_AREA(area));
-    }
+    GtkWidget *area = gtk_stack_get_child_by_name(d->stack, "gl-area");
+
+    gtk_gl_area_make_current(GTK_GL_AREA(area));
 
     return TRUE;
 }
commit d5e2effd9fed753a801f85f957f8d1d6afd510fa
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri Jan 18 12:34:07 2019 +0000

    spice-widget-egl: Remove double preprocessor check
    
    Do not disable and enable code with same condition.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Marc-André Lureau <marcandre.lureau at gmail.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
index 011d8c7..5ad84bf 100644
--- a/src/spice-widget-egl.c
+++ b/src/spice-widget-egl.c
@@ -307,8 +307,6 @@ gl_make_current(SpiceDisplay *display, GError **err)
             return FALSE;
         }
     }
-#endif
-#ifdef GDK_WINDOWING_X11
     else
 #endif
     {