commit b36e704a4761cf42a645578bbe408135130106eb
author Lei Zhang <antiagainst@google.com> Wed Oct 28 13:40:52 2015 -0400
committer David Neto <dneto@google.com> Mon Nov 02 13:52:20 2015 -0500
tree 514ea3771c133091f38293c7bd90992bd9f4c665
parent 9f79d789ec321a6135618a3cf0945af0381a2075

Use spirv.h instead of spirv.hpp.

This is a part of the effort to make libspirv.h C-compatible.

source/binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 128d278..70b62d8 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -88,7 +88,7 @@
     // NOTE: Use specified operand entry operand type for this word
     uint16_t index = operandIndex - opcodeEntry->numTypes;
     type = (*pOperandEntry)->operandTypes[index];
-  } else if (OpSwitch == opcodeEntry->opcode) {
+  } else if (SpvOpSwitch == opcodeEntry->opcode) {
     // NOTE: OpSwitch is a special case which expects a list of paired extra
     // operands
     assert(0 &&
@@ -120,7 +120,7 @@
 ///
 /// @return result code
 spv_result_t spvBinaryDecodeOperand(
-    const Op opcode, const spv_operand_type_t type, const uint32_t *words,
+    const SpvOp opcode, const spv_operand_type_t type, const uint32_t *words,
     uint16_t numWords, const spv_endianness_t endian, const uint32_t options,
     const libspirv::AssemblyGrammar& grammar,
     spv_operand_pattern_t *pExpectedOperands, spv_ext_inst_type_t *pExtInstType,
@@ -152,7 +152,7 @@
       position->index++;
     } break;
     case SPV_OPERAND_TYPE_EXTENSION_INSTRUCTION_NUMBER: {
-      if (OpExtInst == opcode) {
+      if (SpvOpExtInst == opcode) {
         spv_ext_inst_desc extInst;
         if (grammar.lookupExtInst(*pExtInstType, words[0], &extInst)) {
           DIAGNOSTIC << "Invalid extended instruction '" << words[0] << "'.";
@@ -194,7 +194,7 @@
       uint64_t stringOperandCount = (strlen(string) / 4) + 1;
 
       // NOTE: Special case for extended instruction import
-      if (OpExtInstImport == opcode) {
+      if (SpvOpExtInstImport == opcode) {
         *pExtInstType = spvExtInstImportTypeGet(string);
         if (SPV_EXT_INST_TYPE_NONE == *pExtInstType) {
           DIAGNOSTIC << "Invalid extended instruction import'" << string
@@ -327,11 +327,11 @@
                                     spv_diagnostic* pDiagnostic) {
   libspirv::IdType detected_type = libspirv::kUnknownType;
   if (spvOpcodeIsType(pOpcodeEntry->opcode)) {
-    if (spv::OpTypeInt == pOpcodeEntry->opcode) {
+    if (SpvOpTypeInt == pOpcodeEntry->opcode) {
       detected_type.type_class = libspirv::IdTypeClass::kScalarIntegerType;
       detected_type.bitwidth = pInst->words[2];
       detected_type.isSigned = (pInst->words[3] != 0);
-    } else if (spv::OpTypeFloat == pOpcodeEntry->opcode) {
+    } else if (SpvOpTypeFloat == pOpcodeEntry->opcode) {
       detected_type.type_class = libspirv::IdTypeClass::kScalarIntegerType;
       detected_type.bitwidth = pInst->words[2];
       detected_type.isSigned = true;
@@ -389,7 +389,7 @@
   spv_position_t instructionStart = *position;
 
   uint16_t wordCount;
-  Op opcode;
+  SpvOp opcode;
   spvOpcodeSplit(spvFixWord(pInst->words[0], endian), &wordCount, &opcode);
 
   spv_opcode_desc opcodeEntry;
@@ -585,7 +585,7 @@
   while (position.index < binary.wordCount) {
     uint64_t index = position.index;
     uint16_t wordCount;
-    Op opcode;
+    SpvOp opcode;
     spvOpcodeSplit(spvFixWord(words[position.index], endian), &wordCount,
                    &opcode);