From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mOkgHECrqWSFXQEASxT56A (envelope-from ) for ; Sat, 08 Jul 2023 20:30:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EA7uG0CrqWSIwAAA9RJhRA (envelope-from ) for ; Sat, 08 Jul 2023 20:30:24 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DDE30480A2 for ; Sat, 8 Jul 2023 20:30:23 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail3 header.b="Dw/Y/yCu"; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail3 header.b=WTUR+3QR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688841024; h=from:from:sender:sender:reply-to: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=XKfHGlHzUqaLbGoJLD2t9icYV4fORIuG/p8OzKg6N5U=; b=usv9Yyc/37CooPC+CpRjeKkmzSD6kytiYWkbZgIiIIT1u6+KbMivIRl8m0lNkrcZATA8PJ t1ifGmGsfI1XeP9Vf6AeJqKVRjIx5Vh4FJHF5d+0svSw3vawbMn52bdYaqbLpWf3QZIW1i Us4ib4+F+gl+wq8r569DWfHIV8l+s7jVXkB38nBnkA75P6IgmEKBn6eneosiYrrliJmSZW fxMo+sedCcfejXWS8GZQY5CNp1UHzebEkDg2AKTGZ10zRTutQK2OsnepukSaXfkBIeZFBf +V0y7Axh2s0HxaZmqoH8yFoRM//4rYabtzj+xHyT/tImeszmn26uMB14Lr8g/g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688841024; a=rsa-sha256; cv=none; b=Ke6XymSriXBwdVUHSO3vpFFnhlKQNpkYXZ1ldFYNUPDWrHAbc6w82nftWWEUyZxH3+Zs86 W+ZLiPo2+l0vPTGFwH7kd4AcL3YmjPpNF/hNRkJXditnzFtluf89KwWH9ZiVIB0aVXDOAL ZIH8UTzN02u6/8OmDep9oqy6hFoFX2gnuMnbPVxajeDQYqTbADLCF/zcOXt4TjmhPSOUmN 4vSzHTHJmFgPJfcPbShGHJWCiIxzlHg2eA5ohQOdSNOQpKhgr+5EP/2VqoxWutaHgmXjzv oolqIkSm1RfvYbhiKI6PdpbP+ov/KbLmEQI7oAzr7JTN7IArN9IKUSnBAy18sQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail3 header.b="Dw/Y/yCu"; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail3 header.b=WTUR+3QR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qICh2-0000Gz-Kg; Sat, 08 Jul 2023 14:30:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qICh1-0000Gi-Ev for guix-patches@gnu.org; Sat, 08 Jul 2023 14:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qICh1-0005gD-5L for guix-patches@gnu.org; Sat, 08 Jul 2023 14:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qICh0-0001Sf-MP for guix-patches@gnu.org; Sat, 08 Jul 2023 14:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64528] [PATCH v2] gnu: mesa: Fix Vulkan on older Intel GPUs. References: <60cf22ecd3b501d0c75dab931f1d018f4dd23843.1688793383.git.lilah@lunabee.space> In-Reply-To: <60cf22ecd3b501d0c75dab931f1d018f4dd23843.1688793383.git.lilah@lunabee.space> Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jul 2023 18:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64528 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64528@debbugs.gnu.org Cc: Lilah Tascheter , liliana.prikler@gmail.com, iyzsong@envs.net Received: via spool by 64528-submit@debbugs.gnu.org id=B64528.16888409995588 (code B ref 64528); Sat, 08 Jul 2023 18:30:02 +0000 Received: (at 64528) by debbugs.gnu.org; 8 Jul 2023 18:29:59 +0000 Received: from localhost ([127.0.0.1]:45189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qICgw-0001S4-Tc for submit@debbugs.gnu.org; Sat, 08 Jul 2023 14:29:59 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:38886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qICgu-0001Rl-8e for 64528@debbugs.gnu.org; Sat, 08 Jul 2023 14:29:56 -0400 DKIM-Signature: a=rsa-sha256; b=Dw/Y/yCua8uFdKAjMMXaqOf6r8uOmg8bfrsF3RlfJxZIrDDQZXANCaQyOhBTQGyotz3XdUrGsMMAYsyNgPWFpvIX2+1ixJETaxQIUVIp8+TFGedyIcwNArWwrxmavTicP73ASDEP+sLNMeY3H7JaAGXsn4jUUcVwf+Kwf1mNMTQg/iLhmnbP8b+AOO7VVdZTpn/DAKx3zyz1YtjimoDALpRZ2/quznvIbUgyV6dGsZG5x006A6IT26JLiJsFeqipLbJRMUpXsY2S/QAMrd2wMEGWgCOIJdvyOclKJ3S4z58vrOk+yOEyjhkien641dVAjy8EOhfFiTLEUXavsxhA1g==; s=purelymail3; d=lunabee.space; v=1; bh=ut6joLrajVzVBGjsqpp+2gXh54RNk8/LjDMsVP6ZAe0=; h=Received:From:To:Subject; DKIM-Signature: a=rsa-sha256; b=WTUR+3QRqpNz3tPCdIE7bh4JM+kkbuiGgI4ALWw0HPJ8Hb0k8JKsBjTI/C2Usrkpz+6CMqVRVMFAhEwc8fT6n5fEC9oKotJO4M6RZwBC1Kw5c6MojdcMJZT9DzCRbYlHG0xoJF8LMuMomZ6S76TvbLAnNMAMJm0uS4Mxx64aLj09RerBhQ3diUWdZKQBWaV32nAzlejulvBBZIhI+SGUUGJsikPrTrYaXzfBRYmDV9GNp9rBV65NUqs3K7jlsTSYCBQfa82NbBGumDqLDIQyZMO+9e3dWRkkm82ZZzCALS55HZrKrdqRAI/+R+8nxWVoziT22ExfU4v8I22k4nc82Q==; s=purelymail3; d=purelymail.com; v=1; bh=ut6joLrajVzVBGjsqpp+2gXh54RNk8/LjDMsVP6ZAe0=; h=Feedback-ID:Received:From:To:Subject; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 64528@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1773032586; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sat, 08 Jul 2023 18:29:45 +0000 (UTC) Date: Sat, 8 Jul 2023 13:29:28 -0500 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail Content-Type: text/plain; charset=UTF-8 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Lilah Tascheter X-ACL-Warn: , Lilah Tascheter via Guix-patches From: Lilah Tascheter via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -5.28 X-Spam-Score: -5.28 X-Migadu-Queue-Id: DDE30480A2 X-Migadu-Scanner: mx2.migadu.com X-TUID: cTTBG6Cpzqnk Mesa split the Vulkan intel driver into two: intel and intel_hasvk. Enables intel_hasvk so vulkan functions on older intel GPUs again, and swrast for lavapipe as a fallback. * gnu/packages/gl.scm (mesa-vulkan-hasvk): New variable. (mesa): Graft with mesa-vulkan-hasvk. --- gnu/packages/gl.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9885bde712..1691086e1a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -279,6 +279,7 @@ (define-public mesa (base32 "1mcjf41x2bhxs6yxars7nh2vfryfw50g6rvbcfbb1wqdv2jn4qrq")))) (build-system meson-build-system) + (replacement mesa-vulkan-hasvk) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. (list libdrm @@ -526,6 +527,21 @@ (define-public mesa from software emulation to complete hardware acceleration for modern GPUs.= ") (license license:x11))) =20 +(define mesa-vulkan-hasvk + (let ((graft mesa) + (vulk "-Dvulkan-drivers=3Dintel,amd")) + (package + (inherit graft) + (arguments + (substitute-keyword-arguments (package-arguments graft) + ((#:configure-flags flags) + #~(begin + (use-modules (ice-9 match)) + (map (match-lambda + (#$vulk (string-append #$vulk ",intel_hasvk,swrast")= ) + (x x)) + #$flags)))))))) + (define-public mesa-opencl (package/inherit mesa (name "mesa-opencl") base-commit: 3db685cb2e2ce2a4b29c62d28a66201b2eba018f --=20 2.40.1