Backport everything relevant to using cts with Weston >= 10
cover Backport everything relevant to using cts with Weston >= 10
From: Randolph Sapp <[email protected]>
Backport everything relevant to getting opengl-es-cts up and running on newer versions of wayland protocols and subsequently Weston 10.
Khem Raj (2):
vulkan-cts,opengl-es-cts: Upgrade to1.3.3.1 and 3.2.8 respectively vulkan-cts,opengl-es-cts: Fix build with gcc-13
Linus Jacobson (1):
khronos-cts: Replace wayland feature dependancy with vulkan
Randolph Sapp (2):
glfw: add packageconfig and wayland dependencies
opengl-es-cts: 3.2.8.0 -> 3.2.9.3
Ross Burton (1):
khronos-cts: fix build when python3-build-native is present
meta-oe/recipes-core/glfw/glfw_3.3.bb | 14 ++- ...ude-limits-header-for-numeric_limits.patch | 88 ------------------- .../files/0001-Include-missing-cstdint.patch | 34 +++++++ .../files/0001-Remove-dead-variable-984.patch | 34 +++++++ ...-GCC-11-uninit-variable-warnings-946.patch | 73 --------------- ...LAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch | 37 ++++++++ .../files/0001-include-missing-cstdint.patch | 61 +++++++++++++ ...0001-use-library-sonames-for-linking.patch | 20 +---- ...01-vulkancts-Include-missing-cstdint.patch | 32 +++++++ .../vk-gl-cts/files/0001-vulkancts.patch | 40 --------- .../vk-gl-cts/files/gen-framework-path.patch | 20 +++++ .../vk-gl-cts/khronos-cts.inc | 43 ++++++--- .../vk-gl-cts/opengl-es-cts_3.2.7.0.bb | 31 ------- .../vk-gl-cts/opengl-es-cts_3.2.9.3.bb | 36 ++++++++ .../vk-gl-cts/vulkan-cts_1.2.6.0.bb | 24 ----- .../vk-gl-cts/vulkan-cts_1.3.3.1.bb | 34 +++++++ 16 files changed, 334 insertions(+), 287 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-Include-missing-cstdint.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 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 create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.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.9.3.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
Signature · 1 line
2.41.0
PATCH 1/6 glfw: add packageconfig and wayland dependencies
From: Randolph Sapp <[email protected]>
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.
--- meta-oe/recipes-core/glfw/glfw_3.3.bb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
meta-oe/recipes-core/glfw/glfw_3.3.bb +12 -2
@@ -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"
Signature · 1 line
2.41.0
PATCH 2/6 vulkan-cts,opengl-es-cts: Upgrade to1.3.3.1 and 3.2.8 respectively
In reply to [email protected]From: Khem Raj <[email protected]>
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
--- ...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
meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch deleted +0 -88
@@ -1,88 +0,0 @@ -From aec0be857ed3faef8802c7fd61f3d7798a565108 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Thu, 29 Apr 2021 16:03:42 -0700 -Subject: [PATCH] Include <limits> 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 <[email protected]> ---- - 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 <limits> - #include <vector> - - namespace vk ---- a/modules/vulkan/api/vktApiBufferTests.cpp -+++ b/modules/vulkan/api/vktApiBufferTests.cpp -@@ -35,6 +35,7 @@ - #include "tcuPlatform.hpp" - - #include <algorithm> -+#include <limits> - - 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 <limits> -+ - namespace vkt - { - namespace SpirVAssembly ---- a/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp -+++ b/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp -@@ -40,6 +40,7 @@ - - #include "deSharedPtr.hpp" - -+#include <limits> - #include <set> - #include <vector> - ---- a/modules/vulkan/draw/vktDrawDepthClampTests.cpp -+++ b/modules/vulkan/draw/vktDrawDepthClampTests.cpp -@@ -38,6 +38,7 @@ - #include "vkQueryUtil.hpp" - #include "tcuTextureUtil.hpp" - -+#include <limits> - #include <cmath> - - 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 <limits> -+ - #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 <limits> - #include "vktSynchronizationUtil.hpp" - #include "vkTypeUtil.hpp" - #include "vkCmdUtil.hpp"
meta-oe/recipes-graphics/vk-gl-cts/files/0001-Remove-dead-variable-984.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 0d863b444c9a54a92dab176b1b656c116923e1ca Mon Sep 17 00:00:00 2001 +From: alan-baker <[email protected]> +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 <[email protected]> +--- + 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<Value>* 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 +
meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch deleted +0 -73
73 lines not on this page · raw message
meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch new file +37 -0
@@ -0,0 +1,37 @@ +From ec12bb7bda60cdf2c848e13df67452a7d30a42be Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +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 <[email protected]> +--- + 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 +
meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch +4 -16
@@ -19,8 +19,6 @@ Signed-off-by: Trevor Woerner <[email protected]> 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)
meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +22 -8
@@ -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 ") }
meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb deleted +0 -31
@@ -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 = "" -
meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb new file +36 -0
@@ -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 = "" +
meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb deleted +0 -24
@@ -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 -}
meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb new file +28 -0
@@ -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 +}
Signature · 1 line
2.41.0
Re: [oe] [meta-oe][kirkstone][PATCH 2/6] vulkan-cts,opengl-es-cts: Upgrade to1.3.3.1 and 3.2.8 respectively
Quoted 9 lines · Randolph Sapp via lists.openembedded.org
From: Khem Raj <[email protected]>
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
Quoted 7 lines
Forward port the remaining patches
Add mechanism to run target test binaries using qemu usermode
Override
WAYLAND_SCANNERandWAYLAND_PROTOCOLS_DIRLet these variables be set via cmake cmdline before enquiring via pkg-config
This vulkan-cts_1.3.3.1 is a big jump. What Problem is is solving?
-armin
Quoted 585 lines
Signed-off-by Khem Raj <[email protected]>--- ...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.patchcreate mode 100644meta-oe/recipes-graphics/vk-gl-cts/files/0001-Remove-dead-variable-984.patch
delete mode 100644meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patchcreate mode 100644meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patchdelete 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.bbmeta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch deleted +0
-88@@ -1,88 +0,0 @@ -From aec0be857ed3faef8802c7fd61f3d7798a565108 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Thu, 29 Apr 2021 16:03:42 -0700 -Subject: [PATCH] Include <limits> 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 <[email protected]> ---- - 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 <limits> - #include <vector> - - namespace vk ---- a/modules/vulkan/api/vktApiBufferTests.cpp -+++ b/modules/vulkan/api/vktApiBufferTests.cpp -@@ -35,6 +35,7 @@ - #include "tcuPlatform.hpp" - - #include <algorithm> -+#include <limits> - - 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 <limits> -+ - namespace vkt - { - namespace SpirVAssembly ---- a/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp -+++ b/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp -@@ -40,6 +40,7 @@ - - #include "deSharedPtr.hpp" - -+#include <limits> - #include <set> - #include <vector> - ---- a/modules/vulkan/draw/vktDrawDepthClampTests.cpp -+++ b/modules/vulkan/draw/vktDrawDepthClampTests.cpp -@@ -38,6 +38,7 @@ - #include "vkQueryUtil.hpp" - #include "tcuTextureUtil.hpp" - -+#include <limits> - #include <cmath> - - 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 <limits> -+ - #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 <limits> - #include "vktSynchronizationUtil.hpp" - #include "vkTypeUtil.hpp" - #include "vkCmdUtil.hpp"meta-oe/recipes-graphics/vk-gl-cts/files/0001-Remove-dead-variable-984.patch new file +34
-0@@ -0,0 +1,34 @@ +From 0d863b444c9a54a92dab176b1b656c116923e1ca Mon Sep 17 00:00:00 2001 +From: alan-baker <[email protected]> +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 <[email protected]> +--- + 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<Value>* 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 +meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch deleted +0
-73@@ -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?= - <[email protected]> -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 <cassert> -+#include <cstring> - - // 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<float*>(&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<uint32_t>(value[0]) & 0x3f) << 17U; - - uint32_t hex = exponent | mantissa; -- float* hex_float = reinterpret_cast<float*>(&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<uint32_t>(value[0]) & 0x1f) << 18U; - - uint32_t hex = exponent | mantissa; -- float* hex_float = reinterpret_cast<float*>(&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 -meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch new file +37
-0@@ -0,0 +1,37 @@ +From ec12bb7bda60cdf2c848e13df67452a7d30a42be Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +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 <[email protected]> +--- + 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 +meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch +4
-16@@ -19,8 +19,6 @@ Signed-off-by: Trevor Woerner <[email protected]> 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)meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +22
-8@@ -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 ") }meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb deleted +0
-31@@ -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 = "" -meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb new file +36
-0@@ -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 = "" +meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb deleted +0
-24@@ -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 -}meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb new file +28
-1@@ -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 +} -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#103328): https://lists.openembedded.org/g/openembedded-devel/message/103328
Mute This Topic: https://lists.openembedded.org/mt/99557893/3616698
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
PATCH 3/6 vulkan-cts,opengl-es-cts: Fix build with gcc-13
In reply to [email protected]From: Khem Raj <[email protected]>
--- .../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
meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch new file +34 -0
@@ -0,0 +1,34 @@ +From b07f6ecd6ab83b788301a555dc546b9a5c9dd8a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 25 Jan 2023 19:19:34 -0800 +Subject: [PATCH] Include missing <cstdint> + +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 <[email protected]> +--- + 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 <cstdint> + #include <string> + #include <stdexcept> + +-- +2.39.1 +
meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch new file +61 -0
61 lines not on this page · raw message
meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 1b7646ced0f0b969f818084887885827ed1a4244 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 31 May 2021 17:31:33 -0700 +Subject: [PATCH] vulkancts: Include missing <cstdint> + +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<BufferDataType>(reinterpret_cast<std::uintptr_t>(expectedOutputs[resultIndex].getUserData())); + | ^~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] +Signed-off-by: Khem Raj <[email protected]> +--- + .../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 <cstdint> + #include <cstring> + #include <vector> + #include <limits> +-- +2.39.1 +
meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 273df2423d9226093310cbcaa8b924bb6b5d6586 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -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 <[email protected]> ---- - .../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 <limits> - #include <fenv.h> - -+#ifdef O_TRUNC -+#undef O_TRUNC -+#endif -+ - namespace vkt - { - namespace SpirVAssembly --- -2.31.1 -
meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +1 -1
@@ -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 \ "
meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb +2 -1
@@ -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"
meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb +4 -1
@@ -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"
Signature · 1 line
2.41.0
PATCH 4/6 khronos-cts: Replace wayland feature dependancy with vulkan
In reply to [email protected]From: Linus Jacobson <[email protected]>
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.
--- meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +1 -1
@@ -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"
Signature · 1 line
2.41.0
PATCH 5/6 khronos-cts: fix build when python3-build-native is present
In reply to [email protected]From: Ross Burton <[email protected]>
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.
--- .../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
meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch new file +20 -0
@@ -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 <[email protected]> + +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"))
meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +1 -0
@@ -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"
Signature · 1 line
2.41.0
PATCH 6/6 opengl-es-cts: 3.2.8.0 -> 3.2.9.3
In reply to [email protected]From: Randolph Sapp <[email protected]>
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.
---
.../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%)meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +6 -4
@@ -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 \ "
meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb renamed from meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb +9 -10
@@ -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() {
meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb +3 -0
@@ -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 \
Signature · 1 line
2.41.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [EXTERNAL] [oe] [meta-oe][kirkstone][PATCH 1/6] glfw: add packageconfig and wayland dependencies
Quoted 7 lines · Randolph Sapp via lists.openembedded.org
From: Randolph Sapp <[email protected]>
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 <[email protected]>
Whoops. That wasn't supposed to be included. Please ignore this patch, we had a previous discussion about it [1] and I haven't gotten around to cleaning it up.
[1] https://lists.openembedded.org/g/openembedded-devel/message/102216
Quoted 4 lines · Randolph Sapp via lists.openembedded.org
From: Randolph Sapp <[email protected]>
Backport everything relevant to getting opengl-es-cts up and running on newer versions of wayland protocols and subsequently Weston 10.
Weston 10 was released months before Kirkstone released so IMHO there was ample of time to get needed packages updated prior to release. This does not sound like bug fixes.
Nacking series.
- armin
Quoted 55 lines
Khem Raj (2):
vulkan-cts,opengl-es-cts: Upgrade to1.3.3.1 and 3.2.8 respectively vulkan-cts,opengl-es-cts: Fix build with gcc-13Linus Jacobson (1):
khronos-cts: Replace wayland feature dependancy with vulkanRandolph Sapp (2):
glfw: add packageconfig and wayland dependencies
opengl-es-cts: 3.2.8.0 -> 3.2.9.3Ross Burton (1):
khronos-cts: fix build when python3-build-native is presentmeta-oe/recipes-core/glfw/glfw_3.3.bb | 14 ++- ...ude-limits-header-for-numeric_limits.patch | 88 ------------------- .../files/0001-Include-missing-cstdint.patch | 34 +++++++ .../files/0001-Remove-dead-variable-984.patch | 34 +++++++ ...-GCC-11-uninit-variable-warnings-946.patch | 73 --------------- ...LAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch | 37 ++++++++ .../files/0001-include-missing-cstdint.patch | 61 +++++++++++++ ...0001-use-library-sonames-for-linking.patch | 20 +---- ...01-vulkancts-Include-missing-cstdint.patch | 32 +++++++ .../vk-gl-cts/files/0001-vulkancts.patch | 40 --------- .../vk-gl-cts/files/gen-framework-path.patch | 20 +++++ .../vk-gl-cts/khronos-cts.inc | 43 ++++++--- .../vk-gl-cts/opengl-es-cts_3.2.7.0.bb | 31 ------- .../vk-gl-cts/opengl-es-cts_3.2.9.3.bb | 36 ++++++++ .../vk-gl-cts/vulkan-cts_1.2.6.0.bb | 24 ----- .../vk-gl-cts/vulkan-cts_1.3.3.1.bb | 34 +++++++ 16 files changed, 334 insertions(+), 287 deletions(-)delete mode 100644
meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patchcreate mode 100644meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch
create mode 100644meta-oe/recipes-graphics/vk-gl-cts/files/0001-Remove-dead-variable-984.patch
delete mode 100644meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patchcreate mode 100644meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patchcreate mode 100644meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch
create mode 100644meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patchdelete mode 100644meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch
create mode 100644meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.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.9.3.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-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#103326): https://lists.openembedded.org/g/openembedded-devel/message/103326
Mute This Topic: https://lists.openembedded.org/mt/99557891/3616698
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 10 lines · On 6/17/23 13:07, akuster808 wrote:
Quoted 3 lines · Randolph Sapp via lists.openembedded.org
From: Randolph Sapp <[email protected]>
Backport everything relevant to getting opengl-es-cts up and running on newer versions of wayland protocols and subsequently Weston 10.Weston 10 was released months before Kirkstone released so IMHO there was ample of time to get needed packages updated prior to release. This does not sound like bug fixes.
Nacking series.
- armin
Sounds like an awful lot of speculation, have you tried running the current version of opengles-cts on Weston 10? :)
Anyways, here's the exact upstream commit required for Weston 10+ support [1]:745d68215ebcfaf7fdb2a460447a0b6da3fda85a
Here's the list of tags that has it currently:
opengl-cts-4.6.3.0
opengl-cts-4.6.3.1
opengl-cts-4.6.3.2
opengl-cts-4.6.3.3
opengl-es-cts-3.2.9.0
opengl-es-cts-3.2.9.1
opengl-es-cts-3.2.9.2
opengl-es-cts-3.2.9.3
vulkan-cts-1.3.3.1
vulkan-cts-1.3.4.0
vulkan-cts-1.3.4.1
vulkan-cts-1.3.5.0
vulkan-cts-1.3.5.1
vulkan-cts-1.3.5.2
vulkan-cts-1.3.6.0
Hence the version bump.
[1] https://github.com/KhronosGroup/VK-GL-CTS/commit/745d68215ebcfaf7fdb2a460447a0b6da3fda85a
Randolph
Quoted 1 line
[snip]