Merge pull request #1286 from billhollings/cts-fix-phys-dvc-feats
Permit extension functions when all extensions have been disabled via configuration.
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKInstance.h b/MoltenVK/MoltenVK/GPUObjects/MVKInstance.h
index a1b59cf..31b8dac 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKInstance.h
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKInstance.h
@@ -43,8 +43,9 @@
bool isCore() { return !ext1Name && !ext2Name; }
bool isEnabled(uint32_t enabledVersion, const MVKExtensionList& extList) {
- return (isCore() && MVK_VULKAN_API_VERSION_CONFORM(enabledVersion) >= apiVersion) ||
- extList.isEnabled(ext1Name) || extList.isEnabled(ext2Name);
+ return ((isCore() && MVK_VULKAN_API_VERSION_CONFORM(enabledVersion) >= apiVersion) ||
+ (extList.isEnabled(ext1Name) || extList.isEnabled(ext2Name) ||
+ !mvkGetMVKConfiguration()->advertiseExtensions));
}
} MVKEntryPoint;