From nobody Sat Feb 7 04:47:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612508297; cv=none; d=zohomail.com; s=zohoarc; b=k6YzlfBna0pKIbKLgDPTPIgY6V1XBnmnuZiNZcVULewT8mQOewyBUGScT+VdXDQlPcQsgYGGyyEg6q/nBmuIudAhpeoUZrXOVzDHPxi+onW4zxJ+uP8XPBAK+HQaITKUFjZFmahEpu8RPvgWW8puNjQXSnp6gPhAM3IzA1luTzs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612508297; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NmLsQKuBdww5LuZpsu3BQHeaQUpz86YMSwmKHGTNfCM=; b=LFbokkEv+ql7whG0G9J4PTce2NQQ3lOCXdN5tggFvyeqpWkCKhIKc0JOGZCL7fbPFu6m9KbIsveEcX+xjGOsYXfFWmBhtdKDv7CExOiirgeq0X7wwzFwUkOFqnHjKU7gRvuY8CNHluPS3j7TB7IhYwXksEqVveReDeCC0sdSGmE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16125082970381002.4351001538544; Thu, 4 Feb 2021 22:58:17 -0800 (PST) Received: from localhost ([::1]:38298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7v4J-0002iM-MJ for importer@patchew.org; Fri, 05 Feb 2021 01:58:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7v2p-00011H-Md for qemu-devel@nongnu.org; Fri, 05 Feb 2021 01:56:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l7v2n-00014x-43 for qemu-devel@nongnu.org; Fri, 05 Feb 2021 01:56:43 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-13-ghiF04fqPv-8CchCUJj8Pw-1; Fri, 05 Feb 2021 01:56:39 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 362F5835E22 for ; Fri, 5 Feb 2021 06:56:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-108.ams2.redhat.com [10.36.113.108]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EA14D54529; Fri, 5 Feb 2021 06:56:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D0F0918003B5; Fri, 5 Feb 2021 07:56:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612508200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NmLsQKuBdww5LuZpsu3BQHeaQUpz86YMSwmKHGTNfCM=; b=c/OvroPb+pGp3zFKNU006MdQ3AVWlM/AjuUUQ8qHnZva5irfwHuoA4RsF49gqdfLHWUx8b ySRQ73GQdc3RtRBBgMifI9daR+cN5TquzaGy3Wu2VkOzw0BjmD8/oklTPBx9P6c7GRtfo6 thZ2iy9acUKDuL4F3FxvQus0yWJsalE= X-MC-Unique: ghiF04fqPv-8CchCUJj8Pw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 09/24] ui: remove extra #ifdef CONFIG_OPENGL Date: Fri, 5 Feb 2021 07:56:05 +0100 Message-Id: <20210205065620.1726554-10-kraxel@redhat.com> In-Reply-To: <20210205065620.1726554-1-kraxel@redhat.com> References: <20210205065620.1726554-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Cleber Rosa , Wainer dos Santos Moschetta , Alex Williamson , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Since commit 5cb69566daa8081abb82a13403dcc0fffed02007 ("gtk: remove CONFIG_GTK_GL"), some #ifdef are redundants. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20210204105232.834642-6-marcandre.lureau@redhat.com> Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 26665cd2e657..e1ee0840b377 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -625,8 +625,6 @@ static const DisplayChangeListenerOps dcl_ops =3D { =20 /** DisplayState Callbacks (opengl version) **/ =20 -#if defined(CONFIG_OPENGL) - static const DisplayChangeListenerOps dcl_gl_area_ops =3D { .dpy_name =3D "gtk-egl", .dpy_gfx_update =3D gd_gl_area_update, @@ -644,8 +642,6 @@ static const DisplayChangeListenerOps dcl_gl_area_ops = =3D { .dpy_gl_update =3D gd_gl_area_scanout_flush, }; =20 -#endif /* CONFIG_OPENGL */ - static const DisplayChangeListenerOps dcl_egl_ops =3D { .dpy_name =3D "gtk-egl", .dpy_gfx_update =3D gd_egl_update, @@ -1993,13 +1989,10 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, V= irtualConsole *vc, =20 #if defined(CONFIG_OPENGL) if (display_opengl) { -#if defined(CONFIG_OPENGL) if (gtk_use_gl_area) { vc->gfx.drawing_area =3D gtk_gl_area_new(); vc->gfx.dcl.ops =3D &dcl_gl_area_ops; - } else -#endif /* CONFIG_OPENGL */ - { + } else { vc->gfx.drawing_area =3D gtk_drawing_area_new(); /* * gtk_widget_set_double_buffered() was deprecated in 3.14. --=20 2.29.2