Final 1.2 fixes

KhronosGroup · Sep 26, 2022 · e8b32de · e8b32de
1 parent ac39eb2
commit e8b32de
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDescriptor.h b/MoltenVK/MoltenVK/GPUObjects/MVKDescriptor.h
@@ -94,7 +94,7 @@ class MVKDescriptorSetLayoutBinding : public MVKBaseDeviceObject {
 
 	/** Returns whether this binding has a variable descriptor count. */
 	inline bool hasVariableDescriptorCount() const {
-		return mvkIsAnyFlagEnabled(_flags, VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT_EXT);
+		return mvkIsAnyFlagEnabled(_flags, VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT);
 	}
 
 	/**

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDescriptorSet.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDescriptorSet.mm
@@ -809,7 +809,7 @@
 		if (metalArgBuffSize) {
 			NSUInteger maxMTLBuffSize = _device->_pMetalFeatures->maxMTLBufferSize;
 			if (metalArgBuffSize > maxMTLBuffSize) {
-				setConfigurationResult(reportError(VK_ERROR_FRAGMENTATION_EXT, "vkCreateDescriptorPool(): The requested descriptor storage of %d MB is larger than the maximum descriptor storage of %d MB per VkDescriptorPool.", (uint32_t)(metalArgBuffSize / MEBI), (uint32_t)(maxMTLBuffSize / MEBI)));
+				setConfigurationResult(reportError(VK_ERROR_FRAGMENTATION, "vkCreateDescriptorPool(): The requested descriptor storage of %d MB is larger than the maximum descriptor storage of %d MB per VkDescriptorPool.", (uint32_t)(metalArgBuffSize / MEBI), (uint32_t)(maxMTLBuffSize / MEBI)));
 				metalArgBuffSize = maxMTLBuffSize;
 			}
 			_metalArgumentBuffer = [getMTLDevice() newBufferWithLength: metalArgBuffSize options: MTLResourceStorageModeShared];	// retained

diff --git a/MoltenVK/MoltenVK/Vulkan/vulkan.mm b/MoltenVK/MoltenVK/Vulkan/vulkan.mm
@@ -2454,7 +2454,7 @@ MVK_PUBLIC_VULKAN_SYMBOL void vkResetQueryPool(
 
 MVK_PUBLIC_VULKAN_SYMBOL VkResult vkSignalSemaphore(
 	VkDevice									device,
-	const VkSemaphoreSignalInfoKHR*				pSignalInfo) {
+	const VkSemaphoreSignalInfo*				pSignalInfo) {
 
 	MVKTraceVulkanCallStart();
 	auto* mvkSem4 = (MVKTimelineSemaphore*)pSignalInfo->semaphore;
@@ -2465,7 +2465,7 @@ MVK_PUBLIC_VULKAN_SYMBOL VkResult vkSignalSemaphore(
 
 MVK_PUBLIC_VULKAN_SYMBOL VkResult vkWaitSemaphores(
 	VkDevice									device,
-	const VkSemaphoreWaitInfoKHR*				pWaitInfo,
+	const VkSemaphoreWaitInfo*				    pWaitInfo,
 	uint64_t									timeout) {
 
 	MVKTraceVulkanCallStart();