Merge pull request #149 from billhollings/master
Add features to support Vulkan CTS.
This commit is contained in:
Bill Hollings
GitHub
commit
6088fa88f0
@ -152,12 +152,17 @@ If you make changes to the `SPIRV-Cross` repository, you can regression test you
|
||||
|
||||
cd External/SPIRV-Cross
|
||||
./checkout_glslang_spirv_tools.sh
|
||||
./build_glslang_spirv_tools.sh
|
||||
|
||||
2. Run the regression tests:
|
||||
2. Build `SPIRV-Cross`:
|
||||
|
||||
make
|
||||
|
||||
3. Run the regression tests:
|
||||
|
||||
./test_shaders.sh
|
||||
|
||||
3. If your changes result in different expected output for a reference shader, and the new results
|
||||
4. If your changes result in different expected output for a reference shader, and the new results
|
||||
are correct, you can update the reference shader for a particular regression test by deleting
|
||||
that reference shader, in either `External/SPIRV-Cross/reference/shaders-msl` or
|
||||
`External/SPIRV-Cross/reference/opt/shaders-msl`, and running the test again. The test will
|
||||
|
||||
@ -1 +1 @@
|
||||
7796a9f3ec94733830ad8c648157a3b1c5693e34
|
||||
2792f8f3f2ce5cf970ef1cb7ab144445a4f1f6f8
|
||||
|
||||
@ -7,18 +7,16 @@
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
4044125A2090BA4F00715344 /* MTLTextureDescriptor+MoltenVK.h in Headers */ = {isa = PBXBuildFile; fileRef = 404412582090BA4F00715344 /* MTLTextureDescriptor+MoltenVK.h */; };
|
||||
4044125B2090BA4F00715344 /* MTLTextureDescriptor+MoltenVK.m in Sources */ = {isa = PBXBuildFile; fileRef = 404412592090BA4F00715344 /* MTLTextureDescriptor+MoltenVK.m */; };
|
||||
404412612090BAB500715344 /* MTLSamplerDescriptor+MoltenVK.h in Headers */ = {isa = PBXBuildFile; fileRef = 4044125F2090BAB500715344 /* MTLSamplerDescriptor+MoltenVK.h */; };
|
||||
404412622090BAB500715344 /* MTLSamplerDescriptor+MoltenVK.m in Sources */ = {isa = PBXBuildFile; fileRef = 404412602090BAB500715344 /* MTLSamplerDescriptor+MoltenVK.m */; };
|
||||
404412652090BB1600715344 /* CAMetalLayer+MoltenVK.h in Headers */ = {isa = PBXBuildFile; fileRef = 404412632090BB1600715344 /* CAMetalLayer+MoltenVK.h */; };
|
||||
404412662090BB1600715344 /* CAMetalLayer+MoltenVK.m in Sources */ = {isa = PBXBuildFile; fileRef = 404412642090BB1600715344 /* CAMetalLayer+MoltenVK.m */; };
|
||||
A9096E5E1F81E16300DFBEA6 /* MVKCmdDispatch.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9096E5D1F81E16300DFBEA6 /* MVKCmdDispatch.mm */; };
|
||||
A9096E5F1F81E16300DFBEA6 /* MVKCmdDispatch.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9096E5D1F81E16300DFBEA6 /* MVKCmdDispatch.mm */; };
|
||||
A90C8DEA1F45354D009CB32C /* MVKCommandEncodingPool.h in Headers */ = {isa = PBXBuildFile; fileRef = A90C8DE81F45354D009CB32C /* MVKCommandEncodingPool.h */; };
|
||||
A90C8DEB1F45354D009CB32C /* MVKCommandEncodingPool.h in Headers */ = {isa = PBXBuildFile; fileRef = A90C8DE81F45354D009CB32C /* MVKCommandEncodingPool.h */; };
|
||||
A90C8DEC1F45354D009CB32C /* MVKCommandEncodingPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = A90C8DE91F45354D009CB32C /* MVKCommandEncodingPool.mm */; };
|
||||
A90C8DED1F45354D009CB32C /* MVKCommandEncodingPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = A90C8DE91F45354D009CB32C /* MVKCommandEncodingPool.mm */; };
|
||||
A92CAF392098166B009DA08E /* NSString+MoltenVK.h in Headers */ = {isa = PBXBuildFile; fileRef = A92CAF342098166A009DA08E /* NSString+MoltenVK.h */; };
|
||||
A92CAF3A2098166B009DA08E /* NSString+MoltenVK.h in Headers */ = {isa = PBXBuildFile; fileRef = A92CAF342098166A009DA08E /* NSString+MoltenVK.h */; };
|
||||
A92CAF3B2098166B009DA08E /* NSString+MoltenVK.mm in Sources */ = {isa = PBXBuildFile; fileRef = A92CAF382098166B009DA08E /* NSString+MoltenVK.mm */; };
|
||||
A92CAF3C2098166B009DA08E /* NSString+MoltenVK.mm in Sources */ = {isa = PBXBuildFile; fileRef = A92CAF382098166B009DA08E /* NSString+MoltenVK.mm */; };
|
||||
A948BB7F1E51642700DE59F2 /* mvk_vulkan.h in Headers */ = {isa = PBXBuildFile; fileRef = A948BB7E1E51642700DE59F2 /* mvk_vulkan.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
A948BB801E51642700DE59F2 /* mvk_vulkan.h in Headers */ = {isa = PBXBuildFile; fileRef = A948BB7E1E51642700DE59F2 /* mvk_vulkan.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
A94FB7B01C7DFB4800632CA3 /* mvk_datatypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A94FB7671C7DFB4800632CA3 /* mvk_datatypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
@ -169,6 +167,18 @@
|
||||
A981496C1FB6A998005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A981496A1FB6A998005F00B4 /* MVKStrings.h */; };
|
||||
A98149A21FB6B9E1005F00B4 /* MoltenVKSPIRVToMSLConverter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98149821FB6B566005F00B4 /* MoltenVKSPIRVToMSLConverter.framework */; };
|
||||
A98149A51FB6B9F2005F00B4 /* MoltenVKSPIRVToMSLConverter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98149841FB6B566005F00B4 /* MoltenVKSPIRVToMSLConverter.framework */; };
|
||||
A9917FF7209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.m in Sources */ = {isa = PBXBuildFile; fileRef = A9917FF1209CC588004069EB /* MTLSamplerDescriptor+MoltenVK.m */; };
|
||||
A9917FF8209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.m in Sources */ = {isa = PBXBuildFile; fileRef = A9917FF1209CC588004069EB /* MTLSamplerDescriptor+MoltenVK.m */; };
|
||||
A9917FF9209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.h in Headers */ = {isa = PBXBuildFile; fileRef = A9917FF2209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.h */; };
|
||||
A9917FFA209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.h in Headers */ = {isa = PBXBuildFile; fileRef = A9917FF2209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.h */; };
|
||||
A9917FFB209CC589004069EB /* MTLTextureDescriptor+MoltenVK.h in Headers */ = {isa = PBXBuildFile; fileRef = A9917FF3209CC589004069EB /* MTLTextureDescriptor+MoltenVK.h */; };
|
||||
A9917FFC209CC589004069EB /* MTLTextureDescriptor+MoltenVK.h in Headers */ = {isa = PBXBuildFile; fileRef = A9917FF3209CC589004069EB /* MTLTextureDescriptor+MoltenVK.h */; };
|
||||
A9917FFD209CC589004069EB /* MTLTextureDescriptor+MoltenVK.m in Sources */ = {isa = PBXBuildFile; fileRef = A9917FF4209CC589004069EB /* MTLTextureDescriptor+MoltenVK.m */; };
|
||||
A9917FFE209CC589004069EB /* MTLTextureDescriptor+MoltenVK.m in Sources */ = {isa = PBXBuildFile; fileRef = A9917FF4209CC589004069EB /* MTLTextureDescriptor+MoltenVK.m */; };
|
||||
A9917FFF209CC589004069EB /* CAMetalLayer+MoltenVK.h in Headers */ = {isa = PBXBuildFile; fileRef = A9917FF5209CC589004069EB /* CAMetalLayer+MoltenVK.h */; };
|
||||
A9918000209CC589004069EB /* CAMetalLayer+MoltenVK.h in Headers */ = {isa = PBXBuildFile; fileRef = A9917FF5209CC589004069EB /* CAMetalLayer+MoltenVK.h */; };
|
||||
A9918001209CC589004069EB /* CAMetalLayer+MoltenVK.m in Sources */ = {isa = PBXBuildFile; fileRef = A9917FF6209CC589004069EB /* CAMetalLayer+MoltenVK.m */; };
|
||||
A9918002209CC589004069EB /* CAMetalLayer+MoltenVK.m in Sources */ = {isa = PBXBuildFile; fileRef = A9917FF6209CC589004069EB /* CAMetalLayer+MoltenVK.m */; };
|
||||
A9C96DD01DDC20C20053187F /* MVKMTLBufferAllocation.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C96DCE1DDC20C20053187F /* MVKMTLBufferAllocation.h */; };
|
||||
A9C96DD11DDC20C20053187F /* MVKMTLBufferAllocation.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C96DCE1DDC20C20053187F /* MVKMTLBufferAllocation.h */; };
|
||||
A9C96DD21DDC20C20053187F /* MVKMTLBufferAllocation.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9C96DCF1DDC20C20053187F /* MVKMTLBufferAllocation.mm */; };
|
||||
@ -234,16 +244,12 @@
|
||||
/* End PBXContainerItemProxy section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
404412582090BA4F00715344 /* MTLTextureDescriptor+MoltenVK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MTLTextureDescriptor+MoltenVK.h"; sourceTree = "<group>"; };
|
||||
404412592090BA4F00715344 /* MTLTextureDescriptor+MoltenVK.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "MTLTextureDescriptor+MoltenVK.m"; sourceTree = "<group>"; };
|
||||
4044125F2090BAB500715344 /* MTLSamplerDescriptor+MoltenVK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MTLSamplerDescriptor+MoltenVK.h"; sourceTree = "<group>"; };
|
||||
404412602090BAB500715344 /* MTLSamplerDescriptor+MoltenVK.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "MTLSamplerDescriptor+MoltenVK.m"; sourceTree = "<group>"; };
|
||||
404412632090BB1600715344 /* CAMetalLayer+MoltenVK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CAMetalLayer+MoltenVK.h"; sourceTree = "<group>"; };
|
||||
404412642090BB1600715344 /* CAMetalLayer+MoltenVK.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CAMetalLayer+MoltenVK.m"; sourceTree = "<group>"; };
|
||||
A9096E5C1F81E16300DFBEA6 /* MVKCmdDispatch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVKCmdDispatch.h; sourceTree = "<group>"; };
|
||||
A9096E5D1F81E16300DFBEA6 /* MVKCmdDispatch.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MVKCmdDispatch.mm; sourceTree = "<group>"; };
|
||||
A90C8DE81F45354D009CB32C /* MVKCommandEncodingPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVKCommandEncodingPool.h; sourceTree = "<group>"; };
|
||||
A90C8DE91F45354D009CB32C /* MVKCommandEncodingPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MVKCommandEncodingPool.mm; sourceTree = "<group>"; };
|
||||
A92CAF342098166A009DA08E /* NSString+MoltenVK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+MoltenVK.h"; sourceTree = "<group>"; };
|
||||
A92CAF382098166B009DA08E /* NSString+MoltenVK.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSString+MoltenVK.mm"; sourceTree = "<group>"; };
|
||||
A948BB7E1E51642700DE59F2 /* mvk_vulkan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mvk_vulkan.h; sourceTree = "<group>"; };
|
||||
A94FB7671C7DFB4800632CA3 /* mvk_datatypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mvk_datatypes.h; sourceTree = "<group>"; };
|
||||
A94FB7691C7DFB4800632CA3 /* vk_mvk_moltenvk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vk_mvk_moltenvk.h; sourceTree = "<group>"; };
|
||||
@ -318,6 +324,12 @@
|
||||
A981494B1FB6A3F7005F00B4 /* MVKWatermarkShaderSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVKWatermarkShaderSource.h; sourceTree = "<group>"; };
|
||||
A981494C1FB6A3F7005F00B4 /* MVKWatermarkTextureContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVKWatermarkTextureContent.h; sourceTree = "<group>"; };
|
||||
A981496A1FB6A998005F00B4 /* MVKStrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVKStrings.h; sourceTree = "<group>"; };
|
||||
A9917FF1209CC588004069EB /* MTLSamplerDescriptor+MoltenVK.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MTLSamplerDescriptor+MoltenVK.m"; sourceTree = "<group>"; };
|
||||
A9917FF2209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MTLSamplerDescriptor+MoltenVK.h"; sourceTree = "<group>"; };
|
||||
A9917FF3209CC589004069EB /* MTLTextureDescriptor+MoltenVK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MTLTextureDescriptor+MoltenVK.h"; sourceTree = "<group>"; };
|
||||
A9917FF4209CC589004069EB /* MTLTextureDescriptor+MoltenVK.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MTLTextureDescriptor+MoltenVK.m"; sourceTree = "<group>"; };
|
||||
A9917FF5209CC589004069EB /* CAMetalLayer+MoltenVK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CAMetalLayer+MoltenVK.h"; sourceTree = "<group>"; };
|
||||
A9917FF6209CC589004069EB /* CAMetalLayer+MoltenVK.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CAMetalLayer+MoltenVK.m"; sourceTree = "<group>"; };
|
||||
A9AD67C72054DD6C00ED3C08 /* vulkan */ = {isa = PBXFileReference; lastKnownFileType = folder; path = vulkan; sourceTree = "<group>"; };
|
||||
A9B8EE0A1A98D796009C5A02 /* MoltenVK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MoltenVK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MoltenVKShaderConverter.xcodeproj; path = ../MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj; sourceTree = "<group>"; };
|
||||
@ -469,6 +481,12 @@
|
||||
A98149401FB6A3F7005F00B4 /* Utility */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A9917FF5209CC589004069EB /* CAMetalLayer+MoltenVK.h */,
|
||||
A9917FF6209CC589004069EB /* CAMetalLayer+MoltenVK.m */,
|
||||
A9917FF2209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.h */,
|
||||
A9917FF1209CC588004069EB /* MTLSamplerDescriptor+MoltenVK.m */,
|
||||
A9917FF3209CC589004069EB /* MTLTextureDescriptor+MoltenVK.h */,
|
||||
A9917FF4209CC589004069EB /* MTLTextureDescriptor+MoltenVK.m */,
|
||||
A98149411FB6A3F7005F00B4 /* MVKBaseObject.cpp */,
|
||||
A98149421FB6A3F7005F00B4 /* MVKBaseObject.h */,
|
||||
A98149431FB6A3F7005F00B4 /* MVKEnvironment.h */,
|
||||
@ -477,16 +495,12 @@
|
||||
A98149461FB6A3F7005F00B4 /* MVKObjectPool.h */,
|
||||
A98149471FB6A3F7005F00B4 /* MVKOSExtensions.h */,
|
||||
A98149481FB6A3F7005F00B4 /* MVKOSExtensions.mm */,
|
||||
404412582090BA4F00715344 /* MTLTextureDescriptor+MoltenVK.h */,
|
||||
404412592090BA4F00715344 /* MTLTextureDescriptor+MoltenVK.m */,
|
||||
4044125F2090BAB500715344 /* MTLSamplerDescriptor+MoltenVK.h */,
|
||||
404412602090BAB500715344 /* MTLSamplerDescriptor+MoltenVK.m */,
|
||||
404412632090BB1600715344 /* CAMetalLayer+MoltenVK.h */,
|
||||
404412642090BB1600715344 /* CAMetalLayer+MoltenVK.m */,
|
||||
A98149491FB6A3F7005F00B4 /* MVKWatermark.h */,
|
||||
A981494A1FB6A3F7005F00B4 /* MVKWatermark.mm */,
|
||||
A981494B1FB6A3F7005F00B4 /* MVKWatermarkShaderSource.h */,
|
||||
A981494C1FB6A3F7005F00B4 /* MVKWatermarkTextureContent.h */,
|
||||
A92CAF342098166A009DA08E /* NSString+MoltenVK.h */,
|
||||
A92CAF382098166B009DA08E /* NSString+MoltenVK.mm */,
|
||||
);
|
||||
path = Utility;
|
||||
sourceTree = "<group>";
|
||||
@ -562,7 +576,6 @@
|
||||
A94FB7D81C7DFB4800632CA3 /* MVKCommandPipelineStateFactoryShaderSource.h in Headers */,
|
||||
A94FB7E01C7DFB4800632CA3 /* MVKDescriptorSet.h in Headers */,
|
||||
A94FB8041C7DFB4800632CA3 /* MVKRenderPass.h in Headers */,
|
||||
404412652090BB1600715344 /* CAMetalLayer+MoltenVK.h in Headers */,
|
||||
A9F042A61FB4CF83009FCCB8 /* MVKLogging.h in Headers */,
|
||||
A94FB8001C7DFB4800632CA3 /* MVKQueue.h in Headers */,
|
||||
A94FB7EC1C7DFB4800632CA3 /* MVKFramebuffer.h in Headers */,
|
||||
@ -580,22 +593,24 @@
|
||||
A94FB7DC1C7DFB4800632CA3 /* MVKBuffer.h in Headers */,
|
||||
A9F042A41FB4CF83009FCCB8 /* MVKCommonEnvironment.h in Headers */,
|
||||
A981495D1FB6A3F7005F00B4 /* MVKWatermark.h in Headers */,
|
||||
A9917FFB209CC589004069EB /* MTLTextureDescriptor+MoltenVK.h in Headers */,
|
||||
A94FB7C41C7DFB4800632CA3 /* MVKCmdRenderPass.h in Headers */,
|
||||
A94FB7BC1C7DFB4800632CA3 /* MVKCmdPipeline.h in Headers */,
|
||||
A94FB7F81C7DFB4800632CA3 /* MVKPipeline.h in Headers */,
|
||||
A92CAF392098166B009DA08E /* NSString+MoltenVK.h in Headers */,
|
||||
A94FB7F01C7DFB4800632CA3 /* MVKImage.h in Headers */,
|
||||
A94FB7B81C7DFB4800632CA3 /* MVKCmdTransfer.h in Headers */,
|
||||
A94FB7C81C7DFB4800632CA3 /* MVKCmdDraw.h in Headers */,
|
||||
A94FB7D01C7DFB4800632CA3 /* MVKCommandBuffer.h in Headers */,
|
||||
A98149631FB6A3F7005F00B4 /* MVKWatermarkTextureContent.h in Headers */,
|
||||
A98149531FB6A3F7005F00B4 /* MVKFoundation.h in Headers */,
|
||||
A9917FF9209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.h in Headers */,
|
||||
A94FB7E81C7DFB4800632CA3 /* MVKDeviceMemory.h in Headers */,
|
||||
404412612090BAB500715344 /* MTLSamplerDescriptor+MoltenVK.h in Headers */,
|
||||
A98149591FB6A3F7005F00B4 /* MVKOSExtensions.h in Headers */,
|
||||
A9E4B7891E1D8AF10046A4CE /* MVKMTLResourceBindings.h in Headers */,
|
||||
A90C8DEA1F45354D009CB32C /* MVKCommandEncodingPool.h in Headers */,
|
||||
A94FB8081C7DFB4800632CA3 /* MVKResource.h in Headers */,
|
||||
4044125A2090BA4F00715344 /* MTLTextureDescriptor+MoltenVK.h in Headers */,
|
||||
A9917FFF209CC589004069EB /* CAMetalLayer+MoltenVK.h in Headers */,
|
||||
A981496B1FB6A998005F00B4 /* MVKStrings.h in Headers */,
|
||||
A94FB81C1C7DFB4800632CA3 /* MVKLayers.h in Headers */,
|
||||
);
|
||||
@ -634,20 +649,24 @@
|
||||
A94FB7DD1C7DFB4800632CA3 /* MVKBuffer.h in Headers */,
|
||||
A9F042A51FB4CF83009FCCB8 /* MVKCommonEnvironment.h in Headers */,
|
||||
A981495E1FB6A3F7005F00B4 /* MVKWatermark.h in Headers */,
|
||||
A9917FFC209CC589004069EB /* MTLTextureDescriptor+MoltenVK.h in Headers */,
|
||||
A94FB7C51C7DFB4800632CA3 /* MVKCmdRenderPass.h in Headers */,
|
||||
A94FB7BD1C7DFB4800632CA3 /* MVKCmdPipeline.h in Headers */,
|
||||
A94FB7F91C7DFB4800632CA3 /* MVKPipeline.h in Headers */,
|
||||
A92CAF3A2098166B009DA08E /* NSString+MoltenVK.h in Headers */,
|
||||
A94FB7F11C7DFB4800632CA3 /* MVKImage.h in Headers */,
|
||||
A94FB7B91C7DFB4800632CA3 /* MVKCmdTransfer.h in Headers */,
|
||||
A94FB7C91C7DFB4800632CA3 /* MVKCmdDraw.h in Headers */,
|
||||
A94FB7D11C7DFB4800632CA3 /* MVKCommandBuffer.h in Headers */,
|
||||
A98149641FB6A3F7005F00B4 /* MVKWatermarkTextureContent.h in Headers */,
|
||||
A98149541FB6A3F7005F00B4 /* MVKFoundation.h in Headers */,
|
||||
A9917FFA209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.h in Headers */,
|
||||
A94FB7E91C7DFB4800632CA3 /* MVKDeviceMemory.h in Headers */,
|
||||
A981495A1FB6A3F7005F00B4 /* MVKOSExtensions.h in Headers */,
|
||||
A9E4B78A1E1D8AF10046A4CE /* MVKMTLResourceBindings.h in Headers */,
|
||||
A90C8DEB1F45354D009CB32C /* MVKCommandEncodingPool.h in Headers */,
|
||||
A94FB8091C7DFB4800632CA3 /* MVKResource.h in Headers */,
|
||||
A9918000209CC589004069EB /* CAMetalLayer+MoltenVK.h in Headers */,
|
||||
A981496C1FB6A998005F00B4 /* MVKStrings.h in Headers */,
|
||||
A94FB81D1C7DFB4800632CA3 /* MVKLayers.h in Headers */,
|
||||
);
|
||||
@ -812,6 +831,7 @@
|
||||
files = (
|
||||
A94FB80A1C7DFB4800632CA3 /* MVKResource.mm in Sources */,
|
||||
A94FB7E21C7DFB4800632CA3 /* MVKDescriptorSet.mm in Sources */,
|
||||
A9917FFD209CC589004069EB /* MTLTextureDescriptor+MoltenVK.m in Sources */,
|
||||
A95870FA1C90D29F009EB096 /* MVKCommandResourceFactory.mm in Sources */,
|
||||
A90C8DEC1F45354D009CB32C /* MVKCommandEncodingPool.mm in Sources */,
|
||||
A981495F1FB6A3F7005F00B4 /* MVKWatermark.mm in Sources */,
|
||||
@ -819,13 +839,13 @@
|
||||
A94FB8321C7DFB4800632CA3 /* vulkan.mm in Sources */,
|
||||
A94FB8121C7DFB4800632CA3 /* MVKSurface.mm in Sources */,
|
||||
A94FB7FE1C7DFB4800632CA3 /* MVKQueryPool.mm in Sources */,
|
||||
404412662090BB1600715344 /* CAMetalLayer+MoltenVK.m in Sources */,
|
||||
A92CAF3B2098166B009DA08E /* NSString+MoltenVK.mm in Sources */,
|
||||
A94FB7F61C7DFB4800632CA3 /* MVKInstance.mm in Sources */,
|
||||
A94FB7EA1C7DFB4800632CA3 /* MVKDeviceMemory.mm in Sources */,
|
||||
A94FB7F21C7DFB4800632CA3 /* MVKImage.mm in Sources */,
|
||||
A94FB7D61C7DFB4800632CA3 /* MVKCommandPool.mm in Sources */,
|
||||
A9917FF7209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.m in Sources */,
|
||||
A94FB7CA1C7DFB4800632CA3 /* MVKCmdDraw.mm in Sources */,
|
||||
404412622090BAB500715344 /* MTLSamplerDescriptor+MoltenVK.m in Sources */,
|
||||
A94FB7D21C7DFB4800632CA3 /* MVKCommandBuffer.mm in Sources */,
|
||||
A94FB7C61C7DFB4800632CA3 /* MVKCmdRenderPass.mm in Sources */,
|
||||
A94FB7DE1C7DFB4800632CA3 /* MVKBuffer.mm in Sources */,
|
||||
@ -848,7 +868,7 @@
|
||||
A94FB7EE1C7DFB4800632CA3 /* MVKFramebuffer.mm in Sources */,
|
||||
A9C96DD21DDC20C20053187F /* MVKMTLBufferAllocation.mm in Sources */,
|
||||
A981495B1FB6A3F7005F00B4 /* MVKOSExtensions.mm in Sources */,
|
||||
4044125B2090BA4F00715344 /* MTLTextureDescriptor+MoltenVK.m in Sources */,
|
||||
A9918001209CC589004069EB /* CAMetalLayer+MoltenVK.m in Sources */,
|
||||
A9096E5E1F81E16300DFBEA6 /* MVKCmdDispatch.mm in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@ -859,6 +879,7 @@
|
||||
files = (
|
||||
A94FB80B1C7DFB4800632CA3 /* MVKResource.mm in Sources */,
|
||||
A94FB7E31C7DFB4800632CA3 /* MVKDescriptorSet.mm in Sources */,
|
||||
A9917FFE209CC589004069EB /* MTLTextureDescriptor+MoltenVK.m in Sources */,
|
||||
A95870FB1C90D29F009EB096 /* MVKCommandResourceFactory.mm in Sources */,
|
||||
A90C8DED1F45354D009CB32C /* MVKCommandEncodingPool.mm in Sources */,
|
||||
A98149601FB6A3F7005F00B4 /* MVKWatermark.mm in Sources */,
|
||||
@ -866,10 +887,12 @@
|
||||
A94FB8331C7DFB4800632CA3 /* vulkan.mm in Sources */,
|
||||
A94FB8131C7DFB4800632CA3 /* MVKSurface.mm in Sources */,
|
||||
A94FB7FF1C7DFB4800632CA3 /* MVKQueryPool.mm in Sources */,
|
||||
A92CAF3C2098166B009DA08E /* NSString+MoltenVK.mm in Sources */,
|
||||
A94FB7F71C7DFB4800632CA3 /* MVKInstance.mm in Sources */,
|
||||
A94FB7EB1C7DFB4800632CA3 /* MVKDeviceMemory.mm in Sources */,
|
||||
A94FB7F31C7DFB4800632CA3 /* MVKImage.mm in Sources */,
|
||||
A94FB7D71C7DFB4800632CA3 /* MVKCommandPool.mm in Sources */,
|
||||
A9917FF8209CC589004069EB /* MTLSamplerDescriptor+MoltenVK.m in Sources */,
|
||||
A94FB7CB1C7DFB4800632CA3 /* MVKCmdDraw.mm in Sources */,
|
||||
A94FB7D31C7DFB4800632CA3 /* MVKCommandBuffer.mm in Sources */,
|
||||
A94FB7C71C7DFB4800632CA3 /* MVKCmdRenderPass.mm in Sources */,
|
||||
@ -893,6 +916,7 @@
|
||||
A94FB7EF1C7DFB4800632CA3 /* MVKFramebuffer.mm in Sources */,
|
||||
A9C96DD31DDC20C20053187F /* MVKMTLBufferAllocation.mm in Sources */,
|
||||
A981495C1FB6A3F7005F00B4 /* MVKOSExtensions.mm in Sources */,
|
||||
A9918002209CC589004069EB /* CAMetalLayer+MoltenVK.m in Sources */,
|
||||
A9096E5F1F81E16300DFBEA6 /* MVKCmdDispatch.mm in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
||||
@ -45,9 +45,14 @@ extern "C" {
|
||||
/** Enumerates the data type of a format. */
|
||||
typedef enum {
|
||||
kMVKFormatNone, /**< Format type is unknown. */
|
||||
kMVKFormatColorFloat, /**< A floating point color. */
|
||||
kMVKFormatColorInt, /**< A signed integer color. */
|
||||
kMVKFormatColorUInt, /**< An unsigned integer color. */
|
||||
kMVKFormatColorHalf, /**< A 16-bit floating point color. */
|
||||
kMVKFormatColorFloat, /**< A 32-bit floating point color. */
|
||||
kMVKFormatColorInt8, /**< A signed 8-bit integer color. */
|
||||
kMVKFormatColorUInt8, /**< An unsigned 8-bit integer color. */
|
||||
kMVKFormatColorInt16, /**< A signed 16-bit integer color. */
|
||||
kMVKFormatColorUInt16, /**< An unsigned 16-bit integer color. */
|
||||
kMVKFormatColorInt32, /**< A signed 32-bit integer color. */
|
||||
kMVKFormatColorUInt32, /**< An unsigned 32-bit integer color. */
|
||||
kMVKFormatDepthStencil, /**< A depth and stencil value. */
|
||||
} MVKFormatType;
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@ extern "C" {
|
||||
*/
|
||||
#define MVK_VERSION_MAJOR 1
|
||||
#define MVK_VERSION_MINOR 0
|
||||
#define MVK_VERSION_PATCH 4
|
||||
#define MVK_VERSION_PATCH 5
|
||||
|
||||
#define MVK_MAKE_VERSION(major, minor, patch) (((major) * 10000) + ((minor) * 100) + (patch))
|
||||
#define MVK_VERSION MVK_MAKE_VERSION(MVK_VERSION_MAJOR, MVK_VERSION_MINOR, MVK_VERSION_PATCH)
|
||||
|
||||
@ -199,13 +199,13 @@ void mvkCmdDrawIndexed(MVKCommandBuffer* cmdBuff,
|
||||
void mvkCmdDrawIndirect(MVKCommandBuffer* cmdBuff,
|
||||
VkBuffer buffer,
|
||||
VkDeviceSize offset,
|
||||
uint32_t count,
|
||||
uint32_t drawCount,
|
||||
uint32_t stride);
|
||||
|
||||
/** Adds an indirect indexed draw command to the specified command buffer. */
|
||||
void mvkCmdDrawIndexedIndirect(MVKCommandBuffer* cmdBuff,
|
||||
VkBuffer buffer,
|
||||
VkDeviceSize offset,
|
||||
uint32_t count,
|
||||
uint32_t drawCount,
|
||||
uint32_t stride);
|
||||
|
||||
|
||||
@ -174,13 +174,13 @@ MVKCmdDrawIndexed::MVKCmdDrawIndexed(MVKCommandTypePool<MVKCmdDrawIndexed>* pool
|
||||
|
||||
void MVKCmdDrawIndirect::setContent(VkBuffer buffer,
|
||||
VkDeviceSize offset,
|
||||
uint32_t count,
|
||||
uint32_t drawCount,
|
||||
uint32_t stride) {
|
||||
MVKBuffer* mvkBuffer = (MVKBuffer*)buffer;
|
||||
_mtlIndirectBuffer = mvkBuffer->getMTLBuffer();
|
||||
_mtlIndirectBufferOffset = mvkBuffer->getMTLBufferOffset() + offset;
|
||||
_mtlIndirectBufferStride = stride;
|
||||
_drawCount = count;
|
||||
_drawCount = drawCount;
|
||||
|
||||
// Validate
|
||||
clearConfigurationResult();
|
||||
@ -211,13 +211,13 @@ MVKCmdDrawIndirect::MVKCmdDrawIndirect(MVKCommandTypePool<MVKCmdDrawIndirect>* p
|
||||
|
||||
void MVKCmdDrawIndexedIndirect::setContent(VkBuffer buffer,
|
||||
VkDeviceSize offset,
|
||||
uint32_t count,
|
||||
uint32_t drawCount,
|
||||
uint32_t stride) {
|
||||
MVKBuffer* mvkBuffer = (MVKBuffer*)buffer;
|
||||
_mtlIndirectBuffer = mvkBuffer->getMTLBuffer();
|
||||
_mtlIndirectBufferOffset = mvkBuffer->getMTLBufferOffset() + offset;
|
||||
_mtlIndirectBufferStride = stride;
|
||||
_drawCount = count;
|
||||
_drawCount = drawCount;
|
||||
|
||||
// Validate
|
||||
clearConfigurationResult();
|
||||
@ -294,20 +294,20 @@ void mvkCmdBindIndexBuffer(MVKCommandBuffer* cmdBuff,
|
||||
void mvkCmdDrawIndirect(MVKCommandBuffer* cmdBuff,
|
||||
VkBuffer buffer,
|
||||
VkDeviceSize offset,
|
||||
uint32_t count,
|
||||
uint32_t drawCount,
|
||||
uint32_t stride) {
|
||||
MVKCmdDrawIndirect* cmd = cmdBuff->_commandPool->_cmdDrawIndirectPool.acquireObject();
|
||||
cmd->setContent(buffer, offset, count, stride);
|
||||
cmd->setContent(buffer, offset, drawCount, stride);
|
||||
cmdBuff->addCommand(cmd);
|
||||
}
|
||||
|
||||
void mvkCmdDrawIndexedIndirect(MVKCommandBuffer* cmdBuff,
|
||||
VkBuffer buffer,
|
||||
VkDeviceSize offset,
|
||||
uint32_t count,
|
||||
uint32_t drawCount,
|
||||
uint32_t stride) {
|
||||
MVKCmdDrawIndexedIndirect* cmd = cmdBuff->_commandPool->_cmdDrawIndexedIndirectPool.acquireObject();
|
||||
cmd->setContent(buffer, offset, count, stride);
|
||||
cmd->setContent(buffer, offset, drawCount, stride);
|
||||
cmdBuff->addCommand(cmd);
|
||||
}
|
||||
|
||||
|
||||
@ -56,156 +56,29 @@ vertex VaryingsPos vtxCmdBlitImageD(AttributesPosTex attributes [[stage_in]],
|
||||
varyings.gl_Position = float4(attributes.a_position, depth, 1.0); \n\
|
||||
return varyings; \n\
|
||||
} \n\
|
||||
\n\
|
||||
fragment float4 fragCmdBlitImageF(VaryingsPosTex varyings [[stage_in]], \n\
|
||||
texture2d<float> texture [[texture(0)]], \n\
|
||||
sampler sampler [[ sampler(0) ]]) { \n\
|
||||
return texture.sample(sampler, varyings.v_texCoord); \n\
|
||||
}; \n\
|
||||
\n\
|
||||
fragment int4 fragCmdBlitImageI(VaryingsPosTex varyings [[stage_in]], \n\
|
||||
texture2d<int> texture [[texture(0)]], \n\
|
||||
sampler sampler [[ sampler(0) ]]) { \n\
|
||||
return texture.sample(sampler, varyings.v_texCoord); \n\
|
||||
}; \n\
|
||||
\n\
|
||||
fragment uint4 fragCmdBlitImageU(VaryingsPosTex varyings [[stage_in]], \n\
|
||||
texture2d<uint> texture [[texture(0)]], \n\
|
||||
sampler sampler [[ sampler(0) ]]) { \n\
|
||||
return texture.sample(sampler, varyings.v_texCoord); \n\
|
||||
}; \n\
|
||||
\n\
|
||||
fragment float4 fragCmdBlitImageDF(VaryingsPosTex varyings [[stage_in]], \n\
|
||||
depth2d<float> texture [[texture(0)]], \n\
|
||||
sampler sampler [[ sampler(0) ]]) { \n\
|
||||
return texture.sample(sampler, varyings.v_texCoord); \n\
|
||||
}; \n\
|
||||
\n\
|
||||
fragment int4 fragCmdBlitImageDI(VaryingsPosTex varyings [[stage_in]], \n\
|
||||
depth2d<float> texture [[texture(0)]], \n\
|
||||
sampler sampler [[ sampler(0) ]]) { \n\
|
||||
return int4(texture.sample(sampler, varyings.v_texCoord)); \n\
|
||||
}; \n\
|
||||
\n\
|
||||
fragment uint4 fragCmdBlitImageDU(VaryingsPosTex varyings [[stage_in]], \n\
|
||||
depth2d<float> texture [[texture(0)]], \n\
|
||||
sampler sampler [[ sampler(0) ]]) { \n\
|
||||
return uint4(texture.sample(sampler, varyings.v_texCoord)); \n\
|
||||
}; \n\
|
||||
\n\
|
||||
typedef struct { \n\
|
||||
float4 colors[9]; \n\
|
||||
} ClearColorsIn; \n\
|
||||
\n\
|
||||
typedef struct { \n\
|
||||
float4 color0 [[color(0)]]; \n\
|
||||
float4 color1 [[color(1)]]; \n\
|
||||
float4 color2 [[color(2)]]; \n\
|
||||
float4 color3 [[color(3)]]; \n\
|
||||
float4 color4 [[color(4)]]; \n\
|
||||
float4 color5 [[color(5)]]; \n\
|
||||
float4 color6 [[color(6)]]; \n\
|
||||
float4 color7 [[color(7)]]; \n\
|
||||
} ClearColorsOutF; \n\
|
||||
\n\
|
||||
typedef struct { \n\
|
||||
int4 color0 [[color(0)]]; \n\
|
||||
int4 color1 [[color(1)]]; \n\
|
||||
int4 color2 [[color(2)]]; \n\
|
||||
int4 color3 [[color(3)]]; \n\
|
||||
int4 color4 [[color(4)]]; \n\
|
||||
int4 color5 [[color(5)]]; \n\
|
||||
int4 color6 [[color(6)]]; \n\
|
||||
int4 color7 [[color(7)]]; \n\
|
||||
} ClearColorsOutI; \n\
|
||||
\n\
|
||||
typedef struct { \n\
|
||||
uint4 color0 [[color(0)]]; \n\
|
||||
uint4 color1 [[color(1)]]; \n\
|
||||
uint4 color2 [[color(2)]]; \n\
|
||||
uint4 color3 [[color(3)]]; \n\
|
||||
uint4 color4 [[color(4)]]; \n\
|
||||
uint4 color5 [[color(5)]]; \n\
|
||||
uint4 color6 [[color(6)]]; \n\
|
||||
uint4 color7 [[color(7)]]; \n\
|
||||
} ClearColorsOutU; \n\
|
||||
\n\
|
||||
vertex VaryingsPos vtxCmdClearAttachments(AttributesPos attributes [[stage_in]], \n\
|
||||
constant ClearColorsIn& ccIn [[buffer(0)]]) { \n\
|
||||
VaryingsPos varyings; \n\
|
||||
varyings.gl_Position = float4(attributes.a_position.x, -attributes.a_position.y, ccIn.colors[8].r, 1.0); \n\
|
||||
return varyings; \n\
|
||||
} \n\
|
||||
\n\
|
||||
fragment ClearColorsOutF fragCmdClearAttachmentsF(VaryingsPos varyings [[stage_in]], \n\
|
||||
constant ClearColorsIn& ccIn [[buffer(0)]]) { \n\
|
||||
ClearColorsOutF ccOut; \n\
|
||||
ccOut.color0 = ccIn.colors[0]; \n\
|
||||
ccOut.color1 = ccIn.colors[1]; \n\
|
||||
ccOut.color2 = ccIn.colors[2]; \n\
|
||||
ccOut.color3 = ccIn.colors[3]; \n\
|
||||
ccOut.color4 = ccIn.colors[4]; \n\
|
||||
ccOut.color5 = ccIn.colors[5]; \n\
|
||||
ccOut.color6 = ccIn.colors[6]; \n\
|
||||
ccOut.color7 = ccIn.colors[7]; \n\
|
||||
return ccOut; \n\
|
||||
}; \n\
|
||||
\n\
|
||||
fragment float4 fragCmdClearAttachments0F(VaryingsPos varyings [[stage_in]], \n\
|
||||
constant ClearColorsIn& ccIn [[buffer(0)]]) { \n\
|
||||
return ccIn.colors[0]; \n\
|
||||
}; \n\
|
||||
\n\
|
||||
fragment ClearColorsOutI fragCmdClearAttachmentsI(VaryingsPos varyings [[stage_in]], \n\
|
||||
constant ClearColorsIn& ccIn [[buffer(0)]]) { \n\
|
||||
ClearColorsOutI ccOut; \n\
|
||||
ccOut.color0 = int4(ccIn.colors[0]); \n\
|
||||
ccOut.color1 = int4(ccIn.colors[1]); \n\
|
||||
ccOut.color2 = int4(ccIn.colors[2]); \n\
|
||||
ccOut.color3 = int4(ccIn.colors[3]); \n\
|
||||
ccOut.color4 = int4(ccIn.colors[4]); \n\
|
||||
ccOut.color5 = int4(ccIn.colors[5]); \n\
|
||||
ccOut.color6 = int4(ccIn.colors[6]); \n\
|
||||
ccOut.color7 = int4(ccIn.colors[7]); \n\
|
||||
return ccOut; \n\
|
||||
}; \n\
|
||||
\n\
|
||||
fragment int4 fragCmdClearAttachments0I(VaryingsPos varyings [[stage_in]], \n\
|
||||
constant ClearColorsIn& ccIn [[buffer(0)]]) { \n\
|
||||
return int4(ccIn.colors[0]); \n\
|
||||
}; \n\
|
||||
\n\
|
||||
fragment ClearColorsOutU fragCmdClearAttachmentsU(VaryingsPos varyings [[stage_in]], \n\
|
||||
constant ClearColorsIn& ccIn [[buffer(0)]]) { \n\
|
||||
ClearColorsOutU ccOut; \n\
|
||||
ccOut.color0 = uint4(ccIn.colors[0]); \n\
|
||||
ccOut.color1 = uint4(ccIn.colors[1]); \n\
|
||||
ccOut.color2 = uint4(ccIn.colors[2]); \n\
|
||||
ccOut.color3 = uint4(ccIn.colors[3]); \n\
|
||||
ccOut.color4 = uint4(ccIn.colors[4]); \n\
|
||||
ccOut.color5 = uint4(ccIn.colors[5]); \n\
|
||||
ccOut.color6 = uint4(ccIn.colors[6]); \n\
|
||||
ccOut.color7 = uint4(ccIn.colors[7]); \n\
|
||||
return ccOut; \n\
|
||||
}; \n\
|
||||
\n\
|
||||
fragment uint4 fragCmdClearAttachments0U(VaryingsPos varyings [[stage_in]], \n\
|
||||
constant ClearColorsIn& ccIn [[buffer(0)]]) { \n\
|
||||
return uint4(ccIn.colors[0]); \n\
|
||||
}; \n\
|
||||
\n\
|
||||
struct CopyInfo \n\
|
||||
{ \n\
|
||||
uint32_t SrcOffset; \n\
|
||||
uint32_t DstOffset; \n\
|
||||
uint32_t CopySize; \n\
|
||||
}; \n\
|
||||
typedef struct { \n\
|
||||
uint32_t srcOffset; \n\
|
||||
uint32_t dstOffset; \n\
|
||||
uint32_t copySize; \n\
|
||||
} CopyInfo; \n\
|
||||
\n\
|
||||
kernel void compCopyBufferBytes(device uint8_t* src [[ buffer(0) ]], \n\
|
||||
device uint8_t* dst [[ buffer(1) ]], \n\
|
||||
constant CopyInfo& info [[ buffer(2) ]]) { \n\
|
||||
for (size_t i = 0; i < info.CopySize; i++) { \n\
|
||||
dst[i + info.DstOffset] = src[i + info.SrcOffset]; \n\
|
||||
for (size_t i = 0; i < info.copySize; i++) { \n\
|
||||
dst[i + info.dstOffset] = src[i + info.srcOffset]; \n\
|
||||
} \n\
|
||||
}; \n\
|
||||
";
|
||||
|
||||
@ -50,13 +50,6 @@ typedef struct MVKRPSKeyClearAtt_t {
|
||||
|
||||
bool isEnabled(uint32_t attIdx) { return mvkIsAnyFlagEnabled(enabledFlags, bitFlag << attIdx); }
|
||||
|
||||
bool isEnabledOnly(uint32_t attIdx) {
|
||||
// Ignore depth stencil bit
|
||||
uint32_t colorFlags = enabledFlags;
|
||||
mvkDisableFlag(colorFlags, bitFlag << kMVKAttachmentFormatDepthStencilIndex);
|
||||
return mvkAreOnlyFlagsEnabled(colorFlags, bitFlag << attIdx);
|
||||
}
|
||||
|
||||
bool operator==(const MVKRPSKeyClearAtt_t& rhs) const {
|
||||
return ((enabledFlags == rhs.enabledFlags) &&
|
||||
(mtlSampleCount == rhs.mtlSampleCount) &&
|
||||
@ -288,9 +281,11 @@ public:
|
||||
|
||||
protected:
|
||||
void initMTLLibrary();
|
||||
std::string getFragFunctionSuffix(MTLPixelFormat mtlPixFmt);
|
||||
std::string getFragFunctionSuffix(MVKRPSKeyClearAtt& attKey);
|
||||
id<MTLFunction> getBlitFragFunction(MTLPixelFormat mtlPixFmt);
|
||||
id<MTLFunction> getClearFragFunction(MVKRPSKeyClearAtt& attKey);
|
||||
NSString* getMTLFormatTypeString(MTLPixelFormat mtlPixFmt);
|
||||
id<MTLFunction> getFunctionNamed(const char* funcName);
|
||||
id<MTLFunction> newMTLFunction(NSString* mslSrcCode, NSString* funcName);
|
||||
id<MTLRenderPipelineState> newMTLRenderPipelineState(MTLRenderPipelineDescriptor* plDesc);
|
||||
|
||||
id<MTLLibrary> _mtlLibrary;
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
#include "MVKCommandPipelineStateFactoryShaderSource.h"
|
||||
#include "MVKFoundation.h"
|
||||
#include "mvk_datatypes.h"
|
||||
#include "NSString+MoltenVK.h"
|
||||
#include "MVKLogging.h"
|
||||
|
||||
using namespace std;
|
||||
@ -30,19 +31,17 @@ using namespace std;
|
||||
|
||||
id<MTLRenderPipelineState> MVKCommandResourceFactory::newCmdBlitImageMTLRenderPipelineState(MTLPixelFormat mtlPixFmt) {
|
||||
bool isDepthFormat = mvkMTLPixelFormatIsDepthFormat(mtlPixFmt);
|
||||
string fragFuncSfx = getFragFunctionSuffix(mtlPixFmt);
|
||||
|
||||
MTLRenderPipelineDescriptor* plDesc = [[[MTLRenderPipelineDescriptor alloc] init] autorelease];
|
||||
plDesc.label = [NSString stringWithFormat: @"CmdBlitImage%s-%lu", fragFuncSfx.data(), (unsigned long)mtlPixFmt];
|
||||
plDesc.label = [NSString stringWithFormat: @"CmdBlitImage"];
|
||||
|
||||
plDesc.vertexFunction = getFunctionNamed(isDepthFormat ? "vtxCmdBlitImageD" : "vtxCmdBlitImage");
|
||||
plDesc.fragmentFunction = getFunctionNamed((string("fragCmdBlitImage") + fragFuncSfx).data());
|
||||
plDesc.fragmentFunction = getBlitFragFunction(mtlPixFmt);
|
||||
|
||||
if ( isDepthFormat ) {
|
||||
if (isDepthFormat) {
|
||||
plDesc.depthAttachmentPixelFormat = mtlPixFmt;
|
||||
} else {
|
||||
MTLRenderPipelineColorAttachmentDescriptor* colorDesc = plDesc.colorAttachments[0];
|
||||
colorDesc.pixelFormat = mtlPixFmt;
|
||||
plDesc.colorAttachments[0].pixelFormat = mtlPixFmt;
|
||||
}
|
||||
|
||||
MTLVertexDescriptor* vtxDesc = plDesc.vertexDescriptor;
|
||||
@ -91,12 +90,10 @@ id<MTLSamplerState> MVKCommandResourceFactory::newCmdBlitImageMTLSamplerState(MT
|
||||
}
|
||||
|
||||
id<MTLRenderPipelineState> MVKCommandResourceFactory::newCmdClearMTLRenderPipelineState(MVKRPSKeyClearAtt& attKey) {
|
||||
string fragFuncSfx = getFragFunctionSuffix(attKey);
|
||||
|
||||
MTLRenderPipelineDescriptor* plDesc = [[[MTLRenderPipelineDescriptor alloc] init] autorelease];
|
||||
plDesc.label = [NSString stringWithFormat: @"CmdClearAttachments%s", fragFuncSfx.data()];
|
||||
plDesc.label = [NSString stringWithFormat: @"CmdClearAttachments"];
|
||||
plDesc.vertexFunction = getFunctionNamed("vtxCmdClearAttachments");
|
||||
plDesc.fragmentFunction = getFunctionNamed((string("fragCmdClearAttachments") + fragFuncSfx).data());
|
||||
plDesc.fragmentFunction = getClearFragFunction(attKey);
|
||||
plDesc.sampleCount = attKey.mtlSampleCount;
|
||||
|
||||
for (uint32_t caIdx = 0; caIdx < kMVKAttachmentFormatDepthStencilIndex; caIdx++) {
|
||||
@ -133,6 +130,106 @@ id<MTLRenderPipelineState> MVKCommandResourceFactory::newCmdClearMTLRenderPipeli
|
||||
return newMTLRenderPipelineState(plDesc);
|
||||
}
|
||||
|
||||
id<MTLFunction> MVKCommandResourceFactory::getBlitFragFunction(MTLPixelFormat mtlPixFmt) {
|
||||
id<MTLFunction> mtlFunc = nil;
|
||||
bool isDepthFormat = mvkMTLPixelFormatIsDepthFormat(mtlPixFmt);
|
||||
NSString* typeStr = getMTLFormatTypeString(mtlPixFmt);
|
||||
|
||||
@autoreleasepool {
|
||||
NSMutableString* msl = [NSMutableString stringWithCapacity: (2 * KIBI) ];
|
||||
[msl appendLineMVK: @"#include <metal_stdlib>"];
|
||||
[msl appendLineMVK: @"using namespace metal;"];
|
||||
[msl appendLineMVK];
|
||||
[msl appendLineMVK: @"typedef struct {"];
|
||||
[msl appendLineMVK: @" float4 gl_Position [[position]];"];
|
||||
[msl appendLineMVK: @" float2 v_texCoord;"];
|
||||
[msl appendLineMVK: @"} VaryingsPosTex;"];
|
||||
[msl appendLineMVK];
|
||||
|
||||
NSString* funcName = @"fragBlit";
|
||||
[msl appendFormat: @"fragment %@4 %@(VaryingsPosTex varyings [[stage_in]],", typeStr, funcName];
|
||||
[msl appendLineMVK];
|
||||
if (isDepthFormat) {
|
||||
[msl appendLineMVK: @" depth2d<float> texture [[texture(0)]],"];
|
||||
} else {
|
||||
[msl appendFormat: @" texture2d<%@> texture [[texture(0)]],", typeStr];
|
||||
[msl appendLineMVK];
|
||||
}
|
||||
[msl appendLineMVK: @" sampler sampler [[ sampler(0) ]]) {"];
|
||||
if (isDepthFormat) {
|
||||
[msl appendFormat: @" return %@4(texture.sample(sampler, varyings.v_texCoord));", typeStr];
|
||||
[msl appendLineMVK];
|
||||
} else {
|
||||
[msl appendLineMVK: @" return texture.sample(sampler, varyings.v_texCoord);"];
|
||||
}
|
||||
[msl appendLineMVK: @"}"];
|
||||
|
||||
mtlFunc = newMTLFunction(msl, funcName);
|
||||
// MVKLogDebug("\n%s", msl.UTF8String);
|
||||
}
|
||||
return [mtlFunc autorelease];
|
||||
}
|
||||
|
||||
id<MTLFunction> MVKCommandResourceFactory::getClearFragFunction(MVKRPSKeyClearAtt& attKey) {
|
||||
id<MTLFunction> mtlFunc = nil;
|
||||
@autoreleasepool {
|
||||
NSMutableString* msl = [NSMutableString stringWithCapacity: (2 * KIBI) ];
|
||||
[msl appendLineMVK: @"#include <metal_stdlib>"];
|
||||
[msl appendLineMVK: @"using namespace metal;"];
|
||||
[msl appendLineMVK];
|
||||
[msl appendLineMVK: @"typedef struct {"];
|
||||
[msl appendLineMVK: @" float4 gl_Position [[position]];"];
|
||||
[msl appendLineMVK: @"} VaryingsPos;"];
|
||||
[msl appendLineMVK];
|
||||
[msl appendLineMVK: @"typedef struct {"];
|
||||
[msl appendLineMVK: @" float4 colors[9];"];
|
||||
[msl appendLineMVK: @"} ClearColorsIn;"];
|
||||
[msl appendLineMVK];
|
||||
[msl appendLineMVK: @"typedef struct {"];
|
||||
for (uint32_t caIdx = 0; caIdx < kMVKAttachmentFormatDepthStencilIndex; caIdx++) {
|
||||
if (attKey.isEnabled(caIdx)) {
|
||||
NSString* typeStr = getMTLFormatTypeString((MTLPixelFormat)attKey.attachmentMTLPixelFormats[caIdx]);
|
||||
[msl appendFormat: @" %@4 color%u [[color(%u)]];", typeStr, caIdx, caIdx];
|
||||
[msl appendLineMVK];
|
||||
}
|
||||
}
|
||||
[msl appendLineMVK: @"} ClearColorsOut;"];
|
||||
[msl appendLineMVK];
|
||||
|
||||
NSString* funcName = @"fragClear";
|
||||
[msl appendFormat: @"fragment ClearColorsOut %@(VaryingsPos varyings [[stage_in]], constant ClearColorsIn& ccIn [[buffer(0)]]) {", funcName];
|
||||
[msl appendLineMVK];
|
||||
[msl appendLineMVK: @" ClearColorsOut ccOut;"];
|
||||
for (uint32_t caIdx = 0; caIdx < kMVKAttachmentFormatDepthStencilIndex; caIdx++) {
|
||||
if (attKey.isEnabled(caIdx)) {
|
||||
NSString* typeStr = getMTLFormatTypeString((MTLPixelFormat)attKey.attachmentMTLPixelFormats[caIdx]);
|
||||
[msl appendFormat: @" ccOut.color%u = %@4(ccIn.colors[%u]);", caIdx, typeStr, caIdx];
|
||||
[msl appendLineMVK];
|
||||
}
|
||||
}
|
||||
[msl appendLineMVK: @" return ccOut;"];
|
||||
[msl appendLineMVK: @"}"];
|
||||
|
||||
mtlFunc = newMTLFunction(msl, funcName);
|
||||
// MVKLogDebug("\n%s", msl.UTF8String);
|
||||
}
|
||||
return [mtlFunc autorelease];
|
||||
}
|
||||
|
||||
NSString* MVKCommandResourceFactory::getMTLFormatTypeString(MTLPixelFormat mtlPixFmt) {
|
||||
switch (mvkFormatTypeFromMTLPixelFormat(mtlPixFmt)) {
|
||||
case kMVKFormatColorHalf: return @"half";
|
||||
case kMVKFormatColorFloat: return @"float";
|
||||
case kMVKFormatColorInt8: return @"char";
|
||||
case kMVKFormatColorUInt8: return @"uchar";
|
||||
case kMVKFormatColorInt16: return @"short";
|
||||
case kMVKFormatColorUInt16: return @"ushort";
|
||||
case kMVKFormatColorInt32: return @"int";
|
||||
case kMVKFormatColorUInt32: return @"uint";
|
||||
default: return @"unexpected_type";
|
||||
}
|
||||
}
|
||||
|
||||
id<MTLDepthStencilState> MVKCommandResourceFactory::newMTLDepthStencilState(bool useDepth, bool useStencil) {
|
||||
|
||||
MTLDepthStencilDescriptor* dsDesc = [[[MTLDepthStencilDescriptor alloc] init] autorelease];
|
||||
@ -200,22 +297,6 @@ MVKImage* MVKCommandResourceFactory::newMVKImage(MVKImageDescriptorData& imgData
|
||||
return _device->createImage(&createInfo, nullptr);
|
||||
}
|
||||
|
||||
string MVKCommandResourceFactory::getFragFunctionSuffix(MTLPixelFormat mtlPixFmt) {
|
||||
switch (mvkFormatTypeFromMTLPixelFormat(mtlPixFmt)) {
|
||||
case kMVKFormatDepthStencil: return "DS";
|
||||
case kMVKFormatColorUInt: return "U";
|
||||
case kMVKFormatColorInt: return "I";
|
||||
default: return "F";
|
||||
}
|
||||
}
|
||||
|
||||
string MVKCommandResourceFactory::getFragFunctionSuffix(MVKRPSKeyClearAtt& attKey) {
|
||||
string suffix;
|
||||
if (attKey.isEnabledOnly(0)) { suffix += "0"; }
|
||||
suffix += getFragFunctionSuffix((MTLPixelFormat)attKey.attachmentMTLPixelFormats[0]);
|
||||
return suffix;
|
||||
}
|
||||
|
||||
id<MTLFunction> MVKCommandResourceFactory::getFunctionNamed(const char* funcName) {
|
||||
uint64_t startTime = _device->getPerformanceTimestamp();
|
||||
id<MTLFunction> mtlFunc = [[_mtlLibrary newFunctionWithName: @(funcName)] autorelease];
|
||||
@ -223,6 +304,25 @@ id<MTLFunction> MVKCommandResourceFactory::getFunctionNamed(const char* funcName
|
||||
return mtlFunc;
|
||||
}
|
||||
|
||||
id<MTLFunction> MVKCommandResourceFactory::newMTLFunction(NSString* mslSrcCode, NSString* funcName) {
|
||||
uint64_t startTime = _device->getPerformanceTimestamp();
|
||||
MTLCompileOptions* shdrOpts = [[MTLCompileOptions new] autorelease];
|
||||
NSError* err = nil;
|
||||
id<MTLLibrary> mtlLib = [[getMTLDevice() newLibraryWithSource: mslSrcCode
|
||||
options: shdrOpts
|
||||
error: &err] autorelease];
|
||||
_device->addShaderCompilationEventPerformance(_device->_shaderCompilationPerformance.mslCompile, startTime);
|
||||
if (err) {
|
||||
mvkNotifyErrorWithText(VK_ERROR_INITIALIZATION_FAILED, "Could not compile support shader from MSL source:\n%s\n %s (code %li) %s", mslSrcCode.UTF8String, err.localizedDescription.UTF8String, (long)err.code, err.localizedFailureReason.UTF8String);
|
||||
return nil;
|
||||
}
|
||||
|
||||
startTime = _device->getPerformanceTimestamp();
|
||||
id<MTLFunction> mtlFunc = [mtlLib newFunctionWithName: funcName];
|
||||
_device->addShaderCompilationEventPerformance(_device->_shaderCompilationPerformance.functionRetrieval, startTime);
|
||||
return mtlFunc;
|
||||
}
|
||||
|
||||
id<MTLRenderPipelineState> MVKCommandResourceFactory::newMTLRenderPipelineState(MTLRenderPipelineDescriptor* plDesc) {
|
||||
uint64_t startTime = _device->getPerformanceTimestamp();
|
||||
NSError* err = nil;
|
||||
|
||||
@ -137,7 +137,7 @@ VkResult MVKPhysicalDevice::getImageFormatProperties(VkFormat format,
|
||||
pImageFormatProperties->maxMipLevels = mvkMipmapLevels3D(maxExt);
|
||||
pImageFormatProperties->maxArrayLayers = maxLayers;
|
||||
pImageFormatProperties->sampleCounts = _metalFeatures.supportedSampleCounts;
|
||||
pImageFormatProperties->maxResourceSize = numeric_limits<int64_t>::max();
|
||||
pImageFormatProperties->maxResourceSize = kMVKUndefinedLargeUInt64;
|
||||
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
@ -380,6 +380,7 @@ void MVKPhysicalDevice::initFeatures() {
|
||||
_features.shaderStorageImageExtendedFormats = true;
|
||||
_features.shaderClipDistance = true;
|
||||
_features.shaderInt16 = true;
|
||||
_features.multiDrawIndirect = true;
|
||||
|
||||
#if MVK_IOS
|
||||
_features.textureCompressionETC2 = true;
|
||||
@ -421,7 +422,7 @@ void MVKPhysicalDevice::initFeatures() {
|
||||
// VkBool32 sampleRateShading;
|
||||
// VkBool32 dualSrcBlend; // done
|
||||
// VkBool32 logicOp;
|
||||
// VkBool32 multiDrawIndirect;
|
||||
// VkBool32 multiDrawIndirect; // done
|
||||
// VkBool32 drawIndirectFirstInstance;
|
||||
// VkBool32 depthClamp; // done
|
||||
// VkBool32 depthBiasClamp; // done
|
||||
@ -621,31 +622,33 @@ void MVKPhysicalDevice::initProperties() {
|
||||
_properties.limits.standardSampleLocations = VK_FALSE;
|
||||
_properties.limits.strictLines = VK_FALSE;
|
||||
|
||||
_properties.limits.maxComputeWorkGroupSize[0] = _properties.limits.maxComputeWorkGroupInvocations;
|
||||
_properties.limits.maxComputeWorkGroupSize[1] = _properties.limits.maxComputeWorkGroupInvocations;
|
||||
_properties.limits.maxComputeWorkGroupSize[2] = _properties.limits.maxComputeWorkGroupInvocations;
|
||||
|
||||
|
||||
// Features with no specific limits - default to unlimited int values
|
||||
|
||||
_properties.limits.maxMemoryAllocationCount = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxSamplerAllocationCount = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxBoundDescriptorSets = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxMemoryAllocationCount = kMVKUndefinedLargeUInt32;
|
||||
_properties.limits.maxSamplerAllocationCount = kMVKUndefinedLargeUInt32;
|
||||
_properties.limits.maxBoundDescriptorSets = kMVKUndefinedLargeUInt32;
|
||||
|
||||
_properties.limits.maxComputeWorkGroupCount[0] = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxComputeWorkGroupCount[1] = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxComputeWorkGroupCount[2] = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxComputeWorkGroupCount[0] = kMVKUndefinedLargeUInt32;
|
||||
_properties.limits.maxComputeWorkGroupCount[1] = kMVKUndefinedLargeUInt32;
|
||||
_properties.limits.maxComputeWorkGroupCount[2] = kMVKUndefinedLargeUInt32;
|
||||
|
||||
_properties.limits.maxComputeWorkGroupSize[0] = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxComputeWorkGroupSize[1] = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxComputeWorkGroupSize[2] = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxDrawIndexedIndexValue = numeric_limits<uint32_t>::max() - 1;
|
||||
_properties.limits.maxDrawIndirectCount = kMVKUndefinedLargeUInt32;
|
||||
|
||||
_properties.limits.maxDrawIndexedIndexValue = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxDrawIndirectCount = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.minTexelOffset = -8;
|
||||
_properties.limits.maxTexelOffset = 7;
|
||||
_properties.limits.minTexelGatherOffset = _properties.limits.minTexelOffset;
|
||||
_properties.limits.maxTexelGatherOffset = _properties.limits.maxTexelOffset;
|
||||
|
||||
_properties.limits.minTexelOffset = numeric_limits<int32_t>::min();
|
||||
_properties.limits.maxTexelOffset = numeric_limits<int32_t>::max();
|
||||
_properties.limits.minTexelGatherOffset = numeric_limits<int32_t>::min();
|
||||
_properties.limits.maxTexelGatherOffset = numeric_limits<int32_t>::max();
|
||||
|
||||
_properties.limits.maxClipDistances = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxCombinedClipAndCullDistances = numeric_limits<uint32_t>::max();
|
||||
_properties.limits.maxClipDistances = kMVKUndefinedLargeUInt32;
|
||||
_properties.limits.maxCullDistances = 0; // unsupported
|
||||
_properties.limits.maxCombinedClipAndCullDistances = _properties.limits.maxClipDistances +
|
||||
_properties.limits.maxCullDistances;
|
||||
|
||||
|
||||
// Features with unknown limits - default to Vulkan required limits
|
||||
@ -684,9 +687,6 @@ void MVKPhysicalDevice::initProperties() {
|
||||
_properties.limits.minInterpolationOffset = 0.0;
|
||||
_properties.limits.maxInterpolationOffset = 0.0;
|
||||
_properties.limits.subPixelInterpolationOffsetBits = 0;
|
||||
|
||||
_properties.limits.maxCullDistances = 0;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -278,7 +278,12 @@ MTLRenderPipelineDescriptor* MVKGraphicsPipeline::getMTLRenderPipelineDescriptor
|
||||
// Vertex shader
|
||||
if (mvkAreFlagsEnabled(pSS->stage, VK_SHADER_STAGE_VERTEX_BIT)) {
|
||||
shaderContext.options.entryPointStage = spv::ExecutionModelVertex;
|
||||
plDesc.vertexFunction = mvkShdrMod->getMTLFunction(&shaderContext, pSS->pSpecializationInfo, _pipelineCache).mtlFunction;
|
||||
id<MTLFunction> mtlFunction = mvkShdrMod->getMTLFunction(&shaderContext, pSS->pSpecializationInfo, _pipelineCache).mtlFunction;
|
||||
if ( !mtlFunction ) {
|
||||
setConfigurationResult(mvkNotifyErrorWithText(VK_ERROR_INITIALIZATION_FAILED, "Vertex shader function could not be compiled into pipeline. See previous error."));
|
||||
return nil;
|
||||
}
|
||||
plDesc.vertexFunction = mtlFunction;
|
||||
}
|
||||
|
||||
// Fragment shader
|
||||
@ -418,14 +423,17 @@ MVKComputePipeline::MVKComputePipeline(MVKDevice* device,
|
||||
_mtlThreadgroupSize = shaderFunc.threadGroupSize;
|
||||
_mtlPipelineState = nil;
|
||||
|
||||
NSError* psError = nil;
|
||||
uint64_t startTime = _device->getPerformanceTimestamp();
|
||||
_mtlPipelineState = [getMTLDevice() newComputePipelineStateWithFunction: shaderFunc.mtlFunction error: &psError]; // retained
|
||||
if (psError) {
|
||||
setConfigurationResult(mvkNotifyErrorWithText(VK_ERROR_INITIALIZATION_FAILED, "Could not create compute pipeline:\n%s.", psError.description.UTF8String));
|
||||
}
|
||||
_device->addShaderCompilationEventPerformance(_device->_shaderCompilationPerformance.pipelineCompile, startTime);
|
||||
|
||||
if (shaderFunc.mtlFunction) {
|
||||
NSError* psError = nil;
|
||||
uint64_t startTime = _device->getPerformanceTimestamp();
|
||||
_mtlPipelineState = [getMTLDevice() newComputePipelineStateWithFunction: shaderFunc.mtlFunction error: &psError]; // retained
|
||||
if (psError) {
|
||||
setConfigurationResult(mvkNotifyErrorWithText(VK_ERROR_INITIALIZATION_FAILED, "Could not create compute pipeline:\n%s.", psError.description.UTF8String));
|
||||
}
|
||||
_device->addShaderCompilationEventPerformance(_device->_shaderCompilationPerformance.pipelineCompile, startTime);
|
||||
} else {
|
||||
setConfigurationResult(mvkNotifyErrorWithText(VK_ERROR_INITIALIZATION_FAILED, "Compute shader function could not be compiled into pipeline. See previous error."));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -255,7 +255,7 @@ MVKRenderPassAttachment::MVKRenderPassAttachment(MVKRenderPass* renderPass,
|
||||
_attachmentIndex = uint32_t(_renderPass->_attachments.size());
|
||||
|
||||
// Determine the indices of the first and last render subpasses to use that attachment.
|
||||
_firstUseSubpassIdx = kMVKMaxUnsigned;
|
||||
_firstUseSubpassIdx = kMVKUndefinedLargeUInt32;
|
||||
_lastUseSubpassIdx = 0;
|
||||
for (auto& subPass : _renderPass->_subpasses) {
|
||||
if (subPass.isUsingAttachmentAt(_attachmentIndex)) {
|
||||
|
||||
@ -66,7 +66,9 @@ VkResult MVKSwapchain::acquireNextImageKHR(uint64_t timeout,
|
||||
uint32_t* pImageIndex) {
|
||||
// Find the image that has the smallest availability measure
|
||||
uint32_t minWaitIndex = 0;
|
||||
MVKSwapchainImageAvailability minAvailability = { .acquisitionID = numeric_limits<uint64_t>::max(), .waitCount = numeric_limits<uint32_t>::max(), .isAvailable = false };
|
||||
MVKSwapchainImageAvailability minAvailability = { .acquisitionID = kMVKUndefinedLargeUInt64,
|
||||
.waitCount = kMVKUndefinedLargeUInt32,
|
||||
.isAvailable = false };
|
||||
for (MVKSwapchainImage* mvkSCImg : _surfaceImages) {
|
||||
const MVKSwapchainImageAvailability* currAvailability = mvkSCImg->getAvailability();
|
||||
if (*currAvailability < minAvailability) {
|
||||
|
||||
@ -55,7 +55,7 @@ bool MVKSemaphoreImpl::wait(uint64_t timeout, bool reserveAgain) {
|
||||
isDone = true;
|
||||
} else {
|
||||
// Limit timeout to avoid overflow since wait_for() uses wait_until()
|
||||
uint64_t nanoTimeout = min(timeout, numeric_limits<uint64_t>::max() >> 4);
|
||||
uint64_t nanoTimeout = min(timeout, kMVKUndefinedLargeUInt64);
|
||||
chrono::nanoseconds nanos(nanoTimeout);
|
||||
isDone = _blocker.wait_for(lock, nanos, [this]{ return isClear(); });
|
||||
}
|
||||
|
||||
@ -28,8 +28,17 @@
|
||||
|
||||
#pragma mark Math
|
||||
|
||||
/** Maximum value of any variable of unsigned integral type. */
|
||||
#define kMVKMaxUnsigned (~0U)
|
||||
/**
|
||||
* The following constants are used to indicate values that have no defined limit.
|
||||
* They are ridiculously large numbers, but low enough to be safely used as both
|
||||
* uint and int values without risking overflowing between positive and negative values.
|
||||
*/
|
||||
static int32_t kMVKUndefinedLargeNegativeInt32 = std::numeric_limits<int32_t>::min() / 2;
|
||||
static int32_t kMVKUndefinedLargePositiveInt32 = std::numeric_limits<int32_t>::max() / 2;
|
||||
static uint32_t kMVKUndefinedLargeUInt32 = kMVKUndefinedLargePositiveInt32;
|
||||
static int64_t kMVKUndefinedLargeNegativeInt64 = std::numeric_limits<int64_t>::min() / 2;
|
||||
static int64_t kMVKUndefinedLargePositiveInt64 = std::numeric_limits<int64_t>::max() / 2;
|
||||
static uint64_t kMVKUndefinedLargeUInt64 = kMVKUndefinedLargePositiveInt64;
|
||||
|
||||
// Common scaling multipliers
|
||||
#define KIBI (1024)
|
||||
|
||||
40
MoltenVK/MoltenVK/Utility/NSString+MoltenVK.h
Normal file
40
MoltenVK/MoltenVK/Utility/NSString+MoltenVK.h
Normal file
@ -0,0 +1,40 @@
|
||||
/*
|
||||
* NSString+MoltenVK.h
|
||||
*
|
||||
* Copyright (c) 2014-2018 The Brenwill Workshop Ltd. (http://www.brenwill.com)
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
/* This file contains convenient functions for accessing Metal components during execution. */
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "MVKCommonEnvironment.h"
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
|
||||
#pragma mark -
|
||||
#pragma mark NSMutableString extension
|
||||
|
||||
/** Extensions to NSMutableString to support MoltenVK. */
|
||||
@interface NSMutableString (MoltenVK)
|
||||
|
||||
/** Appends the string and a new line. */
|
||||
-(void) appendLineMVK:(NSString*) aString;
|
||||
|
||||
/** Appends an empty new line. */
|
||||
-(void) appendLineMVK;
|
||||
|
||||
@end
|
||||
37
MoltenVK/MoltenVK/Utility/NSString+MoltenVK.mm
Normal file
37
MoltenVK/MoltenVK/Utility/NSString+MoltenVK.mm
Normal file
@ -0,0 +1,37 @@
|
||||
/*
|
||||
* NSString+MoltenVK.mm
|
||||
*
|
||||
* Copyright (c) 2014-2018 The Brenwill Workshop Ltd. (http://www.brenwill.com)
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
#include "NSString+MoltenVK.h"
|
||||
|
||||
|
||||
#pragma mark -
|
||||
#pragma mark NSMutableString extension
|
||||
|
||||
@implementation NSMutableString (MoltenVK)
|
||||
|
||||
-(void) appendLineMVK:(NSString*) aString {
|
||||
[self appendString: aString];
|
||||
[self appendLineMVK];
|
||||
}
|
||||
|
||||
-(void) appendLineMVK {
|
||||
[self appendString: @"\n"];
|
||||
}
|
||||
|
||||
@end
|
||||
@ -208,118 +208,118 @@ static const MVKFormatDesc _formatDescriptions[] {
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8_SNORM, MTLPixelFormatR8Snorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 1, MTLVertexFormatChar2Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8_USCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 1, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8_SSCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 1, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8_UINT, MTLPixelFormatR8Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 1, MTLVertexFormatUChar2, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8_SINT, MTLPixelFormatR8Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 1, MTLVertexFormatChar2, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8_UINT, MTLPixelFormatR8Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 1, MTLVertexFormatUChar2, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8_SINT, MTLPixelFormatR8Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 1, MTLVertexFormatChar2, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8_SRGB, MTLPixelFormatR8Unorm_sRGB, MTLPixelFormatInvalid, 8.0, kMTLFmtNA, 1, 1, 1, MTLVertexFormatUChar2, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8_UNORM, MTLPixelFormatRG8Unorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatUChar2Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8_SNORM, MTLPixelFormatRG8Snorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatChar2Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8_USCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 2, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8_SSCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 2, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8_UINT, MTLPixelFormatRG8Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatUChar2, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8_SINT, MTLPixelFormatRG8Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatChar2, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8_UINT, MTLPixelFormatRG8Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatUChar2, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8_SINT, MTLPixelFormatRG8Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatChar2, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8_SRGB, MTLPixelFormatRG8Unorm_sRGB, MTLPixelFormatInvalid, 8.0, kMTLFmtNA, 1, 1, 2, MTLVertexFormatUChar2, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8_UNORM, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatUChar3Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8_SNORM, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatChar3Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8_USCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8_SSCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8_UINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatUChar3, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8_SINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatChar3, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8_UINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatUChar3, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8_SINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatChar3, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8_SRGB, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatUChar3, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8_UNORM, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8_SNORM, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8_USCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8_SSCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8_UINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatInvalid, kMVKFormatColorUInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8_SINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatInvalid, kMVKFormatColorInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8_UINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatInvalid, kMVKFormatColorUInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8_SINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatInvalid, kMVKFormatColorInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8_SRGB, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 3, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8A8_UNORM, MTLPixelFormatRGBA8Unorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatUChar4Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8A8_SNORM, MTLPixelFormatRGBA8Snorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatChar4Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8A8_USCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8A8_SSCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8A8_UINT, MTLPixelFormatRGBA8Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatUChar4, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8A8_SINT, MTLPixelFormatRGBA8Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatChar4, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8A8_UINT, MTLPixelFormatRGBA8Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatUChar4, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8A8_SINT, MTLPixelFormatRGBA8Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatChar4, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R8G8B8A8_SRGB, MTLPixelFormatRGBA8Unorm_sRGB, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatUChar4, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8A8_UNORM, MTLPixelFormatBGRA8Unorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8A8_SNORM, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8A8_USCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8A8_SSCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8A8_UINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8A8_SINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8A8_UINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8A8_SINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_B8G8R8A8_SRGB, MTLPixelFormatBGRA8Unorm_sRGB, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_UNORM_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_SNORM_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_USCALED_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_SSCALED_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_UINT_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_SINT_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_SRGB_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_UNORM_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_SNORM_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_USCALED_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_SSCALED_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_UINT_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_SINT_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A8B8G8R8_SRGB_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2R10G10B10_UNORM_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2R10G10B10_SNORM_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2R10G10B10_USCALED_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2R10G10B10_SSCALED_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2R10G10B10_UINT_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2R10G10B10_SINT_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2R10G10B10_UINT_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2R10G10B10_SINT_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2B10G10R10_UNORM_PACK32, MTLPixelFormatRGB10A2Unorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_FEATS ), // Vulkan packed is reversed
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2B10G10R10_SNORM_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2B10G10R10_USCALED_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2B10G10R10_SSCALED_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2B10G10R10_UINT_PACK32, MTLPixelFormatRGB10A2Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_FEATS ), // Vulkan packed is reversed
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2B10G10R10_SINT_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2B10G10R10_UINT_PACK32, MTLPixelFormatRGB10A2Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_FEATS ), // Vulkan packed is reversed
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_A2B10G10R10_SINT_PACK32, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorInt32, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16_UNORM, MTLPixelFormatR16Unorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatUShort2Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16_SNORM, MTLPixelFormatR16Snorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatShort2Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16_USCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 2, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16_SSCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 2, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16_UINT, MTLPixelFormatR16Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatUShort2, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16_SINT, MTLPixelFormatR16Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatShort2, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16_UINT, MTLPixelFormatR16Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatUShort2, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16_SINT, MTLPixelFormatR16Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatShort2, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16_SFLOAT, MTLPixelFormatR16Float, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 2, MTLVertexFormatHalf2, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16_UNORM, MTLPixelFormatRG16Unorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatUShort2Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16_SNORM, MTLPixelFormatRG16Snorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatShort2Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16_USCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16_SSCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 4, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16_UINT, MTLPixelFormatRG16Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatUShort2, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16_SINT, MTLPixelFormatRG16Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatShort2, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16_UINT, MTLPixelFormatRG16Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatUShort2, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16_SINT, MTLPixelFormatRG16Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatShort2, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16_SFLOAT, MTLPixelFormatRG16Float, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatHalf2, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16_UNORM, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 6, MTLVertexFormatUShort3Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16_SNORM, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 6, MTLVertexFormatShort3Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16_USCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 6, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16_SSCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 6, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16_UINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 6, MTLVertexFormatUShort3, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16_SINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 6, MTLVertexFormatShort3, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16_UINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 6, MTLVertexFormatUShort3, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16_SINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 6, MTLVertexFormatShort3, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16_SFLOAT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 6, MTLVertexFormatHalf3, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16A16_UNORM, MTLPixelFormatRGBA16Unorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatUShort4Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16A16_SNORM, MTLPixelFormatRGBA16Snorm, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatShort4Normalized, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16A16_USCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 8, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16A16_SSCALED, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 8, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16A16_UINT, MTLPixelFormatRGBA16Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatUShort4, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16A16_SINT, MTLPixelFormatRGBA16Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatShort4, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16A16_UINT, MTLPixelFormatRGBA16Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatUShort4, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16A16_SINT, MTLPixelFormatRGBA16Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatShort4, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R16G16B16A16_SFLOAT, MTLPixelFormatRGBA16Float, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatHalf4, kMVKFormatColorFloat, MVK_FMT_COLOR_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32_UINT, MTLPixelFormatR32Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatUInt, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32_SINT, MTLPixelFormatR32Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatInt, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32_UINT, MTLPixelFormatR32Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatUInt, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32_SINT, MTLPixelFormatR32Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatInt, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32_SFLOAT, MTLPixelFormatR32Float, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 4, MTLVertexFormatFloat, kMVKFormatColorFloat, MVK_FMT_COLOR_FLOAT32_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32_UINT, MTLPixelFormatRG32Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatUInt2, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32_SINT, MTLPixelFormatRG32Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatInt2, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32_UINT, MTLPixelFormatRG32Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatUInt2, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32_SINT, MTLPixelFormatRG32Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatInt2, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32_SFLOAT, MTLPixelFormatRG32Float, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 8, MTLVertexFormatFloat2, kMVKFormatColorFloat, MVK_FMT_COLOR_FLOAT32_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32B32_UINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 12, MTLVertexFormatUInt3, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32B32_SINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 12, MTLVertexFormatInt3, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32B32_UINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 12, MTLVertexFormatUInt3, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32B32_SINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 12, MTLVertexFormatInt3, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32B32_SFLOAT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 12, MTLVertexFormatFloat3, kMVKFormatColorFloat, MVK_FMT_COLOR_FLOAT32_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32B32A32_UINT, MTLPixelFormatRGBA32Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 16, MTLVertexFormatUInt4, kMVKFormatColorUInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32B32A32_SINT, MTLPixelFormatRGBA32Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 16, MTLVertexFormatInt4, kMVKFormatColorInt, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32B32A32_UINT, MTLPixelFormatRGBA32Uint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 16, MTLVertexFormatUInt4, kMVKFormatColorUInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32B32A32_SINT, MTLPixelFormatRGBA32Sint, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 16, MTLVertexFormatInt4, kMVKFormatColorInt32, MVK_FMT_COLOR_INTEGER_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R32G32B32A32_SFLOAT, MTLPixelFormatRGBA32Float, MTLPixelFormatInvalid, 8.0, 10.11, 1, 1, 16, MTLVertexFormatFloat4, kMVKFormatColorFloat, MVK_FMT_COLOR_FLOAT32_FEATS, MVK_FMT_BUFFER_VTX_FEATS ),
|
||||
|
||||
MVK_MAKE_FMT_STRUCT( VK_FORMAT_R64_UINT, MTLPixelFormatInvalid, MTLPixelFormatInvalid, kMTLFmtNA, kMTLFmtNA, 1, 1, 8, MTLVertexFormatInvalid, kMVKFormatColorFloat, MVK_FMT_NO_FEATS, MVK_FMT_NO_FEATS ),
|
||||
@ -612,19 +612,24 @@ MVK_PUBLIC_SYMBOL MTLClearColor mvkMTLClearColorFromVkClearValue(VkClearValue vk
|
||||
VkFormat vkFormat) {
|
||||
MTLClearColor mtlClr;
|
||||
switch (mvkFormatTypeFromVkFormat(vkFormat)) {
|
||||
case kMVKFormatColorHalf:
|
||||
case kMVKFormatColorFloat:
|
||||
mtlClr.red = vkClearValue.color.float32[0];
|
||||
mtlClr.green = vkClearValue.color.float32[1];
|
||||
mtlClr.blue = vkClearValue.color.float32[2];
|
||||
mtlClr.alpha = vkClearValue.color.float32[3];
|
||||
break;
|
||||
case kMVKFormatColorUInt:
|
||||
case kMVKFormatColorUInt8:
|
||||
case kMVKFormatColorUInt16:
|
||||
case kMVKFormatColorUInt32:
|
||||
mtlClr.red = vkClearValue.color.uint32[0];
|
||||
mtlClr.green = vkClearValue.color.uint32[1];
|
||||
mtlClr.blue = vkClearValue.color.uint32[2];
|
||||
mtlClr.alpha = vkClearValue.color.uint32[3];
|
||||
break;
|
||||
case kMVKFormatColorInt:
|
||||
case kMVKFormatColorInt8:
|
||||
case kMVKFormatColorInt16:
|
||||
case kMVKFormatColorInt32:
|
||||
mtlClr.red = vkClearValue.color.int32[0];
|
||||
mtlClr.green = vkClearValue.color.int32[1];
|
||||
mtlClr.blue = vkClearValue.color.int32[2];
|
||||
|
||||
@ -1122,22 +1122,22 @@ MVK_PUBLIC_SYMBOL void vkCmdDrawIndirect(
|
||||
VkCommandBuffer commandBuffer,
|
||||
VkBuffer buffer,
|
||||
VkDeviceSize offset,
|
||||
uint32_t count,
|
||||
uint32_t drawCount,
|
||||
uint32_t stride) {
|
||||
|
||||
MVKCommandBuffer* cmdBuff = MVKCommandBuffer::getMVKCommandBuffer(commandBuffer);
|
||||
mvkCmdDrawIndirect(cmdBuff, buffer, offset, count, stride);
|
||||
mvkCmdDrawIndirect(cmdBuff, buffer, offset, drawCount, stride);
|
||||
}
|
||||
|
||||
MVK_PUBLIC_SYMBOL void vkCmdDrawIndexedIndirect(
|
||||
VkCommandBuffer commandBuffer,
|
||||
VkBuffer buffer,
|
||||
VkDeviceSize offset,
|
||||
uint32_t count,
|
||||
uint32_t drawCount,
|
||||
uint32_t stride) {
|
||||
|
||||
MVKCommandBuffer* cmdBuff = MVKCommandBuffer::getMVKCommandBuffer(commandBuffer);
|
||||
mvkCmdDrawIndexedIndirect(cmdBuff, buffer, offset, count, stride);
|
||||
mvkCmdDrawIndexedIndirect(cmdBuff, buffer, offset, drawCount, stride);
|
||||
}
|
||||
|
||||
MVK_PUBLIC_SYMBOL void vkCmdDispatch(
|
||||
|
||||
@ -120,7 +120,7 @@ MVK_PUBLIC_SYMBOL void SPIRVToMSLConverterContext::alignUsageWith(const SPIRVToM
|
||||
#pragma mark SPIRVToMSLConverter
|
||||
|
||||
/** Populates content extracted from the SPRI-V compiler. */
|
||||
void populateFromCompiler(spirv_cross::Compiler& compiler, SPIRVEntryPoint& entryPoint, SPIRVToMSLConverterOptions& options);
|
||||
void populateFromCompiler(spirv_cross::Compiler* pCompiler, SPIRVEntryPoint& entryPoint, SPIRVToMSLConverterOptions& options);
|
||||
|
||||
MVK_PUBLIC_SYMBOL void SPIRVToMSLConverter::setSPIRV(const vector<uint32_t>& spirv) { _spirv = spirv; }
|
||||
|
||||
@ -171,68 +171,74 @@ MVK_PUBLIC_SYMBOL bool SPIRVToMSLConverter::convert(SPIRVToMSLConverterContext&
|
||||
resBindings.push_back(rb);
|
||||
}
|
||||
|
||||
spirv_cross::CompilerMSL mslCompiler(_spirv);
|
||||
|
||||
if (context.options.hasEntryPoint()) {
|
||||
mslCompiler.set_entry_point(context.options.entryPointName, context.options.entryPointStage);
|
||||
}
|
||||
|
||||
// Establish the MSL options for the compiler
|
||||
// This needs to be done in two steps...for CompilerMSL and its superclass.
|
||||
auto mslOpts = mslCompiler.get_msl_options();
|
||||
|
||||
#if MVK_MACOS
|
||||
mslOpts.platform = spirv_cross::CompilerMSL::Options::macOS;
|
||||
#endif
|
||||
#if MVK_IOS
|
||||
mslOpts.platform = spirv_cross::CompilerMSL::Options::iOS;
|
||||
#endif
|
||||
|
||||
mslOpts.msl_version = context.options.mslVersion;
|
||||
mslOpts.enable_point_size_builtin = context.options.isRenderingPoints;
|
||||
mslOpts.resolve_specialized_array_lengths = true;
|
||||
mslCompiler.set_msl_options(mslOpts);
|
||||
|
||||
auto scOpts = mslCompiler.get_common_options();
|
||||
scOpts.vertex.flip_vert_y = context.options.shouldFlipVertexY;
|
||||
mslCompiler.set_common_options(scOpts);
|
||||
spirv_cross::CompilerMSL* pMSLCompiler = nullptr;
|
||||
|
||||
#ifndef SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
|
||||
try {
|
||||
#endif
|
||||
_msl = mslCompiler.compile(&vtxAttrs, &resBindings);
|
||||
pMSLCompiler = new spirv_cross::CompilerMSL(_spirv);
|
||||
|
||||
if (context.options.hasEntryPoint()) {
|
||||
pMSLCompiler->set_entry_point(context.options.entryPointName, context.options.entryPointStage);
|
||||
}
|
||||
|
||||
// Establish the MSL options for the compiler
|
||||
// This needs to be done in two steps...for CompilerMSL and its superclass.
|
||||
auto mslOpts = pMSLCompiler->get_msl_options();
|
||||
|
||||
#if MVK_MACOS
|
||||
mslOpts.platform = spirv_cross::CompilerMSL::Options::macOS;
|
||||
#endif
|
||||
#if MVK_IOS
|
||||
mslOpts.platform = spirv_cross::CompilerMSL::Options::iOS;
|
||||
#endif
|
||||
|
||||
mslOpts.msl_version = context.options.mslVersion;
|
||||
mslOpts.enable_point_size_builtin = context.options.isRenderingPoints;
|
||||
mslOpts.resolve_specialized_array_lengths = true;
|
||||
pMSLCompiler->set_msl_options(mslOpts);
|
||||
|
||||
auto scOpts = pMSLCompiler->get_common_options();
|
||||
scOpts.vertex.flip_vert_y = context.options.shouldFlipVertexY;
|
||||
pMSLCompiler->set_common_options(scOpts);
|
||||
|
||||
_msl = pMSLCompiler->compile(&vtxAttrs, &resBindings);
|
||||
if (shouldLogMSL) { logSource(_msl, "MSL", "Converted"); }
|
||||
#ifndef SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
|
||||
} catch (spirv_cross::CompilerError& ex) {
|
||||
string errMsg("MSL conversion error: ");
|
||||
errMsg += ex.what();
|
||||
logError(errMsg.data());
|
||||
if (shouldLogMSL) {
|
||||
_msl = mslCompiler.get_partial_source();
|
||||
if (shouldLogMSL && pMSLCompiler) {
|
||||
_msl = pMSLCompiler->get_partial_source();
|
||||
logSource(_msl, "MSL", "Partially converted");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Populate content extracted from the SPRI-V compiler.
|
||||
populateFromCompiler(mslCompiler, _entryPoint, context.options);
|
||||
populateFromCompiler(pMSLCompiler, _entryPoint, context.options);
|
||||
|
||||
// To check GLSL conversion
|
||||
if (shouldLogGLSL) {
|
||||
spirv_cross::CompilerGLSL glslCompiler(_spirv);
|
||||
string glsl;
|
||||
spirv_cross::CompilerGLSL* pGLSLCompiler = nullptr;
|
||||
|
||||
#ifndef SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
|
||||
try {
|
||||
try {
|
||||
#endif
|
||||
glsl = glslCompiler.compile();
|
||||
pGLSLCompiler = new spirv_cross::CompilerGLSL(_spirv);
|
||||
string glsl = pGLSLCompiler->compile();
|
||||
logSource(glsl, "GLSL", "Estimated original");
|
||||
#ifndef SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
|
||||
} catch (spirv_cross::CompilerError& ex) {
|
||||
string errMsg("Original GLSL extraction error: ");
|
||||
errMsg += ex.what();
|
||||
logMsg(errMsg.data());
|
||||
glsl = glslCompiler.get_partial_source();
|
||||
logSource(glsl, "GLSL", "Partially converted");
|
||||
if (pGLSLCompiler) {
|
||||
string glsl = pGLSLCompiler->get_partial_source();
|
||||
logSource(glsl, "GLSL", "Partially converted");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -322,16 +328,18 @@ void SPIRVToMSLConverter::logSource(string& src, const char* srcLang, const char
|
||||
|
||||
#pragma mark Support functions
|
||||
|
||||
void populateFromCompiler(spirv_cross::Compiler& compiler, SPIRVEntryPoint& entryPoint, SPIRVToMSLConverterOptions& options) {
|
||||
void populateFromCompiler(spirv_cross::Compiler* pCompiler, SPIRVEntryPoint& entryPoint, SPIRVToMSLConverterOptions& options) {
|
||||
|
||||
if ( !pCompiler ) { return; }
|
||||
|
||||
spirv_cross::SPIREntryPoint spvEP;
|
||||
if (options.hasEntryPoint()) {
|
||||
spvEP = compiler.get_entry_point(options.entryPointName, options.entryPointStage);
|
||||
spvEP = pCompiler->get_entry_point(options.entryPointName, options.entryPointStage);
|
||||
} else {
|
||||
const auto& entryPoints = compiler.get_entry_points_and_stages();
|
||||
const auto& entryPoints = pCompiler->get_entry_points_and_stages();
|
||||
if ( !entryPoints.empty() ) {
|
||||
auto& ep = entryPoints[0];
|
||||
spvEP = compiler.get_entry_point(ep.name, ep.execution_model);
|
||||
spvEP = pCompiler->get_entry_point(ep.name, ep.execution_model);
|
||||
}
|
||||
}
|
||||
|
||||
@ -344,7 +352,7 @@ void populateFromCompiler(spirv_cross::Compiler& compiler, SPIRVEntryPoint& entr
|
||||
entryPoint.workgroupSize.depth = max(wgSize.z, minDim);
|
||||
|
||||
spirv_cross::SpecializationConstant width, height, depth;
|
||||
entryPoint.workgroupSizeId.constant = compiler.get_work_group_size_specialization_constants(width, height, depth);
|
||||
entryPoint.workgroupSizeId.constant = pCompiler->get_work_group_size_specialization_constants(width, height, depth);
|
||||
entryPoint.workgroupSizeId.width = width.constant_id;
|
||||
entryPoint.workgroupSizeId.height = height.constant_id;
|
||||
entryPoint.workgroupSizeId.depth = depth.constant_id;
|
||||
|
||||
@ -156,9 +156,6 @@ namespace mvk {
|
||||
} workgroupSizeId;
|
||||
} SPIRVEntryPoint;
|
||||
|
||||
/** Holds a map of entry point info, indexed by the SPIRV entry point name. */
|
||||
// typedef std::unordered_map<std::string, SPIRVEntryPoint> SPIRVEntryPointsByName;
|
||||
|
||||
/** Special constant used in a MSLResourceBinding descriptorSet element to indicate the bindings for the push constants. */
|
||||
static const uint32_t kPushConstDescSet = std::numeric_limits<uint32_t>::max();
|
||||
|
||||
|
||||
@ -72,19 +72,19 @@
|
||||
</CommandLineArgument>
|
||||
<CommandLineArgument
|
||||
argument = "-gi"
|
||||
isEnabled = "NO">
|
||||
isEnabled = "YES">
|
||||
</CommandLineArgument>
|
||||
<CommandLineArgument
|
||||
argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/Support/2018/MVK_Issue_112/bad_attrs.vert"
|
||||
isEnabled = "NO">
|
||||
argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/MoltenVK-bh/External/SPIRV-Cross/shaders-msl/frag/gather-offset.frag"
|
||||
isEnabled = "YES">
|
||||
</CommandLineArgument>
|
||||
<CommandLineArgument
|
||||
argument = "-si"
|
||||
isEnabled = "YES">
|
||||
isEnabled = "NO">
|
||||
</CommandLineArgument>
|
||||
<CommandLineArgument
|
||||
argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/Support/2018/MVK_Issue_112/second/vert_bin.spv"
|
||||
isEnabled = "YES">
|
||||
isEnabled = "NO">
|
||||
</CommandLineArgument>
|
||||
<CommandLineArgument
|
||||
argument = "-mo"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user