glslang AST -> SPIR-V: Move to new auto-generated official headers, and for the disassembler, mirror the split done between the auto-generation header database and the specification.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@30434 e7fa87d3-cd2b-0410-9028-fcbf551c1848
diff --git a/SPIRV/spvIR.h b/SPIRV/spvIR.h
index 5bea596..585af82 100644
--- a/SPIRV/spvIR.h
+++ b/SPIRV/spvIR.h
@@ -60,14 +60,21 @@
class Function;
class Module;
+const Id NoResult = 0;
+const Id NoType = 0;
+
+const unsigned int BadValue = 0xFFFFFFFF;
+const Decoration NoPrecision = (Decoration)BadValue;
+const MemorySemanticsMask MemorySemanticsAllMemory = (MemorySemanticsMask)0x3FF;
+
//
// SPIR-V IR instruction.
//
class Instruction {
public:
- Instruction(Id resultId, Id typeId, OpCode opCode) : resultId(resultId), typeId(typeId), opCode(opCode), string(0) { }
- explicit Instruction(OpCode opCode) : resultId(NoResult), typeId(NoType), opCode(opCode), string(0) { }
+ Instruction(Id resultId, Id typeId, Op opCode) : resultId(resultId), typeId(typeId), opCode(opCode), string(0) { }
+ explicit Instruction(Op opCode) : resultId(NoResult), typeId(NoType), opCode(opCode), string(0) { }
virtual ~Instruction()
{
delete string;
@@ -103,7 +110,7 @@
originalString = str;
}
- OpCode getOpCode() const { return opCode; }
+ Op getOpCode() const { return opCode; }
int getNumOperands() const { return operands.size(); }
Id getResultId() const { return resultId; }
Id getTypeId() const { return typeId; }
@@ -143,7 +150,7 @@
Instruction(const Instruction&);
Id resultId;
Id typeId;
- OpCode opCode;
+ Op opCode;
std::vector<Id> operands;
std::vector<unsigned int>* string; // usually non-existent
std::string originalString; // could be optimized away; convenience for getting string operand
@@ -310,7 +317,7 @@
: parent(parent), functionInstruction(id, resultType, OpFunction)
{
// OpFunction
- functionInstruction.addImmediateOperand(FunctionControlNone);
+ functionInstruction.addImmediateOperand(FunctionControlMaskNone);
functionInstruction.addIdOperand(functionType);
parent.mapInstruction(&functionInstruction);
parent.addFunction(this);