| William A. Kennington III | b95905d | 2021-06-02 12:40:56 -0700 | [diff] [blame] | 1 | From 273df2423d9226093310cbcaa8b924bb6b5d6586 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: |
| 5 | |
| 6 | O_TRUNC value in OperationId enum collides with the macro O_TRUNC |
| 7 | defined in the POSIX header fnctl.h. To avoid the collision undefine |
| 8 | O_TRUNC in this particular sourcefile before its is used in enums |
| 9 | down below. |
| 10 | |
| 11 | This is fixed upstream differently |
| 12 | https://github.com/KhronosGroup/VK-GL-CTS/commit/564c6062f72fe7ecd92b4aea1558c441e651c76b |
| 13 | |
| 14 | But until we get this module uprev'ed to that, lets use a simpler |
| 15 | workaround |
| 16 | |
| 17 | Upstream-Status: Inappropriate [Fixed Differently] |
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 19 | --- |
| 20 | .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 4 ++++ |
| 21 | 1 file changed, 4 insertions(+) |
| 22 | |
| 23 | diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp |
| 24 | index 22e6c75fa..db7f4b54a 100644 |
| 25 | --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp |
| 26 | +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp |
| 27 | @@ -38,6 +38,10 @@ |
| 28 | #include <limits> |
| 29 | #include <fenv.h> |
| 30 | |
| 31 | +#ifdef O_TRUNC |
| 32 | +#undef O_TRUNC |
| 33 | +#endif |
| 34 | + |
| 35 | namespace vkt |
| 36 | { |
| 37 | namespace SpirVAssembly |
| 38 | -- |
| 39 | 2.31.1 |
| 40 | |