From patchwork Thu Jun 15 20:56:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 25713 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEB51C001DC for ; Thu, 15 Jun 2023 20:57:03 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.29803.1686862618962631900 for ; Thu, 15 Jun 2023 13:56:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=skd2KcpV; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 35FKutP9122360; Thu, 15 Jun 2023 15:56:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1686862615; bh=P5WbaqDEWOKMhqwW2ebpEICvGU76C0XM8Gx5uHbnK0Q=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=skd2KcpV8zcjheTAQtzUf5ea2+fzsW02zPszMK2l8HpLqzOKfszGfsfR42dQD/ox7 PQFEGA8qyDjTw+OORATFQmqrOqozr2tgonv7zbayhr7RGLXkZLtFuB5VruZKr20210 17JQzgN1y+VbXMNRms1KT8Yc+h2JjflTu/hbi6mA= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 35FKut0u117331 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 15 Jun 2023 15:56:55 -0500 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 15 Jun 2023 15:56:55 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 15:56:55 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 35FKutXg012389; Thu, 15 Jun 2023 15:56:55 -0500 From: To: , , CC: , Randolph Sapp Subject: [meta-oe][kirkstone][PATCH 1/6] glfw: add packageconfig and wayland dependencies Date: Thu, 15 Jun 2023 15:56:32 -0500 Message-ID: <20230615205637.724348-2-rs@ti.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230615205637.724348-1-rs@ti.com> References: <20230615205637.724348-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Jun 2023 20:57:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103324 From: Randolph Sapp GLFW has the ability to use a wayland backend. This patch adds a config for it, but does not enable it by default because it has a dependency on extra-cmake-modules which is provided (most commonly) by meta-qt5-extra. Signed-off-by: Randolph Sapp --- meta-oe/recipes-core/glfw/glfw_3.3.bb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-core/glfw/glfw_3.3.bb b/meta-oe/recipes-core/glfw/glfw_3.3.bb index b31bba6b6..5b0d61241 100644 --- a/meta-oe/recipes-core/glfw/glfw_3.3.bb +++ b/meta-oe/recipes-core/glfw/glfw_3.3.bb @@ -20,7 +20,17 @@ EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF" CFLAGS += "-fPIC" -DEPENDS = "libpng libglu zlib libxrandr libxinerama libxi libxcursor" -REQUIRED_DISTRO_FEATURES = "x11 opengl" +DEPENDS = "libpng libglu zlib" +REQUIRED_DISTRO_FEATURES = "opengl" +ANY_OF_DISTRO_FEATURES = "wayland x11" + +# upstream considers x11 and wayland backends mutually exclusive and will +# prioritize wayland if it is enabled, but wayland has dependencies that cannot +# be satisfied by this layer so it is disabled by default + +PACKAGECONFIG ??= "x11" + +PACKAGECONFIG[wayland] = "-DGLFW_USE_WAYLAND=ON,,wayland wayland-native wayland-protocols extra-cmake-modules libxkbcommon" +PACKAGECONFIG[x11] = ",,libxrandr libxinerama libxi libxcursor" COMPATIBLE_HOST:libc-musl = "null" From patchwork Thu Jun 15 20:56:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 25712 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD47EC001DD for ; Thu, 15 Jun 2023 20:57:03 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web11.29699.1686862619617564184 for ; Thu, 15 Jun 2023 13:56:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=eKnlo/c0; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: rs@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 35FKutBq052179; Thu, 15 Jun 2023 15:56:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1686862615; bh=beeNaQhgaEvH45LD6s3KNA2RMACi1a03mZd+a2zP9r8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=eKnlo/c0CGSp2r2e0ObwZdIhaG/vYOl/EHGiqRqGEECE7/huJl6MiV42GCWe84qNI WOK6fqoSnYGi+JycmEUyjG/IYMFKFgXHe71M8muGp/p8rSVZeBqXl3DrmPLH1Z4MyF UIz6c5KSveMUqSf0GOzDF9fLzumZECPKpRVPWLDU= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 35FKut1H058910 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 15 Jun 2023 15:56:55 -0500 Received: from DLEE115.ent.ti.com (157.170.170.26) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 15 Jun 2023 15:56:55 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 15:56:55 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 35FKutXh012389; Thu, 15 Jun 2023 15:56:55 -0500 From: To: , , CC: Subject: [meta-oe][kirkstone][PATCH 2/6] vulkan-cts,opengl-es-cts: Upgrade to1.3.3.1 and 3.2.8 respectively Date: Thu, 15 Jun 2023 15:56:33 -0500 Message-ID: <20230615205637.724348-3-rs@ti.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230615205637.724348-1-rs@ti.com> References: <20230615205637.724348-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Jun 2023 20:57:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103328 From: Khem Raj Add needed depednency on vulkan-docs, jsoncpp and python3-xml-native as they are added newly in these versions. Delete patches already applied in this release Backport one amber patch to fix compile with clang Forward port the remaining patches Add mechanism to run target test binaries using qemu usermode Override WAYLAND_SCANNER and WAYLAND_PROTOCOLS_DIR Let these variables be set via cmake cmdline before enquiring via pkg-config Signed-off-by: Khem Raj --- ...ude-limits-header-for-numeric_limits.patch | 88 ------------------- .../files/0001-Remove-dead-variable-984.patch | 34 +++++++ ...-GCC-11-uninit-variable-warnings-946.patch | 73 --------------- ...LAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch | 37 ++++++++ ...0001-use-library-sonames-for-linking.patch | 20 +---- .../vk-gl-cts/khronos-cts.inc | 30 +++++-- .../vk-gl-cts/opengl-es-cts_3.2.7.0.bb | 31 ------- .../vk-gl-cts/opengl-es-cts_3.2.8.0.bb | 36 ++++++++ .../vk-gl-cts/vulkan-cts_1.2.6.0.bb | 24 ----- .../vk-gl-cts/vulkan-cts_1.3.3.1.bb | 28 ++++++ 10 files changed, 161 insertions(+), 240 deletions(-) delete mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-Remove-dead-variable-984.patch delete mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch delete mode 100644 meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb delete mode 100644 meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch deleted file mode 100644 index 746497d04..000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch +++ /dev/null @@ -1,88 +0,0 @@ -From aec0be857ed3faef8802c7fd61f3d7798a565108 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Apr 2021 16:03:42 -0700 -Subject: [PATCH] Include header for numeric_limits - -Fixes -vulkancts/framework/vulkan/vkRayTracingUtil.hpp:116:32: error: 'numeric_limits' is not a member of 'std' - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - framework/vulkan/vkRayTracingUtil.hpp | 1 + - modules/vulkan/api/vktApiBufferTests.cpp | 1 + - modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp | 2 ++ - 3 files changed, 4 insertions(+) - ---- a/framework/vulkan/vkRayTracingUtil.hpp -+++ b/framework/vulkan/vkRayTracingUtil.hpp -@@ -33,6 +33,7 @@ - #include "tcuVector.hpp" - #include "tcuVectorType.hpp" - -+#include - #include - - namespace vk ---- a/modules/vulkan/api/vktApiBufferTests.cpp -+++ b/modules/vulkan/api/vktApiBufferTests.cpp -@@ -35,6 +35,7 @@ - #include "tcuPlatform.hpp" - - #include -+#include - - namespace vkt - { ---- a/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp -+++ b/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp -@@ -28,6 +28,8 @@ - #include "vktSpvAsmComputeShaderCase.hpp" - #include "vktSpvAsmGraphicsShaderTestUtil.hpp" - -+#include -+ - namespace vkt - { - namespace SpirVAssembly ---- a/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp -+++ b/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp -@@ -40,6 +40,7 @@ - - #include "deSharedPtr.hpp" - -+#include - #include - #include - ---- a/modules/vulkan/draw/vktDrawDepthClampTests.cpp -+++ b/modules/vulkan/draw/vktDrawDepthClampTests.cpp -@@ -38,6 +38,7 @@ - #include "vkQueryUtil.hpp" - #include "tcuTextureUtil.hpp" - -+#include - #include - - namespace vkt ---- a/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp -+++ b/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp -@@ -39,6 +39,8 @@ - #include "tcuPlatform.hpp" - #include "tcuCommandLine.hpp" - -+#include -+ - #if ( DE_OS == DE_OS_WIN32 ) - #define NOMINMAX - #define WIN32_LEAN_AND_MEAN ---- a/modules/vulkan/synchronization/vktSynchronizationUtil.cpp -+++ b/modules/vulkan/synchronization/vktSynchronizationUtil.cpp -@@ -21,6 +21,7 @@ - * \brief Synchronization tests utilities - *//*--------------------------------------------------------------------*/ - -+#include - #include "vktSynchronizationUtil.hpp" - #include "vkTypeUtil.hpp" - #include "vkCmdUtil.hpp" diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Remove-dead-variable-984.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Remove-dead-variable-984.patch new file mode 100644 index 000000000..c29d80aa1 --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Remove-dead-variable-984.patch @@ -0,0 +1,34 @@ +From 0d863b444c9a54a92dab176b1b656c116923e1ca Mon Sep 17 00:00:00 2001 +From: alan-baker +Date: Wed, 30 Mar 2022 12:59:28 -0400 +Subject: [PATCH] Remove dead variable (#984) + +Upstream-Status: Backport [https://github.com/google/amber/commit/627ee453d6047ced0e2dd13cde983b341d0615e3] +Signed-off-by: Khem Raj +--- + src/vkscript/command_parser.cc | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/vkscript/command_parser.cc b/src/vkscript/command_parser.cc +index 610c7e6..3429d4d 100644 +--- a/src/vkscript/command_parser.cc ++++ b/src/vkscript/command_parser.cc +@@ -486,7 +486,6 @@ Result CommandParser::ParseValues(const std::string& name, + std::vector* values) { + assert(values); + +- uint32_t row_index = 0; + auto token = tokenizer_->NextToken(); + size_t seen = 0; + while (!token->IsEOL() && !token->IsEOS()) { +@@ -515,7 +514,6 @@ Result CommandParser::ParseValues(const std::string& name, + values->push_back(v); + token = tokenizer_->NextToken(); + +- ++row_index; + ++seen; + } + +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch deleted file mode 100644 index 6c87cad0a..000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9cd614dd5481a4fdf552effac4820f51a10092c7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mika=20V=C3=A4in=C3=B6l=C3=A4?= - <33728696+mvainola@users.noreply.github.com> -Date: Wed, 7 Apr 2021 13:12:17 +0300 -Subject: [PATCH] Workaround for GCC 11 uninit variable warnings (#946) - -Building Amber with GCC 11.0.1 produces some uninitialized variable -warnings. This commit works around them by replacing -reinterpret_cast with memcpy when type punning unsigned integers to -floats. - -Upstream-Status: Backport [https://github.com/google/amber/commit/aa69a0ac23ea7f68dd32bbef210546a5d84c1734] ---- - src/float16_helper.cc | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/src/float16_helper.cc b/src/float16_helper.cc -index 617bd72..5cb35e7 100644 ---- a/src/float16_helper.cc -+++ b/src/float16_helper.cc -@@ -15,6 +15,7 @@ - #include "src/float16_helper.h" - - #include -+#include - - // Float10 - // | 9 8 7 6 5 | 4 3 2 1 0 | -@@ -75,8 +76,11 @@ float HexFloat16ToFloat(const uint8_t* value) { - } - - uint32_t hex = sign | exponent | mantissa; -- float* hex_float = reinterpret_cast(&hex); -- return *hex_float; -+ float hex_float; -+ static_assert((sizeof(uint32_t) == sizeof(float)), -+ "sizeof(uint32_t) != sizeof(float)"); -+ memcpy(&hex_float, &hex, sizeof(float)); -+ return hex_float; - } - - // Convert float |value| whose size is 11 bits to 32 bits float -@@ -89,8 +93,11 @@ float HexFloat11ToFloat(const uint8_t* value) { - uint32_t mantissa = (static_cast(value[0]) & 0x3f) << 17U; - - uint32_t hex = exponent | mantissa; -- float* hex_float = reinterpret_cast(&hex); -- return *hex_float; -+ float hex_float; -+ static_assert((sizeof(uint32_t) == sizeof(float)), -+ "sizeof(uint32_t) != sizeof(float)"); -+ memcpy(&hex_float, &hex, sizeof(float)); -+ return hex_float; - } - - // Convert float |value| whose size is 10 bits to 32 bits float -@@ -103,8 +110,11 @@ float HexFloat10ToFloat(const uint8_t* value) { - uint32_t mantissa = (static_cast(value[0]) & 0x1f) << 18U; - - uint32_t hex = exponent | mantissa; -- float* hex_float = reinterpret_cast(&hex); -- return *hex_float; -+ float hex_float; -+ static_assert((sizeof(uint32_t) == sizeof(float)), -+ "sizeof(uint32_t) != sizeof(float)"); -+ memcpy(&hex_float, &hex, sizeof(float)); -+ return hex_float; - } - - } // namespace --- -2.31.1 - diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch new file mode 100644 index 000000000..d7000b7da --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch @@ -0,0 +1,37 @@ +From ec12bb7bda60cdf2c848e13df67452a7d30a42be Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 3 Sep 2022 18:52:42 -0700 +Subject: [PATCH] cmake: Define WAYLAND_SCANNER and WAYLAND_PROTOCOLS_DIR if + not already defined + +This helps with cross compiling and providing these knobs from cmake +cmdline + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + framework/platform/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/framework/platform/CMakeLists.txt b/framework/platform/CMakeLists.txt +index c3ac463e4..030163f6c 100644 +--- a/framework/platform/CMakeLists.txt ++++ b/framework/platform/CMakeLists.txt +@@ -73,8 +73,12 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) + add_definitions(-DDEQP_SUPPORT_WAYLAND=1) + include_directories(lnx/wayland) + +- pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) +- pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) ++ if (NOT DEFINED WAYLAND_PROTOCOLS_DIR) ++ pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) ++ endif() ++ if (NOT DEFINED WAYLAND_SCANNER) ++ pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) ++ endif() + + set(DEQP_XDG_SHELL_PROTOCOL ${WAYLAND_PROTOCOLS_DIR}/stable/xdg-shell/xdg-shell.xml) + set(DEQP_XDG_SHELL_GEN_OUTPUTS_DIR ${PROJECT_BINARY_DIR}/framework/platform) +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch index cb396c37d..b5a1d331e 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch @@ -19,8 +19,6 @@ Signed-off-by: Trevor Woerner framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) -diff --git a/framework/egl/egluGLContextFactory.cpp b/framework/egl/egluGLContextFactory.cpp -index 8fbea2af1..8d42f19eb 100644 --- a/framework/egl/egluGLContextFactory.cpp +++ b/framework/egl/egluGLContextFactory.cpp @@ -63,7 +63,7 @@ using std::vector; @@ -41,8 +39,6 @@ index 8fbea2af1..8d42f19eb 100644 # endif #endif -diff --git a/framework/egl/wrapper/eglwLibrary.cpp b/framework/egl/wrapper/eglwLibrary.cpp -index d7e07fe18..ebdf68b14 100644 --- a/framework/egl/wrapper/eglwLibrary.cpp +++ b/framework/egl/wrapper/eglwLibrary.cpp @@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void) @@ -54,11 +50,9 @@ index d7e07fe18..ebdf68b14 100644 #elif (DE_OS == DE_OS_WIN32) return "libEGL.dll"; #else -diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp -index b9a4c716f..05cec0b49 100644 --- a/framework/platform/android/tcuAndroidPlatform.cpp +++ b/framework/platform/android/tcuAndroidPlatform.cpp -@@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capability WINDOW_CAPABILITIES = (eglu::Nativ +@@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capabil class NativeDisplay : public eglu::NativeDisplay { public: @@ -67,11 +61,9 @@ index b9a4c716f..05cec0b49 100644 virtual ~NativeDisplay (void) {} virtual EGLNativeDisplayType getLegacyNative (void) { return EGL_DEFAULT_DISPLAY; } -diff --git a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp -index 009c05e18..237c5e16f 100644 --- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp +++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp -@@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibrary +@@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibr { public: Library (void) @@ -80,8 +72,6 @@ index 009c05e18..237c5e16f 100644 { } -diff --git a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp -index 97bc3a0ed..3a20d63d3 100644 --- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp +++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp @@ -66,7 +66,7 @@ public: @@ -93,8 +83,6 @@ index 97bc3a0ed..3a20d63d3 100644 ~Display(void) {} wayland::Display& getWaylandDisplay (void) { return *m_display; } -diff --git a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp -index 9783eaeab..a1d8ac667 100644 --- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp +++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp @@ -69,7 +69,7 @@ using std::vector; @@ -114,8 +102,8 @@ index 9783eaeab..a1d8ac667 100644 +# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" #endif - namespace tcu -@@ -238,7 +238,7 @@ glu::RenderContext* ContextFactory::createContext(const glu::RenderConfig& confi + #if !defined(DEQP_VULKAN_LIBRARY_PATH) +@@ -234,7 +234,7 @@ glu::RenderContext* ContextFactory::crea } EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 7d73bfbf3..f9074556f 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -7,23 +7,24 @@ SRC_URI = "\ git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;branch=master \ git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=master \ git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=master \ - https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ + git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;branch=master \ + git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;branch=main \ + https://raw.githubusercontent.com/baldurk/renderdoc/fcdea67879fa1991e56cf7734ce0ce27866b665f/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ " S = "${WORKDIR}/git" -SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools" +SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_vulkan-docs" S = "${WORKDIR}/git" -inherit pkgconfig cmake features_check +inherit pkgconfig cmake features_check python3native qemu ANY_OF_DISTRO_FEATURES += "opengl wayland" -DEPENDS += "libpng zlib virtual/libgles2" +DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" -SRC_URI += "file://0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch;patchdir=external/amber/src \ - file://0001-Include-limits-header-for-numeric_limits.patch;patchdir=external/vulkancts \ +SRC_URI += " \ file://0001-vulkancts.patch \ file://0001-use-library-sonames-for-linking.patch \ " @@ -37,6 +38,8 @@ SRC_URI:append:toolchain-clang = "\ file://fix-clang-private-operator.patch \ " +EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols" + # The best thing for the user to do is to not specify any of the following # PACKAGECONFIGs (i.e. leave it blank) which tells the project to do its own # probing and build what it thinks is appropriate. @@ -44,11 +47,22 @@ SRC_URI:append:toolchain-clang = "\ # to override this behaviour. PACKAGECONFIG ??= "" PACKAGECONFIG[surfaceless] = "-DDEQP_TARGET=surfaceless,,,,,wayland x11_egl x11_glx x11_egl_glx" -PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,,wayland,,,surfaceless x11_egl x11_glx x11_egl_glx" +PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,,wayland-native wayland wayland-protocols,,,surfaceless x11_egl x11_glx x11_egl_glx" PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_glx x11_egl_glx" PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11,,,surfaceless wayland x11_egl x11_egl_glx" PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_egl x11_glx" +do_configure:append() { + # Write out a qemu wrapper that will be used by cmake + # so that it can run target helper binaries through that. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} + python __anonymous() { # if the user doesn't specify any PACKAGECONFIG then the cts build system # is going to probe the sysroot to try to figure out what to build @@ -57,7 +71,7 @@ python __anonymous() { distrofeatures = (d.getVar("DISTRO_FEATURES") or "") if not bb.utils.contains_any("PACKAGECONFIG", ["surfaceless", "wayland", "x11_egl", "x11_glx", "x11_egl_glx"], True, False, d): if "wayland" in distrofeatures: - d.appendVar("DEPENDS", " wayland ") + d.appendVar("DEPENDS", " wayland-native wayland wayland-protocols") if "x11" in distrofeatures: d.appendVar("DEPENDS", " virtual/libx11 virtual/egl ") } diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb deleted file mode 100644 index 1c1371b03..000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "OpenGL CTS" - -require khronos-cts.inc -# opengl-es-cts-3.2.7.0 -SRCREV_vk-gl-cts = "7cba7113c40f2ff03573c8c2c90661b2249e04fa" -SRCREV_amber = "4d0115cccfcb3b73d20b6513b1c40748e6403c50" -SRCREV_glslang = "ffccefddfd9a02ec0c0b6dd04ef5e1042279c97f" -SRCREV_spirv-headers = "104ecc356c1bea4476320faca64440cd1df655a3" -SRCREV_spirv-tools = "cd590fa3341284cd6d1ee82366155786cfd44c96" -SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" - -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}/${CTSDIR} - cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} - - install -m 0755 ${B}/modules/egl/deqp-egl ${D}/${CTSDIR} - install -m 0755 ${B}/modules/gles2/deqp-gles2 ${D}/${CTSDIR} - install -m 0755 ${B}/modules/gles3/deqp-gles3 ${D}/${CTSDIR} - install -m 0755 ${B}/modules/gles31/deqp-gles31 ${D}/${CTSDIR} - install -m 0755 ${B}/modules/internal/de-internal-tests ${D}/${CTSDIR} - - rm -r ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles - rm -r ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles - rm -r ${D}/${CTSDIR}/common/subgroups/*.a ${D}/${CTSDIR}/common/subgroups/cmake_install.cmake ${D}/${CTSDIR}/common/subgroups/CMakeFiles -} - -SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" -LTO = "" - diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb new file mode 100644 index 000000000..024a1719d --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "OpenGL CTS" + +require khronos-cts.inc +# opengl-es-cts-3.2.8.0 +SRCREV_vk-gl-cts = "317f467fac032b88a4789e4345421f92c4e8716d" +SRCREV_amber = "209d92e2c27a333e723d24497e8c7a07b2f2eb39" +SRCREV_glslang = "9158061398a96033c990e69156bd28c67114544b" +SRCREV_spirv-headers = "449bc986ba6f4c5e10e32828783f9daef2a77644" +SRCREV_spirv-tools = "ee30773650eca50b1cd3c913babcc2b50d7b91fd" +# Not yet needed +SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" +SRCREV_vulkan-docs = "d70e01c0be7b8a7d20b186b30b29a75b18bba75d" +SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" + +SRC_URI += "file://0001-Remove-dead-variable-984.patch;patchdir=external/amber/src" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}/${CTSDIR} + cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} + + install -m 0755 ${B}/modules/egl/deqp-egl ${D}/${CTSDIR} + install -m 0755 ${B}/modules/gles2/deqp-gles2 ${D}/${CTSDIR} + install -m 0755 ${B}/modules/gles3/deqp-gles3 ${D}/${CTSDIR} + install -m 0755 ${B}/modules/gles31/deqp-gles31 ${D}/${CTSDIR} + install -m 0755 ${B}/modules/internal/de-internal-tests ${D}/${CTSDIR} + + rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles + rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles + rm -rf ${D}/${CTSDIR}/common/subgroups/*.a ${D}/${CTSDIR}/common/subgroups/cmake_install.cmake ${D}/${CTSDIR}/common/subgroups/CMakeFiles +} + +SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" +LTO = "" + diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb deleted file mode 100644 index f816c1bd1..000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Vulkan CTS" - -require khronos-cts.inc -# vulkan-cts-1.2.6.0 -SRCREV_vk-gl-cts = "2cab49df5ad25a2d0061152367a21c6da83ed097" -SRCREV_amber = "dabae26164714abf951c6815a2b4513260f7c6a4" -SRCREV_glslang = "5c4f421121c4d24aad23a507e630dc5dc6c92c7c" -SRCREV_spirv-headers = "faa570afbc91ac73d594d787486bcf8f2df1ace0" -SRCREV_spirv-tools = "f11f7434815838bbad349124767b258ce7df41f0" -SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" - -S = "${WORKDIR}/git" - -REQUIRED_DISTRO_FEATURES = "vulkan" -inherit features_check - -DEPENDS += " vulkan-loader" - -do_install() { - install -d ${D}/${CTSDIR} - cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ - rm -r ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles - rm -r ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles -} diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb new file mode 100644 index 000000000..c996eb1f7 --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Vulkan CTS" + +require khronos-cts.inc +# vulkan-cts-1.3.3.1 +SRCREV_vk-gl-cts = "6024a88390942876147a88dce82bbed73b866c1b" +SRCREV_amber = "8b145a6c89dcdb4ec28173339dd176fb7b6f43ed" +SRCREV_glslang = "7dda6a6347b0bd550e202942adee475956ef462a" +SRCREV_spirv-headers = "b765c355f488837ca4c77980ba69484f3ff277f5" +SRCREV_spirv-tools = "b930e734ea198b7aabbbf04ee1562cf6f57962f0" +SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" +SRCREV_vulkan-docs = "9b5562187a8ad72c171410b036ceedbc450153ba" +SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" + +SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch" + +S = "${WORKDIR}/git" + +REQUIRED_DISTRO_FEATURES = "vulkan" +inherit features_check + +DEPENDS += " vulkan-loader" + +do_install() { + install -d ${D}/${CTSDIR} + cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ + rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles + rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles +} From patchwork Thu Jun 15 20:56:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 25711 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0ABDEB64DC for ; Thu, 15 Jun 2023 20:57:03 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web10.29804.1686862619385372443 for ; Thu, 15 Jun 2023 13:56:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=RlHGm0W8; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 35FKutNF052175; Thu, 15 Jun 2023 15:56:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1686862615; bh=ZnH8QCZWco3wE1aDZAIdVCo4sh99kxvJv7N0T0Mhqbw=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=RlHGm0W8JkoNTGrfpExVzObabhz3azqs24n+0Lu4hM6G5cG0lYr97mB0Qrfk6GI/E XcALI08AjaPsLFN+B9Bqbavb3SF1T11AS8lOXk5r4Z0CP/DcHFWFdp3Nz0nFeTUVXy ktywfTNWw3ZKny2gtlP7d94sAK1IQu6hqPvwzw0c= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 35FKutke117334 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 15 Jun 2023 15:56:55 -0500 Received: from DFLE107.ent.ti.com (10.64.6.28) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 15 Jun 2023 15:56:55 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 15:56:55 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 35FKutXi012389; Thu, 15 Jun 2023 15:56:55 -0500 From: To: , , CC: Subject: [meta-oe][kirkstone][PATCH 3/6] vulkan-cts,opengl-es-cts: Fix build with gcc-13 Date: Thu, 15 Jun 2023 15:56:34 -0500 Message-ID: <20230615205637.724348-4-rs@ti.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230615205637.724348-1-rs@ti.com> References: <20230615205637.724348-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Jun 2023 20:57:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103325 From: Khem Raj Signed-off-by: Khem Raj --- .../files/0001-Include-missing-cstdint.patch | 34 +++++++++++ .../files/0001-include-missing-cstdint.patch | 61 +++++++++++++++++++ ...01-vulkancts-Include-missing-cstdint.patch | 32 ++++++++++ .../vk-gl-cts/files/0001-vulkancts.patch | 40 ------------ .../vk-gl-cts/khronos-cts.inc | 2 +- .../vk-gl-cts/opengl-es-cts_3.2.8.0.bb | 3 +- .../vk-gl-cts/vulkan-cts_1.3.3.1.bb | 5 +- 7 files changed, 134 insertions(+), 43 deletions(-) create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch delete mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch new file mode 100644 index 000000000..0dd59713a --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch @@ -0,0 +1,34 @@ +From b07f6ecd6ab83b788301a555dc546b9a5c9dd8a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 19:19:34 -0800 +Subject: [PATCH] Include missing + +This error is seen with gcc-13 where include headers are not implicitly +included [1] + +Fixes errors e.g. +error: 'uint32_t' does not name a type + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] +Signed-off-by: Khem Raj +--- + framework/common/tcuDefs.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/framework/common/tcuDefs.hpp b/framework/common/tcuDefs.hpp +index ad3d0736d..6dfac10fb 100644 +--- a/framework/common/tcuDefs.hpp ++++ b/framework/common/tcuDefs.hpp +@@ -26,6 +26,7 @@ + #include "deDefs.hpp" + #include "qpTestLog.h" + ++#include + #include + #include + +-- +2.39.1 + diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch new file mode 100644 index 000000000..47d9fc748 --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch @@ -0,0 +1,61 @@ +From 74cf53d89529902ecdef5b230421bc4d30fd089b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 15:36:14 -0800 +Subject: [PATCH] include missing + +gcc-13 exposed errors like below due to it removing indirect includes of +these headers in libstdc++ [1] + +../git/external/amber/src/include/amber/shader_info.h:60:15: error: 'uint32_t' was not declared in this scope + 60 | std::vector shader_data; + | ^~~~~~~~ + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Submitted [https://github.com/google/amber/pull/1016] +Signed-off-by: Khem Raj +--- + include/amber/recipe.h | 1 + + include/amber/shader_info.h | 1 + + src/descriptor_set_and_binding_parser.h | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/include/amber/recipe.h b/include/amber/recipe.h +index 310a86a..1b83213 100644 +--- a/include/amber/recipe.h ++++ b/include/amber/recipe.h +@@ -15,6 +15,7 @@ + #ifndef AMBER_RECIPE_H_ + #define AMBER_RECIPE_H_ + ++#include + #include + #include + #include +diff --git a/include/amber/shader_info.h b/include/amber/shader_info.h +index 6c9126a..b5ce751 100644 +--- a/include/amber/shader_info.h ++++ b/include/amber/shader_info.h +@@ -15,6 +15,7 @@ + #ifndef AMBER_SHADER_INFO_H_ + #define AMBER_SHADER_INFO_H_ + ++#include + #include + #include + +diff --git a/src/descriptor_set_and_binding_parser.h b/src/descriptor_set_and_binding_parser.h +index 145aa42..4b0d774 100644 +--- a/src/descriptor_set_and_binding_parser.h ++++ b/src/descriptor_set_and_binding_parser.h +@@ -15,6 +15,7 @@ + #ifndef SRC_DESCRIPTOR_SET_AND_BINDING_PARSER_H_ + #define SRC_DESCRIPTOR_SET_AND_BINDING_PARSER_H_ + ++#include + #include + + #include "amber/result.h" +-- +2.39.1 + diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch new file mode 100644 index 000000000..40aea8f20 --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch @@ -0,0 +1,32 @@ +From 1b7646ced0f0b969f818084887885827ed1a4244 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 31 May 2021 17:31:33 -0700 +Subject: [PATCH] vulkancts: Include missing + +Fixes build with gcc-13 + +../git/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp:2798:102: error: 'uintptr_t' in namespace 'std' does not name a type + 2798 | BufferDataType type = static_cast(reinterpret_cast(expectedOutputs[resultIndex].getUserData())); + | ^~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] +Signed-off-by: Khem Raj +--- + .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp +index ab02be1dc..3d3ee4829 100644 +--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp ++++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp +@@ -33,6 +33,7 @@ + #include "deFloat16.h" + #include "vkQueryUtil.hpp" + #include "vkRefUtil.hpp" ++#include + #include + #include + #include +-- +2.39.1 + diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch deleted file mode 100644 index 2fd1d7123..000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 273df2423d9226093310cbcaa8b924bb6b5d6586 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 31 May 2021 17:31:33 -0700 -Subject: [PATCH] vulkancts: - -O_TRUNC value in OperationId enum collides with the macro O_TRUNC -defined in the POSIX header fnctl.h. To avoid the collision undefine -O_TRUNC in this particular sourcefile before its is used in enums -down below. - -This is fixed upstream differently -https://github.com/KhronosGroup/VK-GL-CTS/commit/564c6062f72fe7ecd92b4aea1558c441e651c76b - -But until we get this module uprev'ed to that, lets use a simpler -workaround - -Upstream-Status: Inappropriate [Fixed Differently] -Signed-off-by: Khem Raj ---- - .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -index 22e6c75fa..db7f4b54a 100644 ---- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -@@ -38,6 +38,10 @@ - #include - #include - -+#ifdef O_TRUNC -+#undef O_TRUNC -+#endif -+ - namespace vkt - { - namespace SpirVAssembly --- -2.31.1 - diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index f9074556f..87060b678 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -25,7 +25,7 @@ ANY_OF_DISTRO_FEATURES += "opengl wayland" DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" SRC_URI += " \ - file://0001-vulkancts.patch \ + file://0001-vulkancts-Include-missing-cstdint.patch \ file://0001-use-library-sonames-for-linking.patch \ " diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb index 024a1719d..edfeda2be 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb @@ -12,7 +12,8 @@ SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" SRCREV_vulkan-docs = "d70e01c0be7b8a7d20b186b30b29a75b18bba75d" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-Remove-dead-variable-984.patch;patchdir=external/amber/src" +SRC_URI += "file://0001-Remove-dead-variable-984.patch;patchdir=external/amber/src \ + file://0001-include-missing-cstdint.patch;patchdir=external/amber/src" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb index c996eb1f7..862963dd0 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb @@ -11,7 +11,10 @@ SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" SRCREV_vulkan-docs = "9b5562187a8ad72c171410b036ceedbc450153ba" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch" +SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ + file://0001-Include-missing-cstdint.patch \ + file://0001-include-missing-cstdint.patch;patchdir=external/amber/src \ +" S = "${WORKDIR}/git" From patchwork Thu Jun 15 20:56:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 25715 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAC3FC001E0 for ; Thu, 15 Jun 2023 20:57:03 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web11.29702.1686862622306927928 for ; Thu, 15 Jun 2023 13:57:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=PVqgYxXK; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: rs@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 35FKutvK120678; Thu, 15 Jun 2023 15:56:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1686862615; bh=sJB/6Os8OkouADHaUS7R2WRTswVjM47vPSSkHnW0sBA=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=PVqgYxXKxd1M5WWtit2sNTm1tO+ZAzoj9EQb6FgCDWxPFT27teVQopcyv16mg2jsz P+HhrsKD8ei+PeC7SQZXTgJWoSpkBMBr9NYY8LZvIGhqqYkIWtzNfnFYW7MkAj8A9r Ykjq6HsOm5b2bfNR5R2nd17e/acq6cYcYKDyxpzA= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 35FKuthR011631 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 15 Jun 2023 15:56:55 -0500 Received: from DFLE102.ent.ti.com (10.64.6.23) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 15 Jun 2023 15:56:55 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 15:56:55 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 35FKutXj012389; Thu, 15 Jun 2023 15:56:55 -0500 From: To: , , CC: , Linus Jacobson Subject: [meta-oe][kirkstone][PATCH 4/6] khronos-cts: Replace wayland feature dependancy with vulkan Date: Thu, 15 Jun 2023 15:56:35 -0500 Message-ID: <20230615205637.724348-5-rs@ti.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230615205637.724348-1-rs@ti.com> References: <20230615205637.724348-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Jun 2023 20:57:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103330 From: Linus Jacobson Khronos-cts.inc is used for building vulkan-cts or opengl-es-cts. Even though vulkan-cts depends on vulkan-loader, which automatically requires vulkan distro feature, it is more explicitly stated if written here next to opengl. Some systems do not support a windowing service (like wayland) but still might use standard khronos GPU libraries. For these cases, wayland dependancy is invalid. Patch replaces the invalid wayland distro feature dependancy with vulkan for clarity. Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 87060b678..65ce7d6fc 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -20,7 +20,7 @@ S = "${WORKDIR}/git" inherit pkgconfig cmake features_check python3native qemu -ANY_OF_DISTRO_FEATURES += "opengl wayland" +ANY_OF_DISTRO_FEATURES += "opengl vulkan" DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" From patchwork Thu Jun 15 20:56:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 25714 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CABE2C001DE for ; Thu, 15 Jun 2023 20:57:03 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web11.29700.1686862620750240033 for ; Thu, 15 Jun 2023 13:57:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=tmtK1wH4; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 35FKut7Q009464; Thu, 15 Jun 2023 15:56:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1686862615; bh=u5phCEtemCS2DADIc8dNhMtzmWHoQbbCB6P6eUeMnlU=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=tmtK1wH4ofPVUgoFbpR+7v6C0wJ1nfqvZaBZaODhpCvqy7QxUKQOLY5Z0VOcoMmqh ERD8LD4vq4AJOEaqLqQ9Pcb1XrNOJk6UuLup8IVNUOzV8AwYIu2sABe05zl/XPBRHS Mr19VHFQ9Y2EszM+tzcEZRIwSUdkj1ivSA1bLO4c= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 35FKutb7117337 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 15 Jun 2023 15:56:55 -0500 Received: from DLEE102.ent.ti.com (157.170.170.32) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 15 Jun 2023 15:56:55 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 15:56:55 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 35FKutXk012389; Thu, 15 Jun 2023 15:56:55 -0500 From: To: , , CC: , Ross Burton Subject: [meta-oe][kirkstone][PATCH 5/6] khronos-cts: fix build when python3-build-native is present Date: Thu, 15 Jun 2023 15:56:36 -0500 Message-ID: <20230615205637.724348-6-rs@ti.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230615205637.724348-1-rs@ti.com> References: <20230615205637.724348-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Jun 2023 20:57:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103329 From: Ross Burton This recipe has a python script which *appends* a local directory to sys.path and then tries to include a local module called build. However if python3-build-native is present that is included instead. Fix by prepending the local directory to sys.path instead. Signed-off-by: Ross Burton Signed-off-by: Khem Raj --- .../vk-gl-cts/files/gen-framework-path.patch | 20 +++++++++++++++++++ .../vk-gl-cts/khronos-cts.inc | 1 + 2 files changed, 21 insertions(+) create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch new file mode 100644 index 000000000..8a8d8d2c3 --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch @@ -0,0 +1,20 @@ +Prepend instead of append to the module search path, as this script needs to use +the local module build, not the host module build. + +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py +index 83c5329ce..10e720910 100755 +--- a/external/vulkancts/scripts/gen_framework.py ++++ b/external/vulkancts/scripts/gen_framework.py +@@ -33 +33 @@ from collections import OrderedDict +-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) ++sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) +diff --git a/external/vulkancts/scripts/gen_framework_c.py b/external/vulkancts/scripts/gen_framework_c.py +index 95587e642..84b878cb2 100644 +--- a/external/vulkancts/scripts/gen_framework_c.py ++++ b/external/vulkancts/scripts/gen_framework_c.py +@@ -28 +28 @@ import re +-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) ++sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 65ce7d6fc..4fd32d93c 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -10,6 +10,7 @@ SRC_URI = "\ git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;branch=master \ git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;branch=main \ https://raw.githubusercontent.com/baldurk/renderdoc/fcdea67879fa1991e56cf7734ce0ce27866b665f/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ + file://gen-framework-path.patch \ " S = "${WORKDIR}/git" From patchwork Thu Jun 15 20:56:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 25716 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD43AC0015E for ; Thu, 15 Jun 2023 20:57:03 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web11.29698.1686862619616961274 for ; Thu, 15 Jun 2023 13:56:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=iSfCFbv4; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 35FKutEx120683; Thu, 15 Jun 2023 15:56:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1686862615; bh=/nBWTtaFxfEqX2ZpkelsvVEGvt/wuGjL0eT4pUtwSzY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=iSfCFbv4drO4wv9+HpluwU4bbM1l1KyLYs8+AYHNOzHf4npBbww1Y8wRsvYE7ScVL xVT4d1EkGjO2PxJR0cGDeWVQkgVIoyJ9tkqTTfzFwK8hD8lMD3Nqkfby7pwUF3j4ns 0xm2eNpf8Tb00ETDhJZp9qfIo/JZYeauYzcS2q/A= Received: from DFLE112.ent.ti.com (dfle112.ent.ti.com [10.64.6.33]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 35FKut9u117340 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 15 Jun 2023 15:56:55 -0500 Received: from DFLE109.ent.ti.com (10.64.6.30) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 15 Jun 2023 15:56:55 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 15:56:55 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 35FKutXl012389; Thu, 15 Jun 2023 15:56:55 -0500 From: To: , , CC: , Randolph Sapp Subject: [meta-oe][kirkstone][PATCH 6/6] opengl-es-cts: 3.2.8.0 -> 3.2.9.3 Date: Thu, 15 Jun 2023 15:56:37 -0500 Message-ID: <20230615205637.724348-7-rs@ti.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230615205637.724348-1-rs@ti.com> References: <20230615205637.724348-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Jun 2023 20:57:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103327 From: Randolph Sapp Bump the opengl-es-cts version to latest since this package is currently incompatible with Weston 10 due to changes in wayland-protocols. I would bump the vulkan-cts test revision here as well, but unfortunately newer versions of vulkan-cts add video encode/decode tests from Nvidia that break on any arch other than amd64 in their current format. Signed-off-by: Randolph Sapp Signed-off-by: Khem Raj --- .../vk-gl-cts/khronos-cts.inc | 10 ++++++---- ...ts_3.2.8.0.bb => opengl-es-cts_3.2.9.3.bb} | 19 +++++++++---------- .../vk-gl-cts/vulkan-cts_1.3.3.1.bb | 3 +++ 3 files changed, 18 insertions(+), 14 deletions(-) rename meta-oe/recipes-graphics/vk-gl-cts/{opengl-es-cts_3.2.8.0.bb => opengl-es-cts_3.2.9.3.bb} (65%) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 4fd32d93c..097acc1a0 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -4,12 +4,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "\ git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \ - git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;branch=master \ - git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=master \ - git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=master \ + git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;branch=main \ + git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=main \ + git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=main \ git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;branch=master \ git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;branch=main \ - https://raw.githubusercontent.com/baldurk/renderdoc/fcdea67879fa1991e56cf7734ce0ce27866b665f/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ + https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ + git://github.com/Igalia/ESExtractor.git;protocol=https;destsuffix=git/external/ESExtractor/src;name=ESExtractor;branch=main \ + git://github.com/nvpro-samples/vk_video_samples.git;protocol=https;destsuffix=git/external/video-parser/src;name=video-parser;branch=main \ file://gen-framework-path.patch \ " diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb similarity index 65% rename from meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb rename to meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb index edfeda2be..67ce5f2b9 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb @@ -1,20 +1,19 @@ DESCRIPTION = "OpenGL CTS" require khronos-cts.inc -# opengl-es-cts-3.2.8.0 -SRCREV_vk-gl-cts = "317f467fac032b88a4789e4345421f92c4e8716d" -SRCREV_amber = "209d92e2c27a333e723d24497e8c7a07b2f2eb39" -SRCREV_glslang = "9158061398a96033c990e69156bd28c67114544b" -SRCREV_spirv-headers = "449bc986ba6f4c5e10e32828783f9daef2a77644" -SRCREV_spirv-tools = "ee30773650eca50b1cd3c913babcc2b50d7b91fd" +# opengl-es-cts-3.2.9.3 +SRCREV_vk-gl-cts = "7f5fb62245d535a1fc0bf50b2c7e5a342dc551fe" +SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273" +SRCREV_glslang = "a0ad0d7067521fff880e36acfb8ce453421c3f25" +SRCREV_spirv-headers = "87d5b782bec60822aa878941e6b13c0a9a954c9b" +SRCREV_spirv-tools = "f98473ceeb1d33700d01e20910433583e5256030" +SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4" # Not yet needed SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" -SRCREV_vulkan-docs = "d70e01c0be7b8a7d20b186b30b29a75b18bba75d" +SRCREV_vulkan-docs = "9a2e576a052a1e65a5d41b593e693ff02745604b" +SRCREV_video-parser = "7d68747d3524842afaf050c5e00a10f5b8c07904" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-Remove-dead-variable-984.patch;patchdir=external/amber/src \ - file://0001-include-missing-cstdint.patch;patchdir=external/amber/src" - S = "${WORKDIR}/git" do_install() { diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb index 862963dd0..d086c0129 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb @@ -10,6 +10,9 @@ SRCREV_spirv-tools = "b930e734ea198b7aabbbf04ee1562cf6f57962f0" SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" SRCREV_vulkan-docs = "9b5562187a8ad72c171410b036ceedbc450153ba" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" +# Not yet needed +SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4" +SRCREV_video-parser = "7d68747d3524842afaf050c5e00a10f5b8c07904" SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ file://0001-Include-missing-cstdint.patch \