From 62de186c3383feef067feb6ea578f79977910722 Mon Sep 17 00:00:00 2001 From: Arcady Goldmints-Orlov Date: Wed, 8 Nov 2023 16:54:54 -0700 Subject: [PATCH] Remove GlslangToSpv.h dependency on intermediate.h GlslangToSpv.h only declares functions with opaque references to to TIntermediate, for which a simple "class TIntermediate;" declaration is adequate. This means that Include/intermediate.h no longer needs to be installed as part of glslang's public interface. --- SPIRV/GlslangToSpv.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h index b9736d7c98..55a30deaed 100644 --- a/SPIRV/GlslangToSpv.h +++ b/SPIRV/GlslangToSpv.h @@ -35,12 +35,7 @@ #pragma once -#if defined(_MSC_VER) && _MSC_VER >= 1900 - #pragma warning(disable : 4464) // relative include path contains '..' -#endif - #include "SpvTools.h" -#include "glslang/Include/intermediate.h" #include #include @@ -48,6 +43,7 @@ #include "Logger.h" namespace glslang { +class TIntermediate; void GetSpirvVersion(std::string&); int GetSpirvGeneratorVersion();