Merge pull request #1224 from cdavis5e/mac-family-2-features

Require Mac family 2 for some features
This commit is contained in:
Bill Hollings 2021-01-29 13:04:42 -05:00 committed by GitHub
commit 5d00644d7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1396,7 +1396,6 @@ void MVKPhysicalDevice::initMetalFeatures() {
_metalFeatures.multisampleArrayTextures = true; _metalFeatures.multisampleArrayTextures = true;
_metalFeatures.events = true; _metalFeatures.events = true;
_metalFeatures.textureBuffers = true; _metalFeatures.textureBuffers = true;
_metalFeatures.quadPermute = true;
_metalFeatures.simdPermute = true; _metalFeatures.simdPermute = true;
} }
@ -1405,6 +1404,7 @@ void MVKPhysicalDevice::initMetalFeatures() {
_metalFeatures.stencilFeedback = true; _metalFeatures.stencilFeedback = true;
_metalFeatures.depthResolve = true; _metalFeatures.depthResolve = true;
_metalFeatures.stencilResolve = true; _metalFeatures.stencilResolve = true;
_metalFeatures.quadPermute = true;
_metalFeatures.simdReduction = true; _metalFeatures.simdReduction = true;
} }
@ -1412,13 +1412,13 @@ void MVKPhysicalDevice::initMetalFeatures() {
_metalFeatures.mslVersionEnum = MTLLanguageVersion2_2; _metalFeatures.mslVersionEnum = MTLLanguageVersion2_2;
_metalFeatures.maxQueryBufferSize = (256 * KIBI); _metalFeatures.maxQueryBufferSize = (256 * KIBI);
_metalFeatures.native3DCompressedTextures = true; _metalFeatures.native3DCompressedTextures = true;
_metalFeatures.renderWithoutAttachments = true;
if ( mvkOSVersionIsAtLeast(mvkMakeOSVersion(10, 15, 6)) ) { if ( mvkOSVersionIsAtLeast(mvkMakeOSVersion(10, 15, 6)) ) {
_metalFeatures.sharedLinearTextures = true; _metalFeatures.sharedLinearTextures = true;
} }
if (supportsMTLGPUFamily(Mac2)) { if (supportsMTLGPUFamily(Mac2)) {
_metalFeatures.nativeTextureSwizzle = true; _metalFeatures.nativeTextureSwizzle = true;
_metalFeatures.placementHeaps = mvkGetMVKConfiguration()->useMTLHeap; _metalFeatures.placementHeaps = mvkGetMVKConfiguration()->useMTLHeap;
_metalFeatures.renderWithoutAttachments = true;
} }
} }