Add support for VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT

Author: squidbus

Docs/MoltenVK_Configuration_Parameters.md

@@ -680,6 +680,9 @@ allocate textures and buffers from general device memory.
 Vulkan extension `VK_EXT_image_2d_view_of_3d` requires this parameter to be active, 
 to allow aliasing of texture memory between the 3D image and the 2D view.
 
+`VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT` also requires this parameter to be active,
+to allow aliasing of texture memory between the compressed image and the uncompressed view.
+
 To force `MTLHeap` to be used on AMD GPUs, set this parameter to `2`. 
 To disable the use of `MTLHeap` on any GPU, set this parameter to `0`.
 

MoltenVK/MoltenVK/API/mvk_deprecated_api.h

@@ -101,7 +101,8 @@ typedef struct {
     VkDeviceSize mtlBufferAlignment;            	/**< The alignment used when allocating memory for MTLBuffers. Must be PoT. */
     VkDeviceSize maxQueryBufferSize;            	/**< The maximum size of an occlusion query buffer (in bytes). */
 	VkDeviceSize mtlCopyBufferAlignment;        	/**< The alignment required during buffer copy operations (in bytes). */
-    VkSampleCountFlags supportedSampleCounts;   	/**< A bitmask identifying the sample counts supported by the device. */
+	VkSampleCountFlags supportedSampleCounts;   	/**< A bitmask identifying the sample counts supported by the device. */
+	VkSampleCountFlags supportedSamplePosCounts;    /**< A bitmask identifying the sample counts for which the device supports sample positions. */
 	uint32_t minSwapchainImageCount;	 	  		/**< The minimum number of swapchain images that can be supported by a surface. */
 	uint32_t maxSwapchainImageCount;	 	  		/**< The maximum number of swapchain images that can be supported by a surface. */
 	VkBool32 combinedStoreResolveAction;			/**< If true, the device supports VK_ATTACHMENT_STORE_OP_STORE with a simultaneous resolve attachment. */

MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm

@@ -1266,7 +1266,7 @@
 			}
 			case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT: {
 				auto* sampLocnProps = (VkPhysicalDeviceSampleLocationsPropertiesEXT*)next;
-				sampLocnProps->sampleLocationSampleCounts = _metalFeatures.supportedSampleCounts;
+				sampLocnProps->sampleLocationSampleCounts = _metalFeatures.supportedSamplePosCounts;
 				sampLocnProps->maxSampleLocationGridSize = kMVKSampleLocationPixelGridSize;
 				sampLocnProps->sampleLocationCoordinateRange[0] = kMVKMinSampleLocationCoordinate;
 				sampLocnProps->sampleLocationCoordinateRange[1] = kMVKMaxSampleLocationCoordinate;
@@ -1473,7 +1473,7 @@
 void MVKPhysicalDevice::getMultisampleProperties(VkSampleCountFlagBits samples,
 												 VkMultisamplePropertiesEXT* pMultisampleProperties) {
 	if (pMultisampleProperties) {
-		pMultisampleProperties->maxSampleLocationGridSize = (mvkIsOnlyAnyFlagEnabled(samples, _metalFeatures.supportedSampleCounts)
+		pMultisampleProperties->maxSampleLocationGridSize = (mvkIsOnlyAnyFlagEnabled(samples, _metalFeatures.supportedSamplePosCounts)
 															 ? kMVKSampleLocationPixelGridSize
 															 : kMVKSampleLocationPixelGridSizeNotSupported);
 	}
@@ -1521,9 +1521,16 @@
 		}
 	}
 
-	// Metal does not support creating uncompressed views of compressed formats.
+	// These features require placement heaps to alias textures.
+	const auto placementHeapFlags = VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT |
+	                                VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT |
+	                                VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT;
+	if (!getMVKConfig().useMTLHeap && mvkIsAnyFlagEnabled(flags, placementHeapFlags)) {
+		return VK_ERROR_FORMAT_NOT_SUPPORTED;
+	}
+
 	// Metal does not support split-instance images.
-	if (mvkIsAnyFlagEnabled(flags, VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT | VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT)) {
+	if (mvkIsAnyFlagEnabled(flags, VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT)) {
 		return VK_ERROR_FORMAT_NOT_SUPPORTED;
 	}
 
@@ -2834,6 +2841,11 @@
     for (uint32_t sc = VK_SAMPLE_COUNT_1_BIT; sc <= VK_SAMPLE_COUNT_64_BIT; sc <<= 1) {
         if ([_mtlDevice supportsTextureSampleCount: mvkSampleCountFromVkSampleCountFlagBits((VkSampleCountFlagBits)sc)]) {
             _metalFeatures.supportedSampleCounts |= sc;
+
+            // Metal asserts: "count (1) is not a supported sample count for custom positions."
+            if (sc != VK_SAMPLE_COUNT_1_BIT) {
+                _metalFeatures.supportedSamplePosCounts |= sc;
+            }
         }
     }
 

MoltenVK/MoltenVK/GPUObjects/MVKImage.h

@@ -65,6 +65,7 @@ class MVKImagePlane : public MVKBaseObject {
 protected:
 	friend class MVKImageMemoryBinding;
 	friend MVKImage;
+	friend class MVKImageViewPlane;
 
     MTLTextureDescriptor* newMTLTextureDescriptor();
     void initSubresources(const VkImageCreateInfo* pCreateInfo);
@@ -402,6 +403,7 @@ class MVKImage : public MVKVulkanAPIDeviceObject {
 	bool _shouldSupportAtomics;
 	bool _isLinearForAtomics;
 	bool _is2DViewOn3DImageCompatible = false;
+	bool _isBlockTexelViewCompatible = false;
 };