From 78258d3d4030044a89d56ae2c77455da47d507c8 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Wed, 19 Aug 2015 17:30:12 -0600
Subject: [PATCH] Fix misspelled EOpFrexp and EOpLdexp.
---
SPIRV/GlslangToSpv.cpp | 4 ++--
glslang/Include/intermediate.h | 4 ++--
glslang/MachineIndependent/Initialize.cpp | 4 ++--
glslang/MachineIndependent/intermOut.cpp | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 045b85644..489fe8fe7 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -1008,8 +1008,8 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
break;
case glslang::EOpFma:
- case glslang::EFrexp:
- case glslang::ELdexp:
+ case glslang::EOpFrexp:
+ case glslang::EOpLdexp:
spv::MissingFunctionality("fma/frexp/ldexp aggregate");
break;
diff --git a/glslang/Include/intermediate.h b/glslang/Include/intermediate.h
index 35092967c..103f0df36 100644
--- a/glslang/Include/intermediate.h
+++ b/glslang/Include/intermediate.h
@@ -187,8 +187,8 @@ enum TOperator {
EOpFma,
- EFrexp,
- ELdexp,
+ EOpFrexp,
+ EOpLdexp,
EOpFloatBitsToInt,
EOpFloatBitsToUint,
diff --git a/glslang/MachineIndependent/Initialize.cpp b/glslang/MachineIndependent/Initialize.cpp
index 31fdae0dd..0ea99f0c5 100644
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -3219,8 +3219,8 @@ void IdentifyBuiltIns(int version, EProfile profile, EShLanguage language, TSymb
symbolTable.relateToOperator("atomicCounter", EOpAtomicCounter);
symbolTable.relateToOperator("fma", EOpFma);
- symbolTable.relateToOperator("frexp", EFrexp);
- symbolTable.relateToOperator("ldexp", ELdexp);
+ symbolTable.relateToOperator("frexp", EOpFrexp);
+ symbolTable.relateToOperator("ldexp", EOpLdexp);
symbolTable.relateToOperator("uaddCarry", EOpAddCarry);
symbolTable.relateToOperator("usubBorrow", EOpSubBorrow);
symbolTable.relateToOperator("umulExtended", EOpUMulExtended);
diff --git a/glslang/MachineIndependent/intermOut.cpp b/glslang/MachineIndependent/intermOut.cpp
index 156557ded..5c302b979 100644
--- a/glslang/MachineIndependent/intermOut.cpp
+++ b/glslang/MachineIndependent/intermOut.cpp
@@ -473,8 +473,8 @@ bool TOutputTraverser::visitAggregate(TVisit /* visit */, TIntermAggregate* node
case EOpBitfieldInsert: out.debug << "bitfieldInsert"; break;
case EOpFma: out.debug << "fma"; break;
- case EFrexp: out.debug << "frexp"; break;
- case ELdexp: out.debug << "ldexp"; break;
+ case EOpFrexp: out.debug << "frexp"; break;
+ case EOpLdexp: out.debug << "ldexp"; break;
default: out.debug.message(EPrefixError, "Bad aggregation op");
}
--
GitLab