Merge pull request #1287 from billhollings/spvx-integration

Remove project qualifiers from references to SPIRV-Cross and glslang header files.

Docs/Whats_New.md

@@ -18,6 +18,7 @@ MoltenVK 1.1.3
 
 Released TBD
 
+- Remove project qualifiers from references to `SPIRV-Cross` header files.
 - Add `MVKConfiguration::apiVersionToAdvertise` and `MVK_CONFIG_API_VERSION_TO_ADVERTISE` 
   env var to configure **MoltenVK** to advertise a particular _Vulkan_ version.
 - Add `MVKConfiguration::advertiseExtensions` and `MVK_CONFIG_ADVERTISE_EXTENSIONS` 

MoltenVK/MoltenVK.xcodeproj/project.pbxproj

@@ -1580,6 +1580,7 @@
 				HEADER_SEARCH_PATHS = (
 					"\"$(SRCROOT)/include\"",
 					"\"$(SRCROOT)/../MoltenVKShaderConverter\"",
+					"\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"",
 					"\"$(SRCROOT)/../External/cereal/include\"",
 					"\"${BUILT_PRODUCTS_DIR}\"",
 				);
@@ -1646,6 +1647,7 @@
 				HEADER_SEARCH_PATHS = (
 					"\"$(SRCROOT)/include\"",
 					"\"$(SRCROOT)/../MoltenVKShaderConverter\"",
+					"\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"",
 					"\"$(SRCROOT)/../External/cereal/include\"",
 					"\"${BUILT_PRODUCTS_DIR}\"",
 				);

MoltenVK/MoltenVK/GPUObjects/MVKPixelFormats.h

@@ -22,7 +22,7 @@
 #include "MVKEnvironment.h"
 #include "MVKOSExtensions.h"
 #include "MVKBaseObject.h"
-#include <SPIRV-Cross/spirv_msl.hpp>
+#include <spirv_msl.hpp>
 #include <unordered_map>
 
 #import <Metal/Metal.h>

MoltenVKShaderConverter/Common/SPIRVSupport.cpp

@@ -18,7 +18,7 @@
 
 #include "SPIRVSupport.h"
 #include "MVKStrings.h"
-#include <SPIRV-Cross/spirv.hpp>
+#include <spirv.hpp>
 #include <ostream>
 
 #import <CoreFoundation/CFByteOrder.h>

MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj

@@ -626,6 +626,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
+					"\"$(SRCROOT)/SPIRV-Cross\"",
 					"\"$(SRCROOT)/glslang\"",
 					"\"$(SRCROOT)/glslang/External/spirv-tools/include\"",
 				);
@@ -681,6 +682,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
+					"\"$(SRCROOT)/SPIRV-Cross\"",
 					"\"$(SRCROOT)/glslang\"",
 					"\"$(SRCROOT)/glslang/External/spirv-tools/include\"",
 				);

MoltenVKShaderConverter/MoltenVKShaderConverter/SPIRVReflection.h

@@ -19,10 +19,10 @@
 #ifndef __SPIRVReflection_h_
 #define __SPIRVReflection_h_ 1
 
-#include <SPIRV-Cross/spirv.hpp>
-#include <SPIRV-Cross/spirv_common.hpp>
-#include <SPIRV-Cross/spirv_parser.hpp>
-#include <SPIRV-Cross/spirv_reflect.hpp>
+#include <spirv.hpp>
+#include <spirv_common.hpp>
+#include <spirv_parser.hpp>
+#include <spirv_reflect.hpp>
 #include <string>
 #include <vector>
 

MoltenVKShaderConverter/MoltenVKShaderConverter/SPIRVToMSLConverter.h

@@ -19,8 +19,8 @@
 #ifndef __SPIRVToMSLConverter_h_
 #define __SPIRVToMSLConverter_h_ 1
 
-#include <SPIRV-Cross/spirv.hpp>
-#include <SPIRV-Cross/spirv_msl.hpp>
+#include <spirv.hpp>
+#include <spirv_msl.hpp>
 #include <string>
 #include <vector>
 #include <unordered_map>