From c8495106bf56fb10f0c8b32cd4c98fc05d8a4619 Mon Sep 17 00:00:00 2001
From: Eugene Golushkov <e.golushkov@nospam_gmail.com>
Date: Tue, 24 Dec 2024 13:42:23 +0100
Subject: [PATCH] [Vk] We have C++11 now, let not risk ODR violation

---
 .../Vulkan/src/OgreVulkanProgram.cpp          | 36 +------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/RenderSystems/Vulkan/src/OgreVulkanProgram.cpp b/RenderSystems/Vulkan/src/OgreVulkanProgram.cpp
index a205e278b1..0640a4939f 100644
--- a/RenderSystems/Vulkan/src/OgreVulkanProgram.cpp
+++ b/RenderSystems/Vulkan/src/OgreVulkanProgram.cpp
@@ -51,41 +51,7 @@ THE SOFTWARE.
 #if defined( __GNUC__ ) && !defined( __clang__ )
 #    pragma GCC diagnostic pop
 #endif
-#include "glslang/SPIRV/Logger.h"
-
-// Inclusion of SPIRV headers triggers lots of C++11 errors we don't care
-namespace glslang
-{
-    struct SpvOptions
-    {
-        SpvOptions() :
-            generateDebugInfo( false ),
-            stripDebugInfo( false ),
-            disableOptimizer( true ),
-            optimizeSize( false ),
-            disassemble( false ),
-            validate( false )
-        {
-        }
-        bool generateDebugInfo;
-        bool stripDebugInfo;
-        bool disableOptimizer;
-        bool optimizeSize;
-        bool disassemble;
-        bool validate;
-    };
-
-    void GetSpirvVersion( std::string & );
-    int GetSpirvGeneratorVersion();
-    void GlslangToSpv( const glslang::TIntermediate &intermediate, std::vector<unsigned int> &spirv,
-                       SpvOptions *options = 0 );
-    void GlslangToSpv( const glslang::TIntermediate &intermediate, std::vector<unsigned int> &spirv,
-                       spv::SpvBuildLogger *logger, SpvOptions *options = 0 );
-    void OutputSpvBin( const std::vector<unsigned int> &spirv, const char *baseName );
-    void OutputSpvHex( const std::vector<unsigned int> &spirv, const char *baseName,
-                       const char *varName );
-
-}  // namespace glslang
+#include "glslang/SPIRV/GlslangToSpv.h"
 
 namespace Ogre
 {