Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1287 from billhollings/spvx-integration

Browse Source 
Remove project qualifiers from references to SPIRV-Cross and glslang header files.
This commit is contained in:
Bill Hollings 2021-03-02 14:56:24 -05:00 committed by GitHub
commit 4cd8532540
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Docs/Whats_New.md
View File

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

2
MoltenVK/MoltenVK.xcodeproj/project.pbxproj
View File

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

2
MoltenVK/MoltenVK/GPUObjects/MVKPixelFormats.h
View File

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

2
MoltenVKShaderConverter/Common/SPIRVSupport.cpp
View File

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

2
MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
View File

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

8
MoltenVKShaderConverter/MoltenVKShaderConverter/SPIRVReflection.h
View File

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

4
MoltenVKShaderConverter/MoltenVKShaderConverter/SPIRVToMSLConverter.h
View File

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