From patchwork Wed Feb 12 22:16:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1237120 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=FuGSIZHg; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48HvB43sh8z9sRL for ; Thu, 13 Feb 2020 09:16:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A7A5C849D8; Wed, 12 Feb 2020 22:16:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kaWxW07_3654; Wed, 12 Feb 2020 22:16:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 26DE184A05; Wed, 12 Feb 2020 22:16:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 376D21BF421 for ; Wed, 12 Feb 2020 22:16:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2E09A8577E for ; Wed, 12 Feb 2020 22:16:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qBnygsyP9Iqf for ; Wed, 12 Feb 2020 22:16:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6DFC1856B6 for ; Wed, 12 Feb 2020 22:16:22 +0000 (UTC) Received: by mail-il1-f195.google.com with SMTP id l4so3198182ilj.1 for ; Wed, 12 Feb 2020 14:16:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=u8Ejf1HEddJP/ioA0Myl2sG7LIQkpRJeKMDE5e5tC1E=; b=FuGSIZHgCrnERKEV/VpRLFKIz8wCjEknLSPV3e2/4EOTx/2ae7BftnjY+j3LtcvHHD fj88189HVkAD82d9we3BRrcNShkpja0s5YUR/alNVLZuvcKxXfIHuoJG9MvXa3MpJ0/S 0qaf9g4V7VOaqUP/AN4nhgcZcSuHCvF4jk7iBfnXvT8p9Vq6zcQI6oBjrE8N7k8Wf3v3 uEH/TvLhJ/Re1QUFTBaNPiQLC5HC48MITXTI/bTnfQ4ARxq5NadNgyL+J7TzZyT0eRc3 Bi4Mfy/DwOsUfc5TAN4gkL3UcDgyGnvYazRJC7YsjV3TjRL2yYeIf1W/yYuQdwTqD7NI DP/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=u8Ejf1HEddJP/ioA0Myl2sG7LIQkpRJeKMDE5e5tC1E=; b=A03n2egMbc/WukdXuQq6JYXHyPsVBEU4+S7+0tSpixUPxhS3oRjIZ6u5TwteLCL86Z GKbQbqPC4PhsbTh2hmhwvmwQetcFSGMuF4UcfOCR6TzX/gSOL5J4UGOzKophcI8WaaRj zUYRxbGJw6OOMD060jyRberWb65HCoGjoXlWaGDQfvnwBkQxcpfzyZJHKhE0ZGpxcZh0 1AT5hZoeOa8t2D7Wmym90rtMEfniNx35HUNyBYbzJEc+/O1hnA5ERKepN2GbSkYKaPhc wYBxrYFiTURTbYz1mFrX0FxAOYVaVZUWf0YEiH3wzgdE102WleviHTMhfianXnDYygXx g6cQ== X-Gm-Message-State: APjAAAXukuPpBqqTJPHVMhH7LIJUw5JS0tWABt6vKun+E7de3JYvjEUN ktCLlCg2aHGNfTbEe47wXqOVUYAW X-Google-Smtp-Source: APXvYqxjQeOWxADj+VnkWBXKmQX6h4hAhpne74gQDmt0s2IKLidNqg1k8Fkhow0oaEFfR5Ps0F3j/Q== X-Received: by 2002:a92:981b:: with SMTP id l27mr13432200ili.118.1581545781311; Wed, 12 Feb 2020 14:16:21 -0800 (PST) Received: from james-x399.localdomain (71-33-129-6.hlrn.qwest.net. [71.33.129.6]) by smtp.gmail.com with ESMTPSA id a21sm122939ioh.29.2020.02.12.14.16.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 14:16:20 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Wed, 12 Feb 2020 15:16:16 -0700 Message-Id: <20200212221616.53785-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/mesa3d: allow selecting GLX platform X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , Romain Naour , James Hilliard Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: James Hilliard --- package/mesa3d/Config.in | 36 ++++++++++++++++++++++++++++++++++++ package/mesa3d/mesa3d.mk | 6 ++++++ 2 files changed, 42 insertions(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index dbfc59bad5..b8b8451bbd 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -414,8 +414,40 @@ config BR2_PACKAGE_MESA3D_OPENGL_GLX comment "OpenGL GLX support needs X11" depends on !BR2_PACKAGE_XORG7 +if BR2_PACKAGE_MESA3D_OPENGL_GLX + +choice + prompt "GLX platform" + +config BR2_PACKAGE_MESA3D_OPENGL_GLX_DRI + bool "dri" + +config BR2_PACKAGE_MESA3D_OPENGL_GLX_XLIB + bool "xlib" + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER + +comment "xlib conflicts with any mesa3d dri drivers" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER + +config BR2_PACKAGE_MESA3D_OPENGL_GLX_GALLIUM_XLIB + bool "gallium-xlib" + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST + +comment "gallium-xlib conflicts with any mesa3d dri drivers and requires gallium w/ swrast" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER || \ + !BR2_PACKAGE_MESA3D_GALLIUM_DRIVER || \ + !BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST + +endchoice + +endif + config BR2_PACKAGE_MESA3D_OPENGL_EGL bool "OpenGL EGL" + depends on !BR2_PACKAGE_MESA3D_OPENGL_GLX || \ + BR2_PACKAGE_MESA3D_OPENGL_GLX_DRI select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBEGL_WAYLAND select BR2_PACKAGE_MESA3D_GBM @@ -423,6 +455,10 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL Use the Khronos EGL APIs. EGL is a window manager for OpenGL applications similar to GLX, for X, and WGL, for Windows. +comment "OpenGL EGL is incompatible w/ non-dri GLX platforms" + depends on BR2_PACKAGE_MESA3D_OPENGL_GLX + depends on !BR2_PACKAGE_MESA3D_OPENGL_GLX_DRI + config BR2_PACKAGE_MESA3D_OPENGL_ES bool "OpenGL ES" select BR2_PACKAGE_HAS_LIBGLES diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index c14716bf15..a853454e05 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -57,7 +57,13 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi # xlib : xlib conflicts with any dri driver # gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX_DRI),y) MESA3D_CONF_OPTS += -Dglx=dri +else ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX_XLIB),y) +MESA3D_CONF_OPTS += -Dglx=xlib +else ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX_GALLIUM_XLIB),y) +MESA3D_CONF_OPTS += -Dglx=gallium-xlib +endif ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) MESA3D_CONF_OPTS += -Dgallium-xa=true else