From patchwork Thu Jun 1 15:37:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_D=C3=ADaz?= X-Patchwork-Id: 100941 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp866008qge; Thu, 1 Jun 2017 08:37:32 -0700 (PDT) X-Received: by 10.99.227.81 with SMTP id o17mr1637184pgj.41.1496331452561; Thu, 01 Jun 2017 08:37:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496331452; cv=none; d=google.com; s=arc-20160816; b=Ojey20ntliodbpLCVlRAyXVmp/AWz7RGG+FK0u21RBdnmNqLiXu0pB3bj5IPAWSy7/ VhXwvlvhI5fiHX8FcUhbNWTQpR5dlWAMfSG/ki+LeqA/G0r6xn2huASPGV5saBNTBMrJ C2VAgWvJUMElqLMV2CihO5iDP0na+RN2mA06ICI218JIO5YjXJXP8WrhjzscS4720bf6 vs5Yxw9y5QS/eoMjQFxoHxpi3oLe7XuNN481gwNRkB1jcHQkh7hwqoeSUY7g0ltNFo9o FP6GDlrBOWcn6cqbC3ZW3vv/v5rCpr+g+oL1HcszEuHOHC6onfAAAN99XrDz6gS6wNNp FCtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=1rpZ8G1AY0Uts2ICvtLadSwsU30KHgRgTQKfBbbu8Pc=; b=QuraCL9kyZI6hediqEl6VuiXI2MazLn+EIqw+BNeZJIR3X/ZB5+4HGo7OlU66Vs7KU brPrYTHeGPY92xNq0tDSwnos49NcptBuku79pWw62Fo+FkcM0H1ogZ1iVt0ODYs1uxO4 mcGd6Th21+rTVavqkoqbd4FF40Vqd5vzArGzKsqop7BKojwS3GTIt1yD78DR2cTn+B3+ ATHWRo7hFj2yXuOrScmdvjI1ZqMJBg2UwZuqvuvGXLLJQAYRONzVLF5HCaNU4MGxdnLV aPL4B9SHYHp5zE4zvqRwH0vW2sNWJvBraTXreYbPj1GLXLHCONCr0Fc/kYXJhhrrMC3p nUtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id e64si20092694pfd.261.2017.06.01.08.37.32; Thu, 01 Jun 2017 08:37:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BB4FD77E17; Thu, 1 Jun 2017 15:37:29 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-oi0-f42.google.com (mail-oi0-f42.google.com [209.85.218.42]) by mail.openembedded.org (Postfix) with ESMTP id 53D1777E17 for ; Thu, 1 Jun 2017 15:37:27 +0000 (UTC) Received: by mail-oi0-f42.google.com with SMTP id w10so58670011oif.0 for ; Thu, 01 Jun 2017 08:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=No9SOiyoo65oACywIcnQimZ89YPMwnUCKyu0sI6d4To=; b=hTB6iHd5Hgo4cTJEUVvUMFEKfPV5CnWTnNp3IDVQvNJlGQOTWVB8nWS/1/fe7U4ZIr KLgI7BTO217PatdV/+OLT6Zp7r6WuqlxTfMTwKfzwWd3VwvYSkMEgPv/8wRhbKqAmMGs Un0oPMpBUPuQ5atReIb6MjifoDE9Gdo955IXU= 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=No9SOiyoo65oACywIcnQimZ89YPMwnUCKyu0sI6d4To=; b=ANVW7qB5pveZlIwxWQdzj5A/OkhbJhW4fg/vnTWEMquKFioe0Bsd2P6Htck6HWAKxx G7c3HpaCMVQ73BC20WN3Q8l9t6syTA3wpqAcfxjWf6uEb6Z3Ffuws8+USpEoD2IqPbxc vA2Zrmmr1478vJqfIlZJZfuMwf0R61iZ7Rz4XwRpfOlzFgHcJRFMce5XSGcm4rtFzm5+ 1Ad8BAHOq3wm8v8vIj7+Bra7QjScmJddN9r7jAMeg8m0CLJSrI8yNBT67JO6ympk34+j 7OQQuRwI1LFnzTsdmG2rpFPpL1psd3+SYwvVJgN09TTmRVm5+rceSAUBa3FtyHJhEuo1 UdNQ== X-Gm-Message-State: AODbwcDrygNbo5sq6dUr6mYRcGKuLRmuYm9V+RrDKwq9tQpMwGjH8kui jnIA9FQCp3fPl4qYKlUfPw== X-Received: by 10.202.204.141 with SMTP id c135mr1503254oig.187.1496331449171; Thu, 01 Jun 2017 08:37:29 -0700 (PDT) Received: from aura.cortijodelrio.net (CableLink67-82.telefonia.InterCable.net. [201.172.67.82]) by smtp.googlemail.com with ESMTPSA id c50sm9088799ote.29.2017.06.01.08.37.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Jun 2017 08:37:28 -0700 (PDT) From: =?utf-8?q?Daniel_D=C3=ADaz?= To: openembedded-core@lists.openembedded.org Date: Thu, 1 Jun 2017 10:37:04 -0500 Message-Id: <1496331426-6553-1-git-send-email-daniel.diaz@linaro.org> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/3][pyro] piglit: depend on virtual/egl X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org [Backported from master.] While building for Hikey using Mali 450 driver (r6p0), an error like the following appears while linking: [ 1%] Linking C shared library ../../../../lib/libpiglitutil.so [...] [...]/aarch64-linaro-linux/gcc/aarch64-linaro-linux/6.3.1/ld: cannot find -lEGL collect2: error: ld returned 1 exit status make[2]: *** [lib/libpiglitutil.so.0] Error 1 Mesa generally provides virtual/egl (along with virtual/libgl, which satisfies Piglit's current DEPENDS) but that is not the implementation to use with Mali. Signed-off-by: Daniel Díaz --- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index d6bfb14..eae3eed 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -14,7 +14,7 @@ PV = "1.0+gitr${SRCPV}" S = "${WORKDIR}/git" -DEPENDS = "libpng virtual/libx11 libxkbcommon libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native" +DEPENDS = "libpng virtual/libx11 libxkbcommon libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native virtual/egl" inherit cmake python3native distro_features_check bash-completion # depends on virtual/libx11 From patchwork Thu Jun 1 15:37:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_D=C3=ADaz?= X-Patchwork-Id: 100942 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp866039qge; Thu, 1 Jun 2017 08:37:36 -0700 (PDT) X-Received: by 10.98.93.20 with SMTP id r20mr1564342pfb.151.1496331456530; Thu, 01 Jun 2017 08:37:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496331456; cv=none; d=google.com; s=arc-20160816; b=XEY9FpbzY5f9lKqHLRyu9gaipN4et4Ivld2z0oYVQYzbWNpCQpGojh/IejWE8FZBon 77lDvQLv6YH/I6kxpZLEsp2JnMlcw7hqW9Kn+n/FeM7vw2ikLUD5X/e6KGaYUawS06o5 iRbq81dVDVlM6QBhdnr0DG3kdSAci2Tkq1CdTeB6sehVYqkR/tD9SsePTCC3YtIDYueH rhxdr4B9XHMU0ww4lzQIBzk0posWCF4SmNIF4zwhpezjRSh3JpiiQHLNAmIv4YiP6rJW c1BI9mBiXFTEE/h4DIx0/GyHWPTdQaeLMqO14aiFGkZ0S9EHJbxFAKyLWBYhun2nTZlS C/Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=TqdxluHkmKnnOuCXrCBn62XiiRJqfBfdKJau4d//jd0=; b=mzBvL5L5REhtuekJkZMB4TRCcpcYfmGzi+tReoDVx0BdyQnsbuS3rmJkBsnQ1zj/en +3omzBklYtuSu8DCncCsf4K0f3dSvSQdUhSXCLrLG19XsiGg4t1bqAafWRBP+l4URohr iLxRABCqMuDalVDajkbBlGGhWJGx08dqt66/42puqdXad+mwMT9Ljcef5mRnouFbPxSS iRzlMXwkY8tGZeRXNwJnLG+uI7FhdbU02pqp9C9D3j/ZYgyRrC6UzMAob8XEIU9s+xhp Rtqv7jRYucBKa7BYz4f4XLX+XprL7W+pm8+H0yfbww6Fxomg2YNbXHxX+wD2abtiApRa vXtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id u16si4712804pgo.232.2017.06.01.08.37.36; Thu, 01 Jun 2017 08:37:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 23BAF77E31; Thu, 1 Jun 2017 15:37:34 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-oi0-f51.google.com (mail-oi0-f51.google.com [209.85.218.51]) by mail.openembedded.org (Postfix) with ESMTP id 7F1D977DCA for ; Thu, 1 Jun 2017 15:37:33 +0000 (UTC) Received: by mail-oi0-f51.google.com with SMTP id h4so58597017oib.3 for ; Thu, 01 Jun 2017 08:37:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7+SK1iJH4DCPuIOAbkv+umjmSh0vLQEjvrWd1qdx5Vw=; b=jb/BEE1fUlQgqK3ncoThNAYdFRDnsv+LYg5Kg4WkIq3co+yLsEPIi3dgzBJfRNOoT5 PzZauWSkCLLX1SZOK9FSNamTSBci1kuYs6VVKWY0wYXaPTp+k1pQheQE+Imz0zeCatIT TpWadb+B8+6AbXVZQfGpm5RpyGSUdsoCqZccs= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=7+SK1iJH4DCPuIOAbkv+umjmSh0vLQEjvrWd1qdx5Vw=; b=TTtbD94kKSqEwBkNH99m4UEsL/mkVJcQ0LE2kUAAQnsGskUsjVvCRiXhuS+ynUG4f8 lE7EKohrdMchdUmwCElEXk0urkbg6kdHIuYpf2ofPHLafW2qtBkVPoFD/zLENweWbeg7 6U5ycsc7pY462ZWpDMvwuOxvcNREno5W1KLF5cSaEpvSNvcC4/6s/YIBn14sHrowj2O1 nxVwmmSXeMd5vKHh8d3LC92MXG4IjUIgpxmtwT/plLZZqymrMDrJGBDRstp5aFWmwa0i 0vW8KmS3NZ4QYRyezKOhcFi0c7RUSUYOKWPZhf3chqWtSJkmrpeGDPmlc1zl+Mn+R/+Q KKfg== X-Gm-Message-State: AODbwcBrg98bOoeZx1RepYRgBfUdi2jvFMJXZIt02K1nr3GBOUnWiPts wZhoM30ZeqUE/nI1AfdtJQ== X-Received: by 10.202.229.15 with SMTP id c15mr1399292oih.45.1496331454171; Thu, 01 Jun 2017 08:37:34 -0700 (PDT) Received: from aura.cortijodelrio.net (CableLink67-82.telefonia.InterCable.net. [201.172.67.82]) by smtp.googlemail.com with ESMTPSA id c50sm9088799ote.29.2017.06.01.08.37.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Jun 2017 08:37:33 -0700 (PDT) From: =?utf-8?q?Daniel_D=C3=ADaz?= To: openembedded-core@lists.openembedded.org Date: Thu, 1 Jun 2017 10:37:05 -0500 Message-Id: <1496331426-6553-2-git-send-email-daniel.diaz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1496331426-6553-1-git-send-email-daniel.diaz@linaro.org> References: <1496331426-6553-1-git-send-email-daniel.diaz@linaro.org> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/3][pyro] piglit: add patch for lack of gbm_bo_map X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org [Backported from master.] [Piglit Bug #100978] -- https://bugs.freedesktop.org/show_bug.cgi?id=100978 When linking against Mali 450 r6, errors like the following can be seen: ../../../../lib/libpiglitutil_gl.so.0: undefined reference to `gbm_bo_unmap' ../../../../lib/libpiglitutil_gl.so.0: undefined reference to `gbm_bo_map' collect2: error: ld returned 1 exit status make[2]: *** [bin/point-sprite] Error 1 This is due to gbm_bo_map() and gbm_bo_unmap() being recently added but not yet implemented by all graphics drivers. Instead of relying on GBM's version, actually try to link against those symbols. Upstream-Status: Submitted [piglit@lists.freedesktop.org] Signed-off-by: Daniel Díaz --- ...fine-GBM_BO_MAP-only-when-symbol-is-found.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 meta/recipes-graphics/piglit/piglit/0001-CMake-define-GBM_BO_MAP-only-when-symbol-is-found.patch diff --git a/meta/recipes-graphics/piglit/piglit/0001-CMake-define-GBM_BO_MAP-only-when-symbol-is-found.patch b/meta/recipes-graphics/piglit/piglit/0001-CMake-define-GBM_BO_MAP-only-when-symbol-is-found.patch new file mode 100644 index 0000000..0750676 --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0001-CMake-define-GBM_BO_MAP-only-when-symbol-is-found.patch @@ -0,0 +1,48 @@ +From 6b6acee8841d092e5066b1bec2ba1c49cce4f91f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20D=C3=ADaz?= +Date: Thu, 4 May 2017 00:57:39 -0500 +Subject: [PATCH 1/4] CMake: define GBM_BO_MAP only when symbol is found +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gbm_bo_map() and _unmap() have been added recently to Mesa, +and this update may not have reached all implementations of +GBM, such as the one provided by Mali r6, where said +definitions can be found in the header file but not in the +library itself. This leads to errors like the following when +linking: + ../../../../lib/libpiglitutil_gl.so.0: undefined reference to `gbm_bo_unmap' + ../../../../lib/libpiglitutil_gl.so.0: undefined reference to `gbm_bo_map' + collect2: error: ld returned 1 exit status + make[2]: *** [bin/point-sprite] Error 1 + +Instead of relying on the header file, actually try to link +using that symbol to determine if PIGLIT_HAS_GBM_BO_MAP +should be defined. + +Signed-off-by: Daniel Díaz +Reviewed-by: Jan Vesely +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a4ff99e..cc26fa8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,8 +141,9 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + if(GBM_FOUND) + set(PIGLIT_HAS_GBM True) + add_definitions(-DPIGLIT_HAS_GBM) +- if (GBM_VERSION VERSION_EQUAL "12.1" OR GBM_VERSION VERSION_GREATER "12.1") +- set(PIGLIT_HAS_GBM_BO_MAP True) ++ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${GBM_LIBRARIES}) ++ CHECK_FUNCTION_EXISTS(gbm_bo_map PIGLIT_HAS_GBM_BO_MAP) ++ if (PIGLIT_HAS_GBM_BO_MAP) + add_definitions(-DPIGLIT_HAS_GBM_BO_MAP) + endif() + endif(GBM_FOUND) +-- +1.9.1 + From patchwork Thu Jun 1 15:37:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_D=C3=ADaz?= X-Patchwork-Id: 100943 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp866086qge; Thu, 1 Jun 2017 08:37:42 -0700 (PDT) X-Received: by 10.98.91.5 with SMTP id p5mr1582138pfb.94.1496331462787; Thu, 01 Jun 2017 08:37:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496331462; cv=none; d=google.com; s=arc-20160816; b=i+9BomFEjK95BQm7y8ReS9Azkbfcl3NLHg5Vu1yslh8z6/CaUwvIovEicydc257MXv 8xd1BQSOHAxYcoPLG5niyA6++KDt5Wlq7/gbgg0HEM4JhJsD6pOBEngHEakbhpag32vy 7ecZzVgSuKNJ7rP5F7Mf0PAkCwm7uTbOf78q/Yj+6RqIol9WT4QTv8qKjCskD51TJmno 2wv/gSzJ0t3Fxcm5X0BELT9vW3AkhE9GljGdpPkpHc4sYUjGlka30wLM3Cv8Mf7krY6q QDEcocCDuaZ4ioF7E5TU8fRGwUQQeLMiM8LjK0IVbJrnkEerHhkXvUe3WSiJUuX6OwMr COWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=bCrA4rVqTsffnRHuJLlwjhkkFzR46N+PP9BBHXSYYaE=; b=LhV/Inb4YvJRmCbWZrBraLmLs2SOUR45wCqLpfJOlyTguv2QFxJW5lJ0dPrHh9mb8X IPij5tmcKl1mKPU5IdqS3Np/WMRzMif78RJ+kKgahPpLe0G4ndzf7TExwhWUzH7DLDt6 m4kc90w3XC7diYNLBhUw9GZn6xg6+tmTk4iMVsX9zqQ47V7Zp6M0uOhj7AYGx7JyOg0S jXY+TLNx0xf7FGxZWAMGWI0BLacONkAC2BonpIWWQ07xGBX47akkD4Y7pwQhd1JXjWm6 j872gDEfTRKm/ZW2FkpV5dSKQ7medvug9oH0wOK1alxLBqlKVGLDd7p6cp/XYTaAnhot DjIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id u138si6571396pgb.303.2017.06.01.08.37.42; Thu, 01 Jun 2017 08:37:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3E7B777E55; Thu, 1 Jun 2017 15:37:40 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-oi0-f52.google.com (mail-oi0-f52.google.com [209.85.218.52]) by mail.openembedded.org (Postfix) with ESMTP id EC67F77E44 for ; Thu, 1 Jun 2017 15:37:38 +0000 (UTC) Received: by mail-oi0-f52.google.com with SMTP id w10so58676539oif.0 for ; Thu, 01 Jun 2017 08:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RPpGF7T/e2dfXBPYpcbm8EJV9x6n6l1F3ivIS0sWuco=; b=kLSQ6MbaQwvljb2zgToxT5TMbh/CNqZoYvm4R64uWDpnEqvnDqM1L7VYwIUUH0m4sp o3xtTme+s1GcQ8p5TlhLxuoucleSiMArdieVSXGJd5F1Z7IgGG7aiuqw/7T64l9uYHlj MOV6vQsbFkw3YbLNQCTuuTxjI58G+uXgc2QAk= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=RPpGF7T/e2dfXBPYpcbm8EJV9x6n6l1F3ivIS0sWuco=; b=sC7siL6gty3M+3IaBmm/W29z/ONntdoIS9ksiwF14VrhQi1kR6DGvGkuMhaUBz8Hdx 5uwOf3NBuND7ju6AVYrlixCzUcaWzLgsxESbaPUuSEnxkt01uwrnj+/UwVmXnw0eUobF nfVK8p0hlBLZfdh+jBMAYRMq8otcDdmlV+Gjf88mBdTvxVxff+lPiHwvh9RZ8LyQF2gA Nad5hYC4YjASMiZju48lSPsAKBhuUQP+K6qJj3qkdDvuFJRTzV8SC4LYzwUeMwaqIh8O rPdIs5NFUidFo0GG2kxvl/P+TA2IoSLnXzYm8Le17eWH73Vh3foqgIarhDYgX515nmEg SFEg== X-Gm-Message-State: AODbwcCMwYm6EYuu0vB1nRzSiaPd60T/0bWiov1NPb8tNNVeRR6EMpXk LRcy2XRNqcRLf3KEq9ZlNw== X-Received: by 10.202.79.201 with SMTP id d192mr1625477oib.208.1496331459632; Thu, 01 Jun 2017 08:37:39 -0700 (PDT) Received: from aura.cortijodelrio.net (CableLink67-82.telefonia.InterCable.net. [201.172.67.82]) by smtp.googlemail.com with ESMTPSA id c50sm9088799ote.29.2017.06.01.08.37.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Jun 2017 08:37:38 -0700 (PDT) From: =?utf-8?q?Daniel_D=C3=ADaz?= To: openembedded-core@lists.openembedded.org Date: Thu, 1 Jun 2017 10:37:06 -0500 Message-Id: <1496331426-6553-3-git-send-email-daniel.diaz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1496331426-6553-1-git-send-email-daniel.diaz@linaro.org> References: <1496331426-6553-1-git-send-email-daniel.diaz@linaro.org> MIME-Version: 1.0 Subject: [OE-core] [PATCH 3/3][pyro] piglit: add patches for unbuildable surfaceless Mesa test X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org [Backported from master.] Some EGL implementations do not actually ship all Khronos- extensions. As it turns out, the Mali 450 driver does not include any of the following symbols, used by the egl_mesa_platform_surfaceless.c spec test: * eglGetPlatformDisplay * eglCreatePlatformPixmapSurface * eglCreatePlatformWindowSurface The Right Thing To Do was to obtain the implementation of these functions (via eglGetProcAddress), as is provided by their EXT counterparts. These are guaranteed to exist since they are required by EGL_EXT_platform_base. Upstream-Status: Accepted, since git 7b74602. Signed-off-by: Daniel Díaz --- ...nour-Surfaceless-MESA-in-get_default_disp.patch | 48 ++++++++++++++ ...atform_surfaceless-Don-t-use-eglGetPlatfo.patch | 30 +++++++++ ...atform_surfaceless-Use-EXT-functions-for-.patch | 75 ++++++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 meta/recipes-graphics/piglit/piglit/0002-util-egl-Honour-Surfaceless-MESA-in-get_default_disp.patch create mode 100644 meta/recipes-graphics/piglit/piglit/0003-egl_mesa_platform_surfaceless-Don-t-use-eglGetPlatfo.patch create mode 100644 meta/recipes-graphics/piglit/piglit/0004-egl_mesa_platform_surfaceless-Use-EXT-functions-for-.patch diff --git a/meta/recipes-graphics/piglit/piglit/0002-util-egl-Honour-Surfaceless-MESA-in-get_default_disp.patch b/meta/recipes-graphics/piglit/piglit/0002-util-egl-Honour-Surfaceless-MESA-in-get_default_disp.patch new file mode 100644 index 0000000..734de2b --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0002-util-egl-Honour-Surfaceless-MESA-in-get_default_disp.patch @@ -0,0 +1,48 @@ +From aa6728cc4941a87e3933c2aa770ab8ae3080b870 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20D=C3=ADaz?= +Date: Tue, 16 May 2017 12:37:07 -0500 +Subject: [PATCH 2/4] util/egl: Honour Surfaceless MESA in get_default_display +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Daniel Díaz +--- + tests/util/piglit-util-egl.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/tests/util/piglit-util-egl.c b/tests/util/piglit-util-egl.c +index 106c735..389fe12 100644 +--- a/tests/util/piglit-util-egl.c ++++ b/tests/util/piglit-util-egl.c +@@ -85,6 +85,7 @@ piglit_egl_get_default_display(EGLenum platform) + static bool has_x11 = false; + static bool has_wayland = false; + static bool has_gbm = false; ++ static bool has_surfaceless_mesa = false; + + static EGLDisplay (*peglGetPlatformDisplayEXT)(EGLenum platform, void *native_display, const EGLint *attrib_list); + +@@ -99,6 +100,7 @@ piglit_egl_get_default_display(EGLenum platform) + has_x11 = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_EXT_platform_x11"); + has_wayland = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_EXT_platform_wayland"); + has_gbm = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_EXT_platform_gbm"); ++ has_surfaceless_mesa = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_MESA_platform_surfaceless"); + + peglGetPlatformDisplayEXT = (void*) eglGetProcAddress("eglGetPlatformDisplayEXT"); + } +@@ -123,6 +125,11 @@ piglit_egl_get_default_display(EGLenum platform) + return EGL_NO_DISPLAY; + } + break; ++ case EGL_PLATFORM_SURFACELESS_MESA: ++ if (!has_surfaceless_mesa) { ++ return EGL_NO_DISPLAY; ++ } ++ break; + default: + fprintf(stderr, "%s: unrecognized platform %#x\n", __func__, platform); + return EGL_NO_DISPLAY; +-- +1.9.1 + diff --git a/meta/recipes-graphics/piglit/piglit/0003-egl_mesa_platform_surfaceless-Don-t-use-eglGetPlatfo.patch b/meta/recipes-graphics/piglit/piglit/0003-egl_mesa_platform_surfaceless-Don-t-use-eglGetPlatfo.patch new file mode 100644 index 0000000..7ec71dd --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0003-egl_mesa_platform_surfaceless-Don-t-use-eglGetPlatfo.patch @@ -0,0 +1,30 @@ +From b02bdbfdba3464ce47f87c04bcd1d35a8fef3f54 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20D=C3=ADaz?= +Date: Wed, 17 May 2017 17:53:10 -0500 +Subject: [PATCH 3/4] egl_mesa_platform_surfaceless: Don't use + eglGetPlatformDisplay directly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Daniel Díaz +--- + .../spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c b/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c +index 3bbd6aa..81a3919 100644 +--- a/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c ++++ b/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c +@@ -31,7 +31,7 @@ test_setup(EGLDisplay *dpy) + + piglit_require_egl_extension(EGL_NO_DISPLAY, "EGL_MESA_platform_surfaceless"); + +- *dpy = eglGetPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA, NULL, NULL); ++ *dpy = piglit_egl_get_default_display(EGL_PLATFORM_SURFACELESS_MESA); + if (*dpy == EGL_NO_DISPLAY) { + printf("failed to get EGLDisplay\n"); + piglit_report_result(PIGLIT_SKIP); +-- +1.9.1 + diff --git a/meta/recipes-graphics/piglit/piglit/0004-egl_mesa_platform_surfaceless-Use-EXT-functions-for-.patch b/meta/recipes-graphics/piglit/piglit/0004-egl_mesa_platform_surfaceless-Use-EXT-functions-for-.patch new file mode 100644 index 0000000..b3931dd --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0004-egl_mesa_platform_surfaceless-Use-EXT-functions-for-.patch @@ -0,0 +1,75 @@ +From f3bb10947a87cc3a59619847f53d47708e10fbb7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20D=C3=ADaz?= +Date: Wed, 17 May 2017 10:51:48 -0500 +Subject: [PATCH 4/4] egl_mesa_platform_surfaceless: Use EXT functions for + surfaces +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +These EXT symbols are guaranteed to exist since they require +EGL_EXT_platform_base. + +Signed-off-by: Daniel Díaz +--- + .../egl_mesa_platform_surfaceless.c | 23 ++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +diff --git a/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c b/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c +index 81a3919..264ed71 100644 +--- a/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c ++++ b/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c +@@ -24,6 +24,24 @@ + #include "piglit-util.h" + #include "piglit-util-egl.h" + ++/* Extension function pointers. ++ * ++ * Use prefix 'pegl' (piglit egl) instead of 'egl' to avoid collisions with ++ * prototypes in eglext.h. */ ++EGLSurface (*peglCreatePlatformPixmapSurfaceEXT)(EGLDisplay display, EGLConfig config, ++ NativePixmapType native_pixmap, const EGLint *attrib_list); ++EGLSurface (*peglCreatePlatformWindowSurfaceEXT)(EGLDisplay display, EGLConfig config, ++ NativeWindowType native_window, const EGLint *attrib_list); ++ ++static void ++init_egl_extension_funcs(void) ++{ ++ peglCreatePlatformPixmapSurfaceEXT = (void*) ++ eglGetProcAddress("eglCreatePlatformPixmapSurfaceEXT"); ++ peglCreatePlatformWindowSurfaceEXT = (void*) ++ eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"); ++} ++ + static void + test_setup(EGLDisplay *dpy) + { +@@ -72,7 +90,7 @@ test_create_window(void *test_data) + + test_setup(&dpy); + +- surf = eglCreatePlatformWindowSurface(dpy, EGL_NO_CONFIG_KHR, ++ surf = peglCreatePlatformWindowSurfaceEXT(dpy, EGL_NO_CONFIG_KHR, + /*native_window*/ NULL, + /*attrib_list*/ NULL); + if (surf) { +@@ -103,7 +121,7 @@ test_create_pixmap(void *test_data) + + test_setup(&dpy); + +- surf = eglCreatePlatformPixmapSurface(dpy, EGL_NO_CONFIG_KHR, ++ surf = peglCreatePlatformPixmapSurfaceEXT(dpy, EGL_NO_CONFIG_KHR, + /*native_window*/ NULL, + /*attrib_list*/ NULL); + if (surf) { +@@ -205,6 +223,7 @@ main(int argc, char **argv) + piglit_report_result(PIGLIT_FAIL); + } + ++ init_egl_extension_funcs(); + result = piglit_run_selected_subtests(subtests, selected_names, + num_selected, result); + piglit_report_result(result); +-- +1.9.1 +