Commit fe5c44f9 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

spice: don't enter opengl mode in case another UI provides opengl support 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 20170606110618.10393-1-kraxel@redhat.com
parent 8f4ea9cd

include/ui/spice-display.h

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ struct SimpleSpiceCursor { 
    QXLCursor cursor;

};



extern bool spice_opengl;



int qemu_spice_rect_is_empty(const QXLRect* r);

void qemu_spice_rect_union(QXLRect *dest, const QXLRect *r);

ui/spice-core.c

+1 −0
Original line number Diff line number Diff line
@@ -847,6 +847,7 @@ void qemu_spice_init(void) 
            exit(1);

        }

        display_opengl = 1;

        spice_opengl = 1;

    }

#endif

}

ui/spice-display.c

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "ui/spice-display.h"



static int debug = 0;

bool spice_opengl;



static void GCC_FMT_ATTR(2, 3) dprint(int level, const char *fmt, ...)

{
@@ -1013,7 +1014,7 @@ static void qemu_spice_display_init_one(QemuConsole *con) 


    ssd->dcl.ops = &display_listener_ops;

#ifdef HAVE_SPICE_GL

    if (display_opengl) {

    if (spice_opengl) {

        ssd->dcl.ops = &display_listener_gl_ops;

        ssd->gl_unblock_bh = qemu_bh_new(qemu_spice_gl_unblock_bh, ssd);

        ssd->gl_unblock_timer = timer_new_ms(QEMU_CLOCK_REALTIME,