From patchwork Mon Mar 20 11:24:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9633883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6406A602D6 for ; Mon, 20 Mar 2017 11:25:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59CCD27EED for ; Mon, 20 Mar 2017 11:25:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E9FA27F9F; Mon, 20 Mar 2017 11:25:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CD6C327EED for ; Mon, 20 Mar 2017 11:25:24 +0000 (UTC) Received: from localhost ([::1]:60414 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpvRD-0007gi-Rv for patchwork-qemu-devel@patchwork.kernel.org; Mon, 20 Mar 2017 07:25:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpvQt-0007cP-0t for qemu-devel@nongnu.org; Mon, 20 Mar 2017 07:25:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cpvQp-00025j-2b for qemu-devel@nongnu.org; Mon, 20 Mar 2017 07:25:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48114) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cpvQo-00025Y-Sw for qemu-devel@nongnu.org; Mon, 20 Mar 2017 07:24:59 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id EAF2C6AAE5 for ; Mon, 20 Mar 2017 11:24:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EAF2C6AAE5 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com EAF2C6AAE5 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 4DB9618432; Mon, 20 Mar 2017 11:24:58 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id B742A80BBC; Mon, 20 Mar 2017 12:24:54 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 20 Mar 2017 12:24:53 +0100 Message-Id: <1490009093-28083-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 20 Mar 2017 11:24:59 +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 v3] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 ++++ ui/sdl2-gl.c | 2 +- 3 files changed, 8 insertions(+), 12 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" -#ifdef CONFIG_OPENGL -# include -#endif - /* keyboard/mouse support */ #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; }; typedef struct QemuUIInfo { @@ -410,7 +404,6 @@ DisplaySurface *qemu_console_surface(QemuConsole *con); /* 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 /* sdl.c */ #ifdef CONFIG_SDL diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h index aaf226c..af86dfe 100644 --- a/include/ui/sdl2.h +++ b/include/ui/sdl2.h @@ -7,6 +7,10 @@ #include #include +#ifdef CONFIG_OPENGL +# include +#endif + struct sdl2_console { DisplayChangeListener dcl; DisplaySurface *surface; diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c index 1cd77e2..5bccdc9 100644 --- a/ui/sdl2-gl.c +++ b/ui/sdl2-gl.c @@ -29,10 +29,10 @@ #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" -#include "ui/sdl2.h" #include "sysemu/sysemu.h" #include +#include "ui/sdl2.h" static void sdl2_set_scanout_mode(struct sdl2_console *scon, bool scanout) {