diff options
| author | Khem Raj <raj.khem@gmail.com> | 2024-09-07 13:39:13 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-09-09 18:23:01 -0700 |
| commit | f8ea49d484958d2a267e4eb9440069ab5797cf93 (patch) | |
| tree | abb82d93fc810974c9a7559ac5f0894e4dce379b | |
| parent | 9afc79f3a78df10352f4adfbfa8ae7750ef80076 (diff) | |
| download | meta-openembedded-f8ea49d484958d2a267e4eb9440069ab5797cf93.tar.gz | |
opengl-es-cts,vulkan-cts: Upgrade recipes to 3.2.11.0 and 1.3.9.2
- Drop patches which are upstreamed.
- Move common patches to files/ dir
- Use gcc to compile for now as it does not work with clang+libc++
Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 files changed, 199 insertions, 398 deletions
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 index f659e36066..9eef9a702e 100644 --- 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 | |||
| @@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 15 | 15 | ||
| 16 | --- a/framework/platform/CMakeLists.txt | 16 | --- a/framework/platform/CMakeLists.txt |
| 17 | +++ b/framework/platform/CMakeLists.txt | 17 | +++ b/framework/platform/CMakeLists.txt |
| 18 | @@ -73,8 +73,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) | 18 | @@ -83,8 +83,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) |
| 19 | add_definitions(-DDEQP_SUPPORT_WAYLAND=1) | 19 | configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.c ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.c COPYONLY) |
| 20 | include_directories(lnx/wayland) | 20 | configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.h ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.h COPYONLY) |
| 21 | 21 | else () | |
| 22 | - pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) | 22 | - pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) |
| 23 | - | 23 | - |
| 24 | + if (NOT WAYLAND_PROTOCOLS_DIR) | 24 | + if (NOT WAYLAND_PROTOCOL_DIR) |
| 25 | + pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) | 25 | + pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) |
| 26 | + endif() | 26 | + endif() |
| 27 | if (NOT WAYLAND_SCANNER) | 27 | if (NOT WAYLAND_SCANNER) |
| 28 | pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) | 28 | pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) |
| 29 | endif() | 29 | endif() |
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 new file mode 100644 index 0000000000..774b7aefee --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch | |||
| @@ -0,0 +1,123 @@ | |||
| 1 | From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Trevor Woerner <twoerner@gmail.com> | ||
| 3 | Date: Thu, 23 Sep 2021 19:36:43 -0400 | ||
| 4 | Subject: [PATCH] use library sonames for linking | ||
| 5 | |||
| 6 | The recommended "best practices" for applications is to link to library | ||
| 7 | sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This | ||
| 8 | ensures that applications don't try to use libraries if an incompatible ABI | ||
| 9 | change occurs. | ||
| 10 | |||
| 11 | Upstream-Status: Denied [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] | ||
| 12 | Signed-off-by: Trevor Woerner <twoerner@gmail.com> | ||
| 13 | --- | ||
| 14 | framework/egl/egluGLContextFactory.cpp | 4 ++-- | ||
| 15 | framework/egl/wrapper/eglwLibrary.cpp | 2 +- | ||
| 16 | framework/platform/android/tcuAndroidPlatform.cpp | 2 +- | ||
| 17 | framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- | ||
| 18 | .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- | ||
| 19 | framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- | ||
| 20 | 6 files changed, 9 insertions(+), 9 deletions(-) | ||
| 21 | |||
| 22 | --- a/framework/egl/egluGLContextFactory.cpp | ||
| 23 | +++ b/framework/egl/egluGLContextFactory.cpp | ||
| 24 | @@ -63,7 +63,7 @@ using std::vector; | ||
| 25 | #if (DE_OS == DE_OS_WIN32) | ||
| 26 | #define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" | ||
| 27 | #else | ||
| 28 | -#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
| 29 | +#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
| 30 | #endif | ||
| 31 | #endif | ||
| 32 | |||
| 33 | @@ -75,7 +75,7 @@ using std::vector; | ||
| 34 | #if (DE_OS == DE_OS_WIN32) | ||
| 35 | #define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" | ||
| 36 | #else | ||
| 37 | -#define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
| 38 | +#define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
| 39 | #endif | ||
| 40 | #endif | ||
| 41 | |||
| 42 | --- a/framework/egl/wrapper/eglwLibrary.cpp | ||
| 43 | +++ b/framework/egl/wrapper/eglwLibrary.cpp | ||
| 44 | @@ -145,7 +145,7 @@ DefaultLibrary::~DefaultLibrary(void) | ||
| 45 | const char *DefaultLibrary::getLibraryFileName(void) | ||
| 46 | { | ||
| 47 | #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) | ||
| 48 | - return "libEGL.so"; | ||
| 49 | + return "libEGL.so.1"; | ||
| 50 | #elif (DE_OS == DE_OS_WIN32) | ||
| 51 | return "libEGL.dll"; | ||
| 52 | #else | ||
| 53 | --- a/framework/platform/android/tcuAndroidPlatform.cpp | ||
| 54 | +++ b/framework/platform/android/tcuAndroidPlatform.cpp | ||
| 55 | @@ -56,7 +56,7 @@ static const eglu::NativeWindow::Capabil | ||
| 56 | class NativeDisplay : public eglu::NativeDisplay | ||
| 57 | { | ||
| 58 | public: | ||
| 59 | - NativeDisplay(void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") | ||
| 60 | + NativeDisplay(void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") | ||
| 61 | { | ||
| 62 | } | ||
| 63 | virtual ~NativeDisplay(void) | ||
| 64 | @@ -223,7 +223,7 @@ class VulkanLibrary : public vk::Library | ||
| 65 | { | ||
| 66 | public: | ||
| 67 | VulkanLibrary(const char *libraryPath) | ||
| 68 | - : m_library(libraryPath != DE_NULL ? libraryPath : "libvulkan.so") | ||
| 69 | + : m_library(libraryPath != DE_NULL ? libraryPath : "libvulkan.so.1") | ||
| 70 | , m_driver(m_library) | ||
| 71 | { | ||
| 72 | } | ||
| 73 | --- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
| 74 | +++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
| 75 | @@ -77,7 +77,7 @@ using tcu::TextureLevel; | ||
| 76 | class Library : public eglw::DefaultLibrary | ||
| 77 | { | ||
| 78 | public: | ||
| 79 | - Library(void) : eglw::DefaultLibrary("libEGL.so") | ||
| 80 | + Library(void) : eglw::DefaultLibrary("libEGL.so.1") | ||
| 81 | { | ||
| 82 | } | ||
| 83 | |||
| 84 | --- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
| 85 | +++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
| 86 | @@ -64,7 +64,7 @@ public: | ||
| 87 | Display(MovePtr<wayland::Display> waylandDisplay) | ||
| 88 | : NativeDisplay(CAPABILITIES, EGL_PLATFORM_WAYLAND_KHR, "EGL_KHR_platform_wayland") | ||
| 89 | , m_display(waylandDisplay) | ||
| 90 | - , m_library("libEGL.so") | ||
| 91 | + , m_library("libEGL.so.1") | ||
| 92 | { | ||
| 93 | } | ||
| 94 | |||
| 95 | --- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
| 96 | +++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
| 97 | @@ -69,7 +69,7 @@ using std::vector; | ||
| 98 | |||
| 99 | // Default library names | ||
| 100 | #if !defined(DEQP_GLES2_LIBRARY_PATH) | ||
| 101 | -#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
| 102 | +#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
| 103 | #endif | ||
| 104 | |||
| 105 | #if !defined(DEQP_GLES3_LIBRARY_PATH) | ||
| 106 | @@ -77,7 +77,7 @@ using std::vector; | ||
| 107 | #endif | ||
| 108 | |||
| 109 | #if !defined(DEQP_OPENGL_LIBRARY_PATH) | ||
| 110 | -#define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
| 111 | +#define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
| 112 | #endif | ||
| 113 | |||
| 114 | #if !defined(DEQP_VULKAN_LIBRARY_PATH) | ||
| 115 | @@ -258,7 +258,7 @@ glu::RenderContext *ContextFactory::crea | ||
| 116 | |||
| 117 | EglRenderContext::EglRenderContext(const glu::RenderConfig &config, const tcu::CommandLine &cmdLine, | ||
| 118 | const glu::RenderContext *sharedContext) | ||
| 119 | - : m_egl("libEGL.so") | ||
| 120 | + : m_egl("libEGL.so.1") | ||
| 121 | , m_contextType(config.type) | ||
| 122 | , m_eglDisplay(EGL_NO_DISPLAY) | ||
| 123 | , m_eglContext(EGL_NO_CONTEXT) | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch deleted file mode 100644 index 0dd59713a1..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From b07f6ecd6ab83b788301a555dc546b9a5c9dd8a2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 25 Jan 2023 19:19:34 -0800 | ||
| 4 | Subject: [PATCH] Include missing <cstdint> | ||
| 5 | |||
| 6 | This error is seen with gcc-13 where include headers are not implicitly | ||
| 7 | included [1] | ||
| 8 | |||
| 9 | Fixes errors e.g. | ||
| 10 | error: 'uint32_t' does not name a type | ||
| 11 | |||
| 12 | [1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html | ||
| 13 | |||
| 14 | Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] | ||
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 16 | --- | ||
| 17 | framework/common/tcuDefs.hpp | 1 + | ||
| 18 | 1 file changed, 1 insertion(+) | ||
| 19 | |||
| 20 | diff --git a/framework/common/tcuDefs.hpp b/framework/common/tcuDefs.hpp | ||
| 21 | index ad3d0736d..6dfac10fb 100644 | ||
| 22 | --- a/framework/common/tcuDefs.hpp | ||
| 23 | +++ b/framework/common/tcuDefs.hpp | ||
| 24 | @@ -26,6 +26,7 @@ | ||
| 25 | #include "deDefs.hpp" | ||
| 26 | #include "qpTestLog.h" | ||
| 27 | |||
| 28 | +#include <cstdint> | ||
| 29 | #include <string> | ||
| 30 | #include <stdexcept> | ||
| 31 | |||
| 32 | -- | ||
| 33 | 2.39.1 | ||
| 34 | |||
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 deleted file mode 100644 index 40aea8f203..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 1b7646ced0f0b969f818084887885827ed1a4244 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 31 May 2021 17:31:33 -0700 | ||
| 4 | Subject: [PATCH] vulkancts: Include missing <cstdint> | ||
| 5 | |||
| 6 | Fixes build with gcc-13 | ||
| 7 | |||
| 8 | ../git/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp:2798:102: error: 'uintptr_t' in namespace 'std' does not name a type | ||
| 9 | 2798 | BufferDataType type = static_cast<BufferDataType>(reinterpret_cast<std::uintptr_t>(expectedOutputs[resultIndex].getUserData())); | ||
| 10 | | ^~~~~~~~~ | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 1 + | ||
| 16 | 1 file changed, 1 insertion(+) | ||
| 17 | |||
| 18 | diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | ||
| 19 | index ab02be1dc..3d3ee4829 100644 | ||
| 20 | --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | ||
| 21 | +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | ||
| 22 | @@ -33,6 +33,7 @@ | ||
| 23 | #include "deFloat16.h" | ||
| 24 | #include "vkQueryUtil.hpp" | ||
| 25 | #include "vkRefUtil.hpp" | ||
| 26 | +#include <cstdint> | ||
| 27 | #include <cstring> | ||
| 28 | #include <vector> | ||
| 29 | #include <limits> | ||
| 30 | -- | ||
| 31 | 2.39.1 | ||
| 32 | |||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch index 4ecc371ca4..af59dd3e61 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch | |||
| @@ -2,7 +2,7 @@ Upstream-Status: Pending | |||
| 2 | 2 | ||
| 3 | --- a/external/glslang/src/glslang/Include/PoolAlloc.h | 3 | --- a/external/glslang/src/glslang/Include/PoolAlloc.h |
| 4 | +++ b/external/glslang/src/glslang/Include/PoolAlloc.h | 4 | +++ b/external/glslang/src/glslang/Include/PoolAlloc.h |
| 5 | @@ -240,8 +240,9 @@ protected: | 5 | @@ -245,8 +245,9 @@ protected: |
| 6 | 6 | ||
| 7 | int numCalls; // just an interesting statistic | 7 | int numCalls; // just an interesting statistic |
| 8 | size_t totalBytes; // just an interesting statistic | 8 | size_t totalBytes; // just an interesting statistic |
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch index 58dc1f24dd..717d489786 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch | |||
| @@ -2,9 +2,9 @@ Upstream-Status: Pending | |||
| 2 | 2 | ||
| 3 | --- a/framework/delibs/dethread/CMakeLists.txt | 3 | --- a/framework/delibs/dethread/CMakeLists.txt |
| 4 | +++ b/framework/delibs/dethread/CMakeLists.txt | 4 | +++ b/framework/delibs/dethread/CMakeLists.txt |
| 5 | @@ -42,6 +42,7 @@ if (DE_OS_IS_UNIX) | 5 | @@ -41,6 +41,7 @@ if (DE_OS_IS_UNIX) |
| 6 | if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") | ||
| 6 | add_definitions(-D__BSD_VISIBLE) | 7 | add_definitions(-D__BSD_VISIBLE) |
| 7 | add_definitions(-D_XOPEN_SOURCE=600) | ||
| 8 | endif () | 8 | endif () |
| 9 | + add_definitions(-D_XOPEN_SOURCE=600) | 9 | + add_definitions(-D_XOPEN_SOURCE=600) |
| 10 | add_definitions(-D_GNU_SOURCE) | 10 | add_definitions(-D_GNU_SOURCE) |
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 deleted file mode 100644 index 8a8d8d2c32..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | Prepend instead of append to the module search path, as this script needs to use | ||
| 2 | the local module build, not the host module build. | ||
| 3 | |||
| 4 | Upstream-Status: Submitted | ||
| 5 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 6 | |||
| 7 | diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py | ||
| 8 | index 83c5329ce..10e720910 100755 | ||
| 9 | --- a/external/vulkancts/scripts/gen_framework.py | ||
| 10 | +++ b/external/vulkancts/scripts/gen_framework.py | ||
| 11 | @@ -33 +33 @@ from collections import OrderedDict | ||
| 12 | -sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) | ||
| 13 | +sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) | ||
| 14 | diff --git a/external/vulkancts/scripts/gen_framework_c.py b/external/vulkancts/scripts/gen_framework_c.py | ||
| 15 | index 95587e642..84b878cb2 100644 | ||
| 16 | --- a/external/vulkancts/scripts/gen_framework_c.py | ||
| 17 | +++ b/external/vulkancts/scripts/gen_framework_c.py | ||
| 18 | @@ -28 +28 @@ import re | ||
| 19 | -sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) | ||
| 20 | +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 09f1fbcaee..0322ef453a 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc | |||
| @@ -3,20 +3,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
| 3 | 3 | ||
| 4 | SRC_URI = "\ | 4 | SRC_URI = "\ |
| 5 | git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ | 5 | git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ |
| 6 | git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \ | 6 | git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;nobranch=1 \ |
| 7 | git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;branch=main \ | 7 | git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;nobranch=1 \ |
| 8 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=main \ | 8 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;nobranch=1 \ |
| 9 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=main \ | 9 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;nobranch=1 \ |
| 10 | git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;branch=master \ | 10 | git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;nobranch=1 \ |
| 11 | git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;branch=main \ | 11 | git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;nobranch=1 \ |
| 12 | https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ | 12 | git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;destsuffix=git/external/vulkan-validationlayers/src;name=vulkan-validationlayers;nobranch=1 \ |
| 13 | git://github.com/Igalia/ESExtractor.git;protocol=https;destsuffix=git/external/ESExtractor/src;name=ESExtractor;branch=main \ | 13 | git://github.com/Igalia/ESExtractor.git;protocol=https;destsuffix=git/external/ESExtractor/src;name=ESExtractor;nobranch=1 \ |
| 14 | git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1 \ | 14 | git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1 \ |
| 15 | https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ | ||
| 15 | " | 16 | " |
| 16 | 17 | ||
| 17 | S = "${WORKDIR}/git" | 18 | SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_video-parser_vulkan-docs_vulkan-validationlayers" |
| 18 | |||
| 19 | SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_vulkan-docs" | ||
| 20 | 19 | ||
| 21 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
| 22 | 21 | ||
| @@ -27,7 +26,7 @@ ANY_OF_DISTRO_FEATURES += "opengl vulkan" | |||
| 27 | DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" | 26 | DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" |
| 28 | 27 | ||
| 29 | SRC_URI += " \ | 28 | SRC_URI += " \ |
| 30 | file://0001-vulkancts-Include-missing-cstdint.patch \ | 29 | file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ |
| 31 | file://0001-use-library-sonames-for-linking.patch \ | 30 | file://0001-use-library-sonames-for-linking.patch \ |
| 32 | " | 31 | " |
| 33 | 32 | ||
| @@ -39,7 +38,7 @@ DEPENDS:append:libc-musl = " libexecinfo" | |||
| 39 | SRC_URI:append:toolchain-clang = "\ | 38 | SRC_URI:append:toolchain-clang = "\ |
| 40 | file://fix-clang-private-operator.patch \ | 39 | file://fix-clang-private-operator.patch \ |
| 41 | " | 40 | " |
| 42 | 41 | EXTRA_OECMAKE += "-DUPDATE_DEPS=OFF" | |
| 43 | EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols -DAMBER_DISABLE_WERROR=ON" | 42 | EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols -DAMBER_DISABLE_WERROR=ON" |
| 44 | 43 | ||
| 45 | # The best thing for the user to do is to not specify any of the following | 44 | # The best thing for the user to do is to not specify any of the following |
| @@ -81,3 +80,11 @@ python __anonymous() { | |||
| 81 | CTSDIR = "/usr/lib/${BPN}" | 80 | CTSDIR = "/usr/lib/${BPN}" |
| 82 | 81 | ||
| 83 | FILES:${PN} += "${CTSDIR}" | 82 | FILES:${PN} += "${CTSDIR}" |
| 83 | |||
| 84 | # does not work with libc++-19 due | ||
| 85 | # error: implicit instantiation of undefined template 'std::char_traits<unsigned int>' | ||
| 86 | TOOLCHAIN = "gcc" | ||
| 87 | |||
| 88 | # Validation-layers requires access during configure as it fetches validation-headers | ||
| 89 | # and bunch of other packages from khronos github | ||
| 90 | do_configure[network] = "1" | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch deleted file mode 100644 index b5a1d331ed..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch +++ /dev/null | |||
| @@ -1,114 +0,0 @@ | |||
| 1 | From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Trevor Woerner <twoerner@gmail.com> | ||
| 3 | Date: Thu, 23 Sep 2021 19:36:43 -0400 | ||
| 4 | Subject: [PATCH] use library sonames for linking | ||
| 5 | |||
| 6 | The recommended "best practices" for applications is to link to library | ||
| 7 | sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This | ||
| 8 | ensures that applications don't try to use libraries if an incompatible ABI | ||
| 9 | change occurs. | ||
| 10 | |||
| 11 | Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] | ||
| 12 | Signed-off-by: Trevor Woerner <twoerner@gmail.com> | ||
| 13 | --- | ||
| 14 | framework/egl/egluGLContextFactory.cpp | 4 ++-- | ||
| 15 | framework/egl/wrapper/eglwLibrary.cpp | 2 +- | ||
| 16 | framework/platform/android/tcuAndroidPlatform.cpp | 2 +- | ||
| 17 | framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- | ||
| 18 | .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- | ||
| 19 | framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- | ||
| 20 | 6 files changed, 9 insertions(+), 9 deletions(-) | ||
| 21 | |||
| 22 | --- a/framework/egl/egluGLContextFactory.cpp | ||
| 23 | +++ b/framework/egl/egluGLContextFactory.cpp | ||
| 24 | @@ -63,7 +63,7 @@ using std::vector; | ||
| 25 | # if (DE_OS == DE_OS_WIN32) | ||
| 26 | # define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" | ||
| 27 | # else | ||
| 28 | -# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
| 29 | +# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
| 30 | # endif | ||
| 31 | #endif | ||
| 32 | |||
| 33 | @@ -75,7 +75,7 @@ using std::vector; | ||
| 34 | # if (DE_OS == DE_OS_WIN32) | ||
| 35 | # define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" | ||
| 36 | # else | ||
| 37 | -# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
| 38 | +# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
| 39 | # endif | ||
| 40 | #endif | ||
| 41 | |||
| 42 | --- a/framework/egl/wrapper/eglwLibrary.cpp | ||
| 43 | +++ b/framework/egl/wrapper/eglwLibrary.cpp | ||
| 44 | @@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void) | ||
| 45 | const char* DefaultLibrary::getLibraryFileName (void) | ||
| 46 | { | ||
| 47 | #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) | ||
| 48 | - return "libEGL.so"; | ||
| 49 | + return "libEGL.so.1"; | ||
| 50 | #elif (DE_OS == DE_OS_WIN32) | ||
| 51 | return "libEGL.dll"; | ||
| 52 | #else | ||
| 53 | --- a/framework/platform/android/tcuAndroidPlatform.cpp | ||
| 54 | +++ b/framework/platform/android/tcuAndroidPlatform.cpp | ||
| 55 | @@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capabil | ||
| 56 | class NativeDisplay : public eglu::NativeDisplay | ||
| 57 | { | ||
| 58 | public: | ||
| 59 | - NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {} | ||
| 60 | + NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {} | ||
| 61 | virtual ~NativeDisplay (void) {} | ||
| 62 | |||
| 63 | virtual EGLNativeDisplayType getLegacyNative (void) { return EGL_DEFAULT_DISPLAY; } | ||
| 64 | --- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
| 65 | +++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
| 66 | @@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibr | ||
| 67 | { | ||
| 68 | public: | ||
| 69 | Library (void) | ||
| 70 | - : eglw::DefaultLibrary("libEGL.so") | ||
| 71 | + : eglw::DefaultLibrary("libEGL.so.1") | ||
| 72 | { | ||
| 73 | } | ||
| 74 | |||
| 75 | --- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
| 76 | +++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
| 77 | @@ -66,7 +66,7 @@ public: | ||
| 78 | EGL_PLATFORM_WAYLAND_KHR, | ||
| 79 | "EGL_KHR_platform_wayland") | ||
| 80 | , m_display (waylandDisplay) | ||
| 81 | - , m_library ("libEGL.so") {} | ||
| 82 | + , m_library ("libEGL.so.1") {} | ||
| 83 | |||
| 84 | ~Display(void) {} | ||
| 85 | wayland::Display& getWaylandDisplay (void) { return *m_display; } | ||
| 86 | --- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
| 87 | +++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
| 88 | @@ -69,7 +69,7 @@ using std::vector; | ||
| 89 | |||
| 90 | // Default library names | ||
| 91 | #if !defined(DEQP_GLES2_LIBRARY_PATH) | ||
| 92 | -# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
| 93 | +# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
| 94 | #endif | ||
| 95 | |||
| 96 | #if !defined(DEQP_GLES3_LIBRARY_PATH) | ||
| 97 | @@ -77,7 +77,7 @@ using std::vector; | ||
| 98 | #endif | ||
| 99 | |||
| 100 | #if !defined(DEQP_OPENGL_LIBRARY_PATH) | ||
| 101 | -# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
| 102 | +# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
| 103 | #endif | ||
| 104 | |||
| 105 | #if !defined(DEQP_VULKAN_LIBRARY_PATH) | ||
| 106 | @@ -234,7 +234,7 @@ glu::RenderContext* ContextFactory::crea | ||
| 107 | } | ||
| 108 | |||
| 109 | EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine) | ||
| 110 | - : m_egl("libEGL.so") | ||
| 111 | + : m_egl("libEGL.so.1") | ||
| 112 | , m_contextType(config.type) | ||
| 113 | , m_eglDisplay(EGL_NO_DISPLAY) | ||
| 114 | , m_eglContext(EGL_NO_CONTEXT) | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.11.0.bb index 0656d724b4..7dd60dffd8 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.11.0.bb | |||
| @@ -1,25 +1,20 @@ | |||
| 1 | DESCRIPTION = "OpenGL CTS" | 1 | DESCRIPTION = "OpenGL CTS" |
| 2 | 2 | ||
| 3 | require khronos-cts.inc | 3 | require khronos-cts.inc |
| 4 | # opengl-es-cts-3.2.9.3 | 4 | # opengl-es-cts-3.2.11.0 |
| 5 | SRCREV_vk-gl-cts = "7f5fb62245d535a1fc0bf50b2c7e5a342dc551fe" | 5 | SRCREV_vk-gl-cts = "66956d195169596472e956e3aebf2df8e3bd960d" |
| 6 | SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273" | 6 | SRCREV_amber = "0f003c2785489f59cd01bb2440fcf303149100f2" |
| 7 | SRCREV_glslang = "a0ad0d7067521fff880e36acfb8ce453421c3f25" | 7 | SRCREV_glslang = "4da479aa6afa43e5a2ce4c4148c572a03123faf3" |
| 8 | SRCREV_spirv-headers = "87d5b782bec60822aa878941e6b13c0a9a954c9b" | 8 | SRCREV_spirv-headers = "ff2afc3afc48dff4eec2a10f0212402a80708e38" |
| 9 | SRCREV_spirv-tools = "f98473ceeb1d33700d01e20910433583e5256030" | 9 | SRCREV_spirv-tools = "148c97f6876e427efd76d2328122c3075eab4b8f" |
| 10 | SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4" | 10 | SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4" |
| 11 | # Not yet needed | 11 | # Not yet needed |
| 12 | SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" | 12 | SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" |
| 13 | SRCREV_vulkan-docs = "9a2e576a052a1e65a5d41b593e693ff02745604b" | 13 | SRCREV_vulkan-docs = "ed4ba0242beb89a1795d6084709fa9e713559c94" |
| 14 | SRCREV_video-parser = "7d68747d3524842afaf050c5e00a10f5b8c07904" | 14 | SRCREV_vulkan-validationlayers = "a92629196a4fed15e59c74aa965dd47bd5ece3b7" |
| 15 | SRCREV_video-parser = "6821adf11eb4f84a2168264b954c170d03237699" | ||
| 15 | SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" | 16 | SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" |
| 16 | 17 | ||
| 17 | SRC_URI += "\ | ||
| 18 | git://github.com/nvpro-samples/vk_video_samples.git;protocol=https;destsuffix=git/external/video-parser/src;name=video-parser;branch=main \ | ||
| 19 | file://gen-framework-path.patch \ | ||
| 20 | " | ||
| 21 | S = "${WORKDIR}/git" | ||
| 22 | |||
| 23 | do_install() { | 18 | do_install() { |
| 24 | install -d ${D}/${CTSDIR} | 19 | install -d ${D}/${CTSDIR} |
| 25 | cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} | 20 | cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} |
| @@ -37,4 +32,3 @@ do_install() { | |||
| 37 | 32 | ||
| 38 | SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" | 33 | SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" |
| 39 | LTO = "" | 34 | LTO = "" |
| 40 | |||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch deleted file mode 100644 index f12abd0c1a..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch +++ /dev/null | |||
| @@ -1,114 +0,0 @@ | |||
| 1 | From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Trevor Woerner <twoerner@gmail.com> | ||
| 3 | Date: Thu, 23 Sep 2021 19:36:43 -0400 | ||
| 4 | Subject: [PATCH] use library sonames for linking | ||
| 5 | |||
| 6 | The recommended "best practices" for applications is to link to library | ||
| 7 | sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This | ||
| 8 | ensures that applications don't try to use libraries if an incompatible ABI | ||
| 9 | change occurs. | ||
| 10 | |||
| 11 | Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] | ||
| 12 | Signed-off-by: Trevor Woerner <twoerner@gmail.com> | ||
| 13 | --- | ||
| 14 | framework/egl/egluGLContextFactory.cpp | 4 ++-- | ||
| 15 | framework/egl/wrapper/eglwLibrary.cpp | 2 +- | ||
| 16 | framework/platform/android/tcuAndroidPlatform.cpp | 2 +- | ||
| 17 | framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- | ||
| 18 | .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- | ||
| 19 | framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- | ||
| 20 | 6 files changed, 9 insertions(+), 9 deletions(-) | ||
| 21 | |||
| 22 | --- a/framework/egl/egluGLContextFactory.cpp | ||
| 23 | +++ b/framework/egl/egluGLContextFactory.cpp | ||
| 24 | @@ -63,7 +63,7 @@ using std::vector; | ||
| 25 | # if (DE_OS == DE_OS_WIN32) | ||
| 26 | # define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" | ||
| 27 | # else | ||
| 28 | -# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
| 29 | +# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
| 30 | # endif | ||
| 31 | #endif | ||
| 32 | |||
| 33 | @@ -75,7 +75,7 @@ using std::vector; | ||
| 34 | # if (DE_OS == DE_OS_WIN32) | ||
| 35 | # define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" | ||
| 36 | # else | ||
| 37 | -# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
| 38 | +# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
| 39 | # endif | ||
| 40 | #endif | ||
| 41 | |||
| 42 | --- a/framework/egl/wrapper/eglwLibrary.cpp | ||
| 43 | +++ b/framework/egl/wrapper/eglwLibrary.cpp | ||
| 44 | @@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void) | ||
| 45 | const char* DefaultLibrary::getLibraryFileName (void) | ||
| 46 | { | ||
| 47 | #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) | ||
| 48 | - return "libEGL.so"; | ||
| 49 | + return "libEGL.so.1"; | ||
| 50 | #elif (DE_OS == DE_OS_WIN32) | ||
| 51 | return "libEGL.dll"; | ||
| 52 | #else | ||
| 53 | --- a/framework/platform/android/tcuAndroidPlatform.cpp | ||
| 54 | +++ b/framework/platform/android/tcuAndroidPlatform.cpp | ||
| 55 | @@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capabil | ||
| 56 | class NativeDisplay : public eglu::NativeDisplay | ||
| 57 | { | ||
| 58 | public: | ||
| 59 | - NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {} | ||
| 60 | + NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {} | ||
| 61 | virtual ~NativeDisplay (void) {} | ||
| 62 | |||
| 63 | virtual EGLNativeDisplayType getLegacyNative (void) { return EGL_DEFAULT_DISPLAY; } | ||
| 64 | --- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
| 65 | +++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
| 66 | @@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibr | ||
| 67 | { | ||
| 68 | public: | ||
| 69 | Library (void) | ||
| 70 | - : eglw::DefaultLibrary("libEGL.so") | ||
| 71 | + : eglw::DefaultLibrary("libEGL.so.1") | ||
| 72 | { | ||
| 73 | } | ||
| 74 | |||
| 75 | --- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
| 76 | +++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
| 77 | @@ -66,7 +66,7 @@ public: | ||
| 78 | EGL_PLATFORM_WAYLAND_KHR, | ||
| 79 | "EGL_KHR_platform_wayland") | ||
| 80 | , m_display (waylandDisplay) | ||
| 81 | - , m_library ("libEGL.so") {} | ||
| 82 | + , m_library ("libEGL.so.1") {} | ||
| 83 | |||
| 84 | ~Display(void) {} | ||
| 85 | wayland::Display& getWaylandDisplay (void) { return *m_display; } | ||
| 86 | --- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
| 87 | +++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
| 88 | @@ -69,7 +69,7 @@ using std::vector; | ||
| 89 | |||
| 90 | // Default library names | ||
| 91 | #if !defined(DEQP_GLES2_LIBRARY_PATH) | ||
| 92 | -# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
| 93 | +# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
| 94 | #endif | ||
| 95 | |||
| 96 | #if !defined(DEQP_GLES3_LIBRARY_PATH) | ||
| 97 | @@ -77,7 +77,7 @@ using std::vector; | ||
| 98 | #endif | ||
| 99 | |||
| 100 | #if !defined(DEQP_OPENGL_LIBRARY_PATH) | ||
| 101 | -# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
| 102 | +# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
| 103 | #endif | ||
| 104 | |||
| 105 | #if !defined(DEQP_VULKAN_LIBRARY_PATH) | ||
| 106 | @@ -237,7 +237,7 @@ glu::RenderContext* ContextFactory::crea | ||
| 107 | } | ||
| 108 | |||
| 109 | EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine, const glu::RenderContext *sharedContext) | ||
| 110 | - : m_egl("libEGL.so") | ||
| 111 | + : m_egl("libEGL.so.1") | ||
| 112 | , m_contextType(config.type) | ||
| 113 | , m_eglDisplay(EGL_NO_DISPLAY) | ||
| 114 | , m_eglContext(EGL_NO_CONTEXT) | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb deleted file mode 100644 index 7492fe9aa4..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | DESCRIPTION = "Vulkan CTS" | ||
| 2 | |||
| 3 | require khronos-cts.inc | ||
| 4 | |||
| 5 | SRC_URI += "git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1" | ||
| 6 | |||
| 7 | # vulkan-cts-1.3.7.3 | ||
| 8 | SRCREV_vk-gl-cts = "d71a36db16d98313c431829432a136dbda692a08" | ||
| 9 | SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273" | ||
| 10 | SRCREV_glslang = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3" | ||
| 11 | SRCREV_spirv-headers = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c" | ||
| 12 | SRCREV_spirv-tools = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0" | ||
| 13 | SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" | ||
| 14 | SRCREV_vulkan-docs = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0" | ||
| 15 | SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" | ||
| 16 | # Not yet needed | ||
| 17 | SRCREV_ESExtractor = "75ffcaf55bb069f7a23764194742d2fb78c7f71f" | ||
| 18 | SRCREV_video-parser = "138bbe048221d315962ddf8413aa6a08cc62a381" | ||
| 19 | |||
| 20 | SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ | ||
| 21 | file://0001-vulkan-cts-include-missing-cstdint.patch \ | ||
| 22 | " | ||
| 23 | |||
| 24 | TOOLCHAIN = "gcc" | ||
| 25 | |||
| 26 | # Workaround an optimization bug that breaks createMeshShaderMiscTestsEXT | ||
| 27 | OECMAKE_CXX_FLAGS:remove:toolchain-gcc = "-O2" | ||
| 28 | |||
| 29 | S = "${WORKDIR}/git" | ||
| 30 | |||
| 31 | REQUIRED_DISTRO_FEATURES = "vulkan" | ||
| 32 | inherit features_check | ||
| 33 | |||
| 34 | DEPENDS += " vulkan-loader" | ||
| 35 | |||
| 36 | do_install() { | ||
| 37 | install -d ${D}/${CTSDIR} | ||
| 38 | cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ | ||
| 39 | rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles | ||
| 40 | rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles | ||
| 41 | } | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb new file mode 100644 index 0000000000..4ba761b676 --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | DESCRIPTION = "Vulkan CTS" | ||
| 2 | |||
| 3 | require khronos-cts.inc | ||
| 4 | |||
| 5 | # vulkan-cts-1.3.9.2 | ||
| 6 | SRCREV_vk-gl-cts = "24c1b1498ba4f05777f47541968ffe686265c645" | ||
| 7 | SRCREV_amber = "0f003c2785489f59cd01bb2440fcf303149100f2" | ||
| 8 | SRCREV_glslang = "2b19bf7e1bc0b60cf2fe9d33e5ba6b37dfc1cc83" | ||
| 9 | SRCREV_spirv-headers = "db5a00f8cebe81146cafabf89019674a3c4bf03d" | ||
| 10 | SRCREV_spirv-tools = "4c7e1fa5c3d988cca0e626d359d30b117b9c2822" | ||
| 11 | SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" | ||
| 12 | SRCREV_vulkan-docs = "7bb606eb87cde1d34f65f36f4d4c6f2c78f072c8" | ||
| 13 | SRCREV_vulkan-validationlayers = "a92629196a4fed15e59c74aa965dd47bd5ece3b7" | ||
| 14 | SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" | ||
| 15 | # Not yet needed | ||
| 16 | SRCREV_ESExtractor = "75ffcaf55bb069f7a23764194742d2fb78c7f71f" | ||
| 17 | SRCREV_video-parser = "6821adf11eb4f84a2168264b954c170d03237699" | ||
| 18 | |||
| 19 | # Workaround an optimization bug that breaks createMeshShaderMiscTestsEXT | ||
| 20 | OECMAKE_CXX_FLAGS:remove:toolchain-gcc = "-O2" | ||
| 21 | |||
| 22 | REQUIRED_DISTRO_FEATURES = "vulkan" | ||
| 23 | inherit features_check | ||
| 24 | |||
| 25 | DEPENDS += " vulkan-loader" | ||
| 26 | |||
| 27 | do_install() { | ||
| 28 | install -d ${D}/${CTSDIR} | ||
| 29 | cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ | ||
| 30 | rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles | ||
| 31 | rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles | ||
| 32 | } | ||
