ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proper OSX build fix

This commit is contained in:
Flyinghead 2019-10-05 19:44:25 +03:00
parent bbab62810a
commit fc752e6efb
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/rend/vulkan/shaders.cpp
View File

@ -351,6 +351,15 @@ static const TBuiltInResource DefaultTBuiltInResource = {
/* .MaxCullDistances = */ 8,
/* .MaxCombinedClipAndCullDistances = */ 8,
/* .MaxSamples = */ 4,
/* .maxMeshOutputVerticesNV = */ 256,
/* .maxMeshOutputPrimitivesNV = */ 512,
/* .maxMeshWorkGroupSizeX_NV = */ 32,
/* .maxMeshWorkGroupSizeY_NV = */ 1,
/* .maxMeshWorkGroupSizeZ_NV = */ 1,
/* .maxTaskWorkGroupSizeX_NV = */ 32,
/* .maxTaskWorkGroupSizeY_NV = */ 1,
/* .maxTaskWorkGroupSizeZ_NV = */ 1,
/* .maxMeshViewCountNV = */ 4,
/* .limits = */ {
/* .nonInductiveForLoops = */ true,
@ -374,7 +383,6 @@ static EShLanguage translateShaderStage(vk::ShaderStageFlagBits stage)
case vk::ShaderStageFlagBits::eGeometry: return EShLangGeometry;
case vk::ShaderStageFlagBits::eFragment: return EShLangFragment;
case vk::ShaderStageFlagBits::eCompute: return EShLangCompute;
/*
case vk::ShaderStageFlagBits::eRaygenNV: return EShLangRayGenNV;
case vk::ShaderStageFlagBits::eAnyHitNV: return EShLangAnyHitNV;
case vk::ShaderStageFlagBits::eClosestHitNV: return EShLangClosestHitNV;
@ -383,7 +391,7 @@ static EShLanguage translateShaderStage(vk::ShaderStageFlagBits stage)
case vk::ShaderStageFlagBits::eCallableNV: return EShLangCallableNV;
case vk::ShaderStageFlagBits::eTaskNV: return EShLangTaskNV;
case vk::ShaderStageFlagBits::eMeshNV: return EShLangMeshNV;
*/
default:
die("Unknown shader stage");
return EShLangVertex;

4
shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
View File

@ -3156,6 +3156,7 @@
../../../core/deps/libpng,
../../../core/deps/xxhash,
../../../core/deps/zlib,
../../../core/deps/glslang,
/usr/local/include,
);
INFOPLIST_FILE = "emulator-osx/Info.plist";
@ -3199,6 +3200,7 @@
../../../core/deps/libpng,
../../../core/deps/xxhash,
../../../core/deps/zlib,
../../../core/deps/glslang,
/usr/local/include,
);
INFOPLIST_FILE = "emulator-osx/Info.plist";
@ -3337,6 +3339,7 @@
../../../core/deps/libpng,
../../../core/deps/xxhash,
../../../core/deps/zlib,
../../../core/deps/glslang,
/usr/local/include,
);
INFOPLIST_FILE = "emulator-osx/Info.plist";
@ -3453,6 +3456,7 @@
../../../core/deps/libpng,
../../../core/deps/xxhash,
../../../core/deps/zlib,
../../../core/deps/glslang,
/usr/local/include,
);
INFOPLIST_FILE = "emulator-osx/Info.plist";