From 4eea6a3ca8613dd660c5d6fdc17411d0b95e5a27 Mon Sep 17 00:00:00 2001
From: GregF <greg@LunarG.com>
Date: Tue, 21 Jul 2015 17:22:50 -0600
Subject: layers: port ShaderChecker to SPIR-V v31 (from ChrisF)

---
 layers/shader_checker.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'layers/shader_checker.cpp')

diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index de83b909..e3f822c1 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -43,7 +43,7 @@
 #include "vk_loader_platform.h"
 #include "vk_layer_extension_utils.h"
 
-#include "spirv/spirv.h"
+#include "spirv/spirv.hpp"
 
 
 typedef struct _layer_data {
@@ -105,8 +105,9 @@ build_type_def_index(std::vector<unsigned> const &words, std::unordered_map<unsi
         case spv::OpTypeFloat:
         case spv::OpTypeVector:
         case spv::OpTypeMatrix:
+        case spv::OpTypeImage:
         case spv::OpTypeSampler:
-        case spv::OpTypeFilter:
+        case spv::OpTypeSampledImage:
         case spv::OpTypeArray:
         case spv::OpTypeRuntimeArray:
         case spv::OpTypeStruct:
@@ -296,8 +297,8 @@ storage_class_name(unsigned sc)
     case spv::StorageClassPrivateGlobal: return "private global";
     case spv::StorageClassFunction: return "function";
     case spv::StorageClassGeneric: return "generic";
-    case spv::StorageClassPrivate: return "private";
     case spv::StorageClassAtomicCounter: return "atomic counter";
+    case spv::StorageClassImage: return "image";
     default: return "unknown";
     }
 }
-- 
cgit v1.2.3