commit 2598bc7a5b41c2cd3679f532040631ba051abc67
author Greg Fischer <greg@lunarg.com> Tue Oct 19 11:20:42 2021 -0600
committer GitHub <noreply@github.com> Tue Oct 19 11:20:42 2021 -0600
tree 233cf69e440cf88abd6050266a1fec1783ec0735
parent 7f1d926a3a397f1d16bd1c36d2b35ba86891081c
parent dd097e5adb500785dc45bb6c7dcbb3eee4e269ca

Merge pull request #2783 from chrisforbes/untangle

Untangle use of core glslang version enums in SpvPostProcess

SPIRV/SpvPostProcess.cpp

diff --git a/SPIRV/SpvPostProcess.cpp b/SPIRV/SpvPostProcess.cpp
index 23d7b5a..d283feb 100644
--- a/SPIRV/SpvPostProcess.cpp
+++ b/SPIRV/SpvPostProcess.cpp
@@ -44,10 +44,8 @@
 #include <algorithm>
 
 #include "SpvBuilder.h"
-
 #include "spirv.hpp"
-#include "GlslangToSpv.h"
-#include "SpvBuilder.h"
+
 namespace spv {
     #include "GLSL.std.450.h"
     #include "GLSL.ext.KHR.h"
@@ -161,13 +159,13 @@
         switch (inst.getImmediateOperand(1)) {
         case GLSLstd450Frexp:
         case GLSLstd450FrexpStruct:
-            if (getSpvVersion() < glslang::EShTargetSpv_1_3 && containsType(typeId, OpTypeInt, 16))
+            if (getSpvVersion() < spv::Spv_1_3 && containsType(typeId, OpTypeInt, 16))
                 addExtension(spv::E_SPV_AMD_gpu_shader_int16);
             break;
         case GLSLstd450InterpolateAtCentroid:
         case GLSLstd450InterpolateAtSample:
         case GLSLstd450InterpolateAtOffset:
-            if (getSpvVersion() < glslang::EShTargetSpv_1_3 && containsType(typeId, OpTypeFloat, 16))
+            if (getSpvVersion() < spv::Spv_1_3 && containsType(typeId, OpTypeFloat, 16))
                 addExtension(spv::E_SPV_AMD_gpu_shader_half_float);
             break;
         default: