diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
commit | bb6a14e2f317abf60677c6ad8de9c33d5760bf36 (patch) | |
tree | 00457d3677e86437cec25fd7dab6c4513a53b1a4 /meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch | |
parent | defdca82c107f46e980c84bffb1b2c1263522fa0 (diff) | |
parent | cf6fd27dbd8e2d1b507f8c3752b85801b2c6ef57 (diff) | |
download | openbmc-bb6a14e2f317abf60677c6ad8de9c33d5760bf36.tar.xz |
Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch new file mode 100644 index 000000000..2fd1d7123 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch @@ -0,0 +1,40 @@ +From 273df2423d9226093310cbcaa8b924bb6b5d6586 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + .../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 + |