Switched from strict C++11 header "spirv.hpp11" to C++ header "spirv.…

…hpp".
LukasBanana · Aug 12, 2023 · 0535912 · 0535912
1 parent caf3ee0
commit 0535912
Show file tree

Hide file tree

Showing 8 changed files with 540 additions and 541 deletions.
diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml
@@ -42,6 +42,7 @@ jobs:
         -DLLGL_BUILD_EXAMPLES=ON
         -DLLGL_BUILD_TESTS=ON
         -DLLGL_BUILD_WRAPPER_C99=ON
+        -DLLGL_ENABLE_SPIRV_REFLECT=ON
         -DLLGL_GL_ENABLE_OPENGL2X=ON
 
     - name: Build

diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
@@ -38,8 +38,8 @@ jobs:
         -DLLGL_BUILD_TESTS=ON
         -DLLGL_BUILD_WRAPPER_C99=ON
         -DLLGL_ENABLE_SPIRV_REFLECT=ON
-        "-DLLGL_D3D11_ENABLE_FEATURELEVEL=Direct3D 11.3"
         -DLLGL_GL_ENABLE_OPENGL2X=ON
+        "-DLLGL_D3D11_ENABLE_FEATURELEVEL=Direct3D 11.3"
 
     - name: Build
       run: |

diff --git a/sources/Renderer/SPIRV/SpirvInstruction.h b/sources/Renderer/SPIRV/SpirvInstruction.h
@@ -9,7 +9,7 @@
 #define LLGL_SPIRV_INSTRUCTION_H
 
 
-#include <spirv/1.2/spirv.hpp11>
+#include <spirv/1.2/spirv.hpp>
 #include <cstdint>
 
 
@@ -50,9 +50,9 @@ struct SpirvInstruction
     // Returns the operand offset after the end of the ASCII string operands beginning at the specified offset.
     std::uint32_t FindStringEndOperand(std::uint32_t firstOperand) const;
 
-    spv::Op         opcode      = spv::Op::OpNop;   // Instruction op-code. By default OpNop.
-    spv::Id         type        = 0;                // Type ID number. By default 0.
-    spv::Id         result      = 0;                // Result ID number. By default 0.
+    spv::Op         opcode      = spv::OpNop;   // Instruction op-code. By default OpNop.
+    spv::Id         type        = 0;            // Type ID number. By default 0.
+    spv::Id         result      = 0;            // Result ID number. By default 0.
     std::uint32_t   numOperands = 0;
     const spv::Id*  operands    = nullptr;
 };