Use SPIR-V headers from "unified1" directory

diff --git a/source/latest_version_glsl_std_450_header.h b/source/latest_version_glsl_std_450_header.h
index 3fbddb8..b9e9ae2 100644 (file)
--- a/source/latest_version_glsl_std_450_header.h
+++ b/source/latest_version_glsl_std_450_header.h
@@ -15,6 +15,6 @@
 #ifndef LIBSPIRV_LATEST_VERSION_GLSL_STD_450_HEADER_H_
 #define LIBSPIRV_LATEST_VERSION_GLSL_STD_450_HEADER_H_
 
-#include "spirv/1.2/GLSL.std.450.h"
+#include "spirv/unified1/GLSL.std.450.h"
 
 #endif  // LIBSPIRV_LATEST_VERSION_GLSL_STD_450_HEADER_H_

diff --git a/source/latest_version_opencl_std_header.h b/source/latest_version_opencl_std_header.h
index aa68f08..9bb6e50 100644 (file)
--- a/source/latest_version_opencl_std_header.h
+++ b/source/latest_version_opencl_std_header.h
@@ -15,6 +15,6 @@
 #ifndef LIBSPIRV_LATEST_VERSION_OPENCL_STD_HEADER_H_
 #define LIBSPIRV_LATEST_VERSION_OPENCL_STD_HEADER_H_
 
-#include "spirv/1.2/OpenCL.std.h"
+#include "spirv/unified1/OpenCL.std.h"
 
 #endif  // LIBSPIRV_LATEST_VERSION_OPENCL_STD_HEADER_H_

diff --git a/source/latest_version_spirv_header.h b/source/latest_version_spirv_header.h
index ea9f45c..c328b69 100644 (file)
--- a/source/latest_version_spirv_header.h
+++ b/source/latest_version_spirv_header.h
@@ -15,6 +15,6 @@
 #ifndef LIBSPIRV_LATEST_VERSION_SPIRV_HEADER_H_
 #define LIBSPIRV_LATEST_VERSION_SPIRV_HEADER_H_
 
-#include "spirv/1.2/spirv.h"
+#include "spirv/unified1/spirv.h"
 
 #endif  // LIBSPIRV_LATEST_VERSION_SPIRV_HEADER_H_

diff --git a/source/opt/insert_extract_elim.cpp b/source/opt/insert_extract_elim.cpp
index 152c07a..d56ca19 100644 (file)
--- a/source/opt/insert_extract_elim.cpp
+++ b/source/opt/insert_extract_elim.cpp
@@ -19,7 +19,7 @@
 #include "composite.h"
 #include "ir_context.h"
 #include "iterator.h"
-#include "spirv/1.2/GLSL.std.450.h"
+#include "latest_version_glsl_std_450_header.h"
 
 #include <vector>
 

diff --git a/source/opt/ir_context.cpp b/source/opt/ir_context.cpp
index e3d6497..9285e3f 100644 (file)
--- a/source/opt/ir_context.cpp
+++ b/source/opt/ir_context.cpp
@@ -17,7 +17,6 @@
 #include "log.h"
 #include "mem_pass.h"
 #include "reflect.h"
-#include "spirv/1.0/GLSL.std.450.h"
 
 #include <cstring>