From nobody Fri May 3 08:47:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490005271653271.155025747565; Mon, 20 Mar 2017 03:21:11 -0700 (PDT) Received: from localhost ([::1]:60155 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpuR4-00058Y-Ah for importer@patchew.org; Mon, 20 Mar 2017 06:21:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpuQc-00058F-4Z for qemu-devel@nongnu.org; Mon, 20 Mar 2017 06:20:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cpuQZ-0008D5-0D for qemu-devel@nongnu.org; Mon, 20 Mar 2017 06:20:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cpuQY-0008Cu-Qk for qemu-devel@nongnu.org; Mon, 20 Mar 2017 06:20:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AD496C05AA6B for ; Mon, 20 Mar 2017 10:20:38 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-104.ams2.redhat.com [10.36.116.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93F5B5C883; Mon, 20 Mar 2017 10:20:36 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id D332480752; Mon, 20 Mar 2017 11:20:31 +0100 (CET) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AD496C05AA6B Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com AD496C05AA6B From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 20 Mar 2017 11:20:27 +0100 Message-Id: <1490005227-1997-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 20 Mar 2017 10:20:38 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] console: drop epoxy/gl.h include dependency X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use "unsigned int" instead of GLenum and GLuint, so we don't depend on these types from opengl headers. Drop all CONFIG_OPENGL #ifdefs from console.h Reported-by: Peter Maydell Signed-off-by: Gerd Hoffmann --- include/ui/console.h | 14 +++----------- include/ui/sdl2.h | 4 ++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index d759338..2f4aae2 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -9,10 +9,6 @@ #include "qemu/error-report.h" #include "qapi/error.h" =20 -#ifdef CONFIG_OPENGL -# include -#endif - /* keyboard/mouse support */ =20 #define MOUSE_EVENT_LBUTTON 0x01 @@ -136,11 +132,9 @@ struct DisplaySurface { pixman_format_code_t format; pixman_image_t *image; uint8_t flags; -#ifdef CONFIG_OPENGL - GLenum glformat; - GLenum gltype; - GLuint texture; -#endif + unsigned int glformat; + unsigned int gltype; + unsigned int texture; }; =20 typedef struct QemuUIInfo { @@ -410,7 +404,6 @@ DisplaySurface *qemu_console_surface(QemuConsole *con); =20 /* console-gl.c */ typedef struct ConsoleGLState ConsoleGLState; -#ifdef CONFIG_OPENGL ConsoleGLState *console_gl_init_context(void); void console_gl_fini_context(ConsoleGLState *gls); bool console_gl_check_format(DisplayChangeListener *dcl, @@ -427,7 +420,6 @@ void surface_gl_destroy_texture(ConsoleGLState *gls, void surface_gl_setup_viewport(ConsoleGLState *gls, DisplaySurface *surface, int ww, int wh); -#endif =20 /* sdl.c */ #ifdef CONFIG_SDL diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h index aaf226c..1e8d07b 100644 --- a/include/ui/sdl2.h +++ b/include/ui/sdl2.h @@ -7,6 +7,10 @@ #include #include =20 +#ifdef CONFIG_OPENGL +# include +#endif + struct sdl2_console { DisplayChangeListener dcl; DisplaySurface *surface; --=20 1.8.3.1