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

[Marc-André Lureau]

 src/channel-display.c  |    6 +++---
 src/spice-widget-egl.c |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 2d3a6d93d70a987934b390ac6126155824aaa451
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Tue May 24 20:39:45 2016 +0200

    egl: bind the scanout texture
    
    glEGLImageTargetTexture2DOES() changes the current bound texture. If
    the last texture bound is the cursor, update_scanout() will modify the
    cursor texture, instead of the display.
    
    Fix regression from commit 3539ac6212d506128bd38aad032e0363e78cb4f6.
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau at gmail.com>
    Acked-by: Pavel Grunt <pgrunt at redhat.com>

diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
index c60765c..1557fdc 100644
--- a/src/spice-widget-egl.c
+++ b/src/spice-widget-egl.c
@@ -672,6 +672,7 @@ gboolean spice_egl_update_scanout(SpiceDisplay *display,
     if (!gl_make_current(display, NULL))
         return FALSE;
 
+    glBindTexture(GL_TEXTURE_2D, d->egl.tex_id);
     glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, (GLeglImageOES)d->egl.image);
 #endif
 
commit 0fd2a335f2ea8e88e5480ca862d5e8be8547dd2f
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Tue May 24 20:47:08 2016 +0200

    display: lower to debug gstreamer codec support
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau at gmail.com>
    Acked-by: Pavel Grunt <pgrunt at redhat.com>

diff --git a/src/channel-display.c b/src/channel-display.c
index a301e67..3ee515b 100644
--- a/src/channel-display.c
+++ b/src/channel-display.c
@@ -724,19 +724,19 @@ static void spice_display_channel_reset_capabilities(SpiceChannel *channel)
         spice_channel_set_capability(SPICE_CHANNEL(channel),
                                      SPICE_DISPLAY_CAP_CODEC_MJPEG);
     } else {
-        spice_info("GStreamer does not support the mjpeg codec");
+        SPICE_DEBUG("GStreamer does not support the mjpeg codec");
     }
     if (gstvideo_has_codec(SPICE_VIDEO_CODEC_TYPE_VP8)) {
         spice_channel_set_capability(SPICE_CHANNEL(channel),
                                      SPICE_DISPLAY_CAP_CODEC_VP8);
     } else {
-        spice_info("GStreamer does not support the vp8 codec");
+        SPICE_DEBUG("GStreamer does not support the vp8 codec");
     }
     if (gstvideo_has_codec(SPICE_VIDEO_CODEC_TYPE_H264)) {
         spice_channel_set_capability(SPICE_CHANNEL(channel),
                                      SPICE_DISPLAY_CAP_CODEC_H264);
     } else {
-        spice_info("GStreamer does not support the h264 codec");
+        SPICE_DEBUG("GStreamer does not support the h264 codec");
     }
 }