mirror of
git://git.yoctoproject.org/meta-freescale.git
synced 2025-10-22 14:52:19 +02:00
glslang: Align with Vulkan downgrade 1.3.275.0.imx
The current glslang fails to compile. ``` | /.../SPIRV/SpvTools.cpp: In function 'spv_target_env glslang::MapToSpirvToolsEnv(const SpvVersion&, spv::SpvBuildLogger*)': | /.../SPIRV/SpvTools.cpp:75:32: error: 'SPV_ENV_VULKAN_1_4' is not a member of 'spv_target_env' | 75 | return spv_target_env::SPV_ENV_VULKAN_1_4; | | ^~~~~~~~~~~~~~~~~~ | /.../SPIRV/SpvTools.cpp: In function 'void glslang::SpirvToolsValidate(const TIntermediate&, std::vector<unsigned int>&, spv::SpvBuildLogger*, bool)': | /.../SPIRV/SpvTools.cpp:168:5: error: 'spvValidatorOptionsSetAllowOffsetTextureOperand' was not declared in this scope | 168 | spvValidatorOptionsSetAllowOffsetTextureOperand(options, intermediate.usingTextureOffsetNonConst()); | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` Downgrade to 1.3.275.0 to align with the existing Vulkan downgrade. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
This commit is contained in:
parent
e90033778b
commit
5717bf7412
|
@ -589,6 +589,7 @@ PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx"
|
|||
# Use i.MX libdrm Version
|
||||
PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.123.imx"
|
||||
|
||||
PREFERRED_VERSION_glslang:imxvulkan ??= "1.3.275.0.imx"
|
||||
PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.275.0.imx"
|
||||
PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.275.0.imx"
|
||||
PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.275.0.imx"
|
||||
|
|
|
@ -0,0 +1,46 @@
|
|||
From 4cede5edcff96134baf35953d58595c4aa5f1fc5 Mon Sep 17 00:00:00 2001
|
||||
From: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
Date: Sun, 7 Feb 2021 01:30:39 +0000
|
||||
Subject: [PATCH] generate glslang pkg-config
|
||||
|
||||
Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch
|
||||
|
||||
Upstream-Status: Inappropriate [independently developed patch submitted at https://github.com/KhronosGroup/glslang/pull/3371]
|
||||
|
||||
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
||||
---
|
||||
glslang/CMakeLists.txt | 2 ++
|
||||
glslang/glslang.pc.cmake.in | 11 +++++++++++
|
||||
2 files changed, 13 insertions(+)
|
||||
create mode 100644 glslang/glslang.pc.cmake.in
|
||||
|
||||
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
|
||||
index 37eecaad..6974935c 100644
|
||||
--- a/glslang/CMakeLists.txt
|
||||
+++ b/glslang/CMakeLists.txt
|
||||
@@ -251,6 +251,8 @@ if(PROJECT_IS_TOP_LEVEL)
|
||||
")
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
||||
endif()
|
||||
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY)
|
||||
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
|
||||
set(PUBLIC_HEADERS
|
||||
Public/ResourceLimits.h
|
||||
diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in
|
||||
new file mode 100644
|
||||
index 00000000..43104e68
|
||||
--- /dev/null
|
||||
+++ b/glslang/glslang.pc.cmake.in
|
||||
@@ -0,0 +1,11 @@
|
||||
+prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+exec_prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
||||
+
|
||||
+Name: @PROJECT_NAME@
|
||||
+Description: OpenGL and OpenGL ES shader front end and validator
|
||||
+Requires:
|
||||
+Version: @GLSLANG_VERSION@
|
||||
+Libs: -L${libdir} -lglslang -lHLSL -lSPVRemapper
|
||||
+Cflags: -I${includedir}
|
|
@ -0,0 +1,33 @@
|
|||
From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Fri, 2 Aug 2024 22:44:21 +0100
|
||||
Subject: [PATCH] SPIRV/SpvBuilder.h: add missing <cstdint> include
|
||||
|
||||
Without the change `glslang` build fails on upcoming `gcc-15` as:
|
||||
|
||||
In file included from /build/source/SPIRV/GlslangToSpv.cpp:45:
|
||||
SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared
|
||||
248 | Id makeDebugLexicalBlock(uint32_t line);
|
||||
| ^~~~~~~~
|
||||
---
|
||||
SPIRV/SpvBuilder.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Upstream-Status: Backport [https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd]
|
||||
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
||||
|
||||
diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h
|
||||
index f86dd81b3..d688436a6 100644
|
||||
--- a/SPIRV/SpvBuilder.h
|
||||
+++ b/SPIRV/SpvBuilder.h
|
||||
@@ -56,6 +56,7 @@ namespace spv {
|
||||
}
|
||||
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <set>
|
||||
--
|
||||
2.34.1
|
||||
|
36
recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
Normal file
36
recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
Normal file
|
@ -0,0 +1,36 @@
|
|||
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 = "a91631b260cba3f22858d6c6827511e636c2458a"
|
||||
SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \
|
||||
file://0001-generate-glslang-pkg-config.patch \
|
||||
file://0002-SPIRV-SpvBuilder.h-add-missing-cstdint-include.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.
|
||||
# The tags versions should always be sdk-x.y.z, as this is what
|
||||
# upstream considers a release.
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
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"
|
Loading…
Reference in New Issue
Block a user