{"id":1571482,"url":"http://patchwork.ozlabs.org/api/patches/1571482/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20211221065855.142578-12-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20211221065855.142578-12-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2021-12-21T06:58:30","name":"[PULL,v2,11/36] ui: associate GL context outside of display listener registration","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"150841fcc80ce419092598bda4d815674a6151a6","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20211221065855.142578-12-marcandre.lureau@redhat.com/mbox/","series":[{"id":277865,"url":"http://patchwork.ozlabs.org/api/series/277865/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=277865","date":"2021-12-21T06:58:19","name":"[PULL,v2,01/36] ui/vdagent: add CHECK_SPICE_PROTOCOL_VERSION","version":2,"mbox":"http://patchwork.ozlabs.org/series/277865/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1571482/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1571482/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["bilbo.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=ONH9ztYO;\n\tdkim-atps=neutral","ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=)","relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJ7Mt16Gxz9s3q\n\tfor ; Tue, 21 Dec 2021 18:27:54 +1100 (AEDT)","from localhost ([::1]:58934 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1mzZYt-0000NY-Sw\n\tfor incoming@patchwork.ozlabs.org; Tue, 21 Dec 2021 02:27:51 -0500","from eggs.gnu.org ([209.51.188.92]:58532)\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1mzZAB-0004C5-9O\n for qemu-devel@nongnu.org; Tue, 21 Dec 2021 02:02:19 -0500","from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:39818)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1mzZA9-00022S-Hn\n for qemu-devel@nongnu.org; Tue, 21 Dec 2021 02:02:18 -0500","from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-661-WLjTTdToNpS81pa9vnG5Zg-1; Tue, 21 Dec 2021 02:02:11 -0500","from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com\n [10.5.11.11])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A6F181006AA9;\n Tue, 21 Dec 2021 07:02:10 +0000 (UTC)","from localhost (unknown [10.39.208.37])\n by smtp.corp.redhat.com (Postfix) with ESMTP id CF6277EA2E;\n Tue, 21 Dec 2021 07:02:09 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1640070136;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=2gixnKrZkqUGvGNbm+vktxqOAHCbEyotYV6HIRvHvAc=;\n b=ONH9ztYOFi++8rsM3Oqmbb3w317GN8yJbXMT2dugsVg3itqJy/3x0Js1rek8WwJ17keXUI\n LOgugGAsvXc3GjeIyseKk9WSU13CVHEQba5VLk+SHcB3VuV0FqS2tUR/xMoJazYKz5ahUS\n z9tcvtvKmSl4qe7gwh6lhlksGQwy+N0=","X-MC-Unique":"WLjTTdToNpS81pa9vnG5Zg-1","From":"marcandre.lureau@redhat.com","To":"qemu-devel@nongnu.org","Subject":"[PULL v2 11/36] ui: associate GL context outside of display listener\n registration","Date":"Tue, 21 Dec 2021 10:58:30 +0400","Message-Id":"<20211221065855.142578-12-marcandre.lureau@redhat.com>","In-Reply-To":"<20211221065855.142578-1-marcandre.lureau@redhat.com>","References":"<20211221065855.142578-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=170.10.129.124;\n envelope-from=marcandre.lureau@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-29","X-Spam_score":"-3.0","X-Spam_bar":"---","X-Spam_report":"(-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.203,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"peter.maydell@linaro.org, richard.henderson@linaro.org, =?utf-8?q?Marc-A?=\n\t=?utf-8?q?ndr=C3=A9_Lureau?= ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n "},"content":"From: Marc-André Lureau \n\nConsoles can have an associated GL context, without listeners (they may\nbe added or removed later on).\n\nSigned-off-by: Marc-André Lureau \nAcked-by: Gerd Hoffmann \n---\n ui/console.c | 7 +++++--\n ui/egl-headless.c | 1 +\n ui/gtk.c | 3 +++\n ui/sdl2.c | 3 +++\n ui/spice-display.c | 3 +++\n 5 files changed, 15 insertions(+), 2 deletions(-)","diff":"diff --git a/ui/console.c b/ui/console.c\nindex 7b83e6cdea77..87f897e46dc4 100644\n--- a/ui/console.c\n+++ b/ui/console.c\n@@ -1465,8 +1465,11 @@ void register_displaychangelistener(DisplayChangeListener *dcl)\n \n assert(!dcl->ds);\n \n- if (dcl->ops->dpy_gl_ctx_create) {\n- qemu_console_set_display_gl_ctx(dcl->con, dcl);\n+ if (dcl->con && dcl->con->gl &&\n+ dcl->con->gl != dcl) {\n+ error_report(\"Display %s is incompatible with the GL context\",\n+ dcl->ops->dpy_name);\n+ exit(1);\n }\n \n if (dcl->con) {\ndiff --git a/ui/egl-headless.c b/ui/egl-headless.c\nindex a26a2520c496..08327c40c6ee 100644\n--- a/ui/egl-headless.c\n+++ b/ui/egl-headless.c\n@@ -197,6 +197,7 @@ static void egl_headless_init(DisplayState *ds, DisplayOptions *opts)\n edpy->dcl.con = con;\n edpy->dcl.ops = &egl_ops;\n edpy->gls = qemu_gl_init_shader();\n+ qemu_console_set_display_gl_ctx(con, &edpy->dcl);\n register_displaychangelistener(&edpy->dcl);\n }\n }\ndiff --git a/ui/gtk.c b/ui/gtk.c\nindex c0d8a9f061ee..25896023ffe7 100644\n--- a/ui/gtk.c\n+++ b/ui/gtk.c\n@@ -2083,6 +2083,9 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,\n vc->gfx.kbd = qkbd_state_init(con);\n vc->gfx.dcl.con = con;\n \n+ if (display_opengl) {\n+ qemu_console_set_display_gl_ctx(con, &vc->gfx.dcl);\n+ }\n register_displaychangelistener(&vc->gfx.dcl);\n \n gd_connect_vc_gfx_signals(vc);\ndiff --git a/ui/sdl2.c b/ui/sdl2.c\nindex 9ba3bc49e798..bb186a381acd 100644\n--- a/ui/sdl2.c\n+++ b/ui/sdl2.c\n@@ -866,6 +866,9 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)\n #endif\n sdl2_console[i].dcl.con = con;\n sdl2_console[i].kbd = qkbd_state_init(con);\n+ if (display_opengl) {\n+ qemu_console_set_display_gl_ctx(con, &sdl2_console[i].dcl);\n+ }\n register_displaychangelistener(&sdl2_console[i].dcl);\n \n #if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_X11)\ndiff --git a/ui/spice-display.c b/ui/spice-display.c\nindex 52d9f3260aab..2c204bceee27 100644\n--- a/ui/spice-display.c\n+++ b/ui/spice-display.c\n@@ -1156,6 +1156,9 @@ static void qemu_spice_display_init_one(QemuConsole *con)\n \n qemu_spice_create_host_memslot(ssd);\n \n+ if (spice_opengl) {\n+ qemu_console_set_display_gl_ctx(con, &ssd->dcl);\n+ }\n register_displaychangelistener(&ssd->dcl);\n }\n \n","prefixes":["PULL","v2","11/36"]}