1 files changed, 6 insertions, 36 deletions

diff --git a/test/cpp_interface_test.cpp b/test/cpp_interface_test.cpp
index 222f44f6..4cab4dfd 100644
--- a/test/cpp_interface_test.cpp
+++ b/test/cpp_interface_test.cpp
@@ -19,7 +19,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "spirv-tools/optimizer.hpp"
-#include "spirv/unified1/spirv.hpp11"
+#include "spirv/1.1/spirv.h"
 
 namespace spvtools {
 namespace {
@@ -47,7 +47,7 @@ TEST(CppInterface, SuccessfulRoundTrip) {
   std::vector<uint32_t> binary;
   EXPECT_TRUE(t.Assemble(input_text, &binary));
   EXPECT_TRUE(binary.size() > 5u);
-  EXPECT_EQ(spv::MagicNumber, binary[0]);
+  EXPECT_EQ(SpvMagicNumber, binary[0]);
   EXPECT_EQ(kExpectedSpvVersion, binary[1]);
 
   // This cannot pass validation since %1 is not defined.
@@ -74,7 +74,7 @@ TEST(CppInterface, AssembleEmptyModule) {
   EXPECT_TRUE(t.Assemble("", &binary));
   // We only have the header.
   EXPECT_EQ(5u, binary.size());
-  EXPECT_EQ(spv::MagicNumber, binary[0]);
+  EXPECT_EQ(SpvMagicNumber, binary[0]);
   EXPECT_EQ(kExpectedSpvVersion, binary[1]);
 }
 
@@ -85,21 +85,21 @@ TEST(CppInterface, AssembleOverloads) {
     std::vector<uint32_t> binary;
     EXPECT_TRUE(t.Assemble(input_text, &binary));
     EXPECT_TRUE(binary.size() > 5u);
-    EXPECT_EQ(spv::MagicNumber, binary[0]);
+    EXPECT_EQ(SpvMagicNumber, binary[0]);
     EXPECT_EQ(kExpectedSpvVersion, binary[1]);
   }
   {
     std::vector<uint32_t> binary;
     EXPECT_TRUE(t.Assemble(input_text.data(), input_text.size(), &binary));
     EXPECT_TRUE(binary.size() > 5u);
-    EXPECT_EQ(spv::MagicNumber, binary[0]);
+    EXPECT_EQ(SpvMagicNumber, binary[0]);
     EXPECT_EQ(kExpectedSpvVersion, binary[1]);
   }
   {  // Ignore the last newline.
     std::vector<uint32_t> binary;
     EXPECT_TRUE(t.Assemble(input_text.data(), input_text.size() - 1, &binary));
     EXPECT_TRUE(binary.size() > 5u);
-    EXPECT_EQ(spv::MagicNumber, binary[0]);
+    EXPECT_EQ(SpvMagicNumber, binary[0]);
     EXPECT_EQ(kExpectedSpvVersion, binary[1]);
   }
 }
@@ -322,36 +322,6 @@ TEST(CppInterface, OptimizeSameAddressForOriginalOptimizedBinary) {
   EXPECT_EQ(Header(), optimized_text);
 }
 
-TEST(SpirvHeadersCpp, BitwiseOrMemoryAccessMask) {
-  EXPECT_EQ(spv::MemoryAccessMask(6), spv::MemoryAccessMask::Aligned |
-                                          spv::MemoryAccessMask::Nontemporal);
-}
-
-TEST(SpirvHeadersCpp, BitwiseAndMemoryAccessMask) {
-  EXPECT_EQ(spv::MemoryAccessMask::Aligned,
-            spv::MemoryAccessMask::Aligned & spv::MemoryAccessMask(6));
-  EXPECT_EQ(spv::MemoryAccessMask::Nontemporal,
-            spv::MemoryAccessMask::Nontemporal & spv::MemoryAccessMask(6));
-  EXPECT_EQ(spv::MemoryAccessMask(0), spv::MemoryAccessMask::Nontemporal &
-                                          spv::MemoryAccessMask::Aligned);
-}
-
-TEST(SpirvHeadersCpp, BitwiseXorMemoryAccessMask) {
-  EXPECT_EQ(spv::MemoryAccessMask::Nontemporal,
-            spv::MemoryAccessMask::Aligned ^ spv::MemoryAccessMask(6));
-  EXPECT_EQ(spv::MemoryAccessMask::Aligned,
-            spv::MemoryAccessMask::Nontemporal ^ spv::MemoryAccessMask(6));
-  EXPECT_EQ(spv::MemoryAccessMask(6), spv::MemoryAccessMask::Nontemporal ^
-                                          spv::MemoryAccessMask::Aligned);
-  EXPECT_EQ(spv::MemoryAccessMask(0), spv::MemoryAccessMask::Nontemporal ^
-                                          spv::MemoryAccessMask::Nontemporal);
-}
-
-TEST(SpirvHeadersCpp, BitwiseNegateMemoryAccessMask) {
-  EXPECT_EQ(spv::MemoryAccessMask(~(uint32_t(4))),
-            ~spv::MemoryAccessMask::Nontemporal);
-}
-
 // TODO(antiagainst): tests for SetMessageConsumer().
 
 }  // namespace