From 7b3243c70cc1012be6ea241152dce80412c03b82 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 29 Jul 2024 09:09:38 +0800 Subject: glslang: upgrade 1.3.283.0 -> 1.3.290.0 0001-generate-glslang-pkg-config.patch refreshed for 1.3.290.0 Changelog: =========== * Generate vector constructions more efficiently when sizes match * Skip identity conversions for 8-bit and 16-bit types * Add cmake aliases for public libraries * Support ARM extended matrix layout * Emit debug info for buffer references * Add support for OpExtInstWithForwardRefsKHR * Generate SPV_EXT_replicated_compisites when requested by pragma * Reuse loads generated for repeated function arguments * Fix gl_HitT alias of gl_RayTmax * Fix some cases where invalid SPIR-V was being generated when using separate samplers * Add back layoutLocation to public API (From OE-Core rev: 0540cc0b92193e963fb0823f6635d1ecf3509ac2) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../glslang/0001-generate-glslang-pkg-config.patch | 6 ++-- meta/recipes-graphics/glslang/glslang_1.3.283.0.bb | 37 ---------------------- meta/recipes-graphics/glslang/glslang_1.3.290.0.bb | 37 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-graphics/glslang/glslang_1.3.283.0.bb create mode 100644 meta/recipes-graphics/glslang/glslang_1.3.290.0.bb (limited to 'meta') diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch index 5001d63144..f8c0fc64c8 100644 --- a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch +++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch @@ -1,4 +1,4 @@ -From fc33f1cf032a15c07044ef932bc991c346d62d62 Mon Sep 17 00:00:00 2001 +From 0311dfd63ea41abb45aaf0f4ccc674f574ce639e Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sun, 7 Feb 2021 01:30:39 +0000 Subject: [PATCH] generate glslang pkg-config @@ -15,10 +15,10 @@ Signed-off-by: Jose Quaresma create mode 100644 glslang/glslang.pc.cmake.in diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index e4690f09..8e660bc5 100644 +index 8d4b1e9c..717c6d47 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -233,6 +233,8 @@ if(GLSLANG_ENABLE_INSTALL) +@@ -235,6 +235,8 @@ if(GLSLANG_ENABLE_INSTALL) install(TARGETS MachineIndependent EXPORT glslang-targets) install(TARGETS GenericCodeGen EXPORT glslang-targets) endif() diff --git a/meta/recipes-graphics/glslang/glslang_1.3.283.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.283.0.bb deleted file mode 100644 index b58bd1e956..0000000000 --- a/meta/recipes-graphics/glslang/glslang_1.3.283.0.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "OpenGL / OpenGL ES Reference Compiler" -DESCRIPTION = "Glslang is the official reference compiler front end for the \ -OpenGL ES and OpenGL shading languages. It implements a strict interpretation \ -of the specifications for these languages. It is open and free for anyone to use, \ -either from a command line or programmatically." -SECTION = "graphics" -HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" -LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" - -SRCREV = "e8dd0b6903b34f1879520b444634c75ea2deedf5" -SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ - file://0001-generate-glslang-pkg-config.patch \ - " -PE = "1" -# These recipes need to be updated in lockstep with each other: -# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools -# vulkan-validation-layers, vulkan-utility-libraries, vulkan-volk. -# The tags versions should always be sdk-x.y.z, as this is what -# upstream considers a release. -UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" -S = "${WORKDIR}/git" - -inherit cmake python3native - -DEPENDS = "spirv-tools" - -EXTRA_OECMAKE = " \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=ON \ - -DENABLE_PCH=OFF \ - -DENABLE_CTEST=OFF \ - -DBUILD_EXTERNAL=OFF \ - -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/glslang/glslang_1.3.290.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.290.0.bb new file mode 100644 index 0000000000..d6ee46de1e --- /dev/null +++ b/meta/recipes-graphics/glslang/glslang_1.3.290.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "OpenGL / OpenGL ES Reference Compiler" +DESCRIPTION = "Glslang is the official reference compiler front end for the \ +OpenGL ES and OpenGL shading languages. It implements a strict interpretation \ +of the specifications for these languages. It is open and free for anyone to use, \ +either from a command line or programmatically." +SECTION = "graphics" +HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" +LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" + +SRCREV = "fa9c3deb49e035a8abcabe366f26aac010f6cbfb" +SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ + file://0001-generate-glslang-pkg-config.patch \ + " +PE = "1" +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# vulkan-validation-layers, vulkan-utility-libraries, vulkan-volk. +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" +S = "${WORKDIR}/git" + +inherit cmake python3native + +DEPENDS = "spirv-tools" + +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON \ + -DENABLE_PCH=OFF \ + -DENABLE_CTEST=OFF \ + -DBUILD_EXTERNAL=OFF \ + -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \ +" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf