Expose VK_EXT_image_robustness support

src/Pipeline/SamplerCore.cpp

@@ -2257,7 +2257,6 @@ void SamplerCore::address(const Float4 &uvw, Int4 &xyz0, Int4 &xyz1, Float4 &f,
 		xyz0 = Min(Max(xyz, Int4(0)), maxXYZ);
 
 		// VK_EXT_image_robustness requires checking for out-of-bounds accesses.
-		// TODO(b/159329067): Claim VK_EXT_image_robustness
 		// TODO(b/162327166): Only perform bounds checks when VK_EXT_image_robustness is enabled.
 		// If the above clamping altered the result, the access is out-of-bounds.
 		// In that case set the coordinate to -1 to perform texel replacement later.

src/Pipeline/SpirvShader.cpp

@@ -1511,7 +1511,6 @@ OutOfBoundsBehavior SpirvShader::EmitState::getOutOfBoundsBehavior(spv::StorageC
 
 		case spv::StorageClassImage:
 			// VK_EXT_image_robustness requires nullifying out-of-bounds accesses.
-			// TODO(b/159329067): Claim VK_EXT_image_robustness
 			// TODO(b/162327166): Only perform bounds checks when VK_EXT_image_robustness is enabled.
 			return OutOfBoundsBehavior::Nullify;
 

src/Pipeline/SpirvShaderImage.cpp

@@ -648,14 +648,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageRead(InsnIterator insn, EmitState
 
 	auto &dst = state->createIntermediate(insn.resultId(), resultType.componentCount);
 
-	// "The value returned by a read of an invalid texel is undefined,
-	//  unless that read operation is from a buffer resource and the robustBufferAccess feature is enabled."
-	// TODO: Don't always assume a buffer resource.
-	//
-	// While we could be using OutOfBoundsBehavior::RobustBufferAccess for read operations from buffer resources,
-	// emulating the glsl function loadImage() requires that this function returns 0 when used with out of bounds
-	// coordinates, so we have to use OutOfBoundsBehavior::Nullify in that case.
-	// TODO(b/159329067): Claim VK_EXT_image_robustness
+	// VK_EXT_image_robustness requires replacing out-of-bounds access with zero.
 	// TODO(b/162327166): Only perform bounds checks when VK_EXT_image_robustness is enabled.
 	auto robustness = OutOfBoundsBehavior::Nullify;
 
@@ -1178,12 +1171,9 @@ SpirvShader::EmitResult SpirvShader::EmitImageWrite(InsnIterator insn, EmitState
 			break;
 	}
 
-	// SPIR-V 1.4: "If the coordinates are outside the image, the memory location that is accessed is undefined."
-
-	// Emulating the glsl function imageStore() requires that this function is noop when used with out of bounds
-	// coordinates, so we have to use OutOfBoundsBehavior::Nullify in that case.
-	// TODO(b/159329067): Claim VK_EXT_image_robustness
-	// TODO(b/162327166): Only perform bounds checks when VK_EXT_image_robustness is enabled.
+	// "The integer texel coordinates are validated according to the same rules as for texel input coordinate
+	//  validation. If the texel fails integer texel coordinate validation, then the write has no effect."
+	// - https://www.khronos.org/registry/vulkan/specs/1.2/html/chap16.html#textures-output-coordinate-validation
 	auto robustness = OutOfBoundsBehavior::Nullify;
 
 	auto texelPtr = GetTexelAddress(state, imageBase, imageSizeInBytes, coordinate, imageType, binding, texelSize, 0, false, robustness);
@@ -1251,7 +1241,6 @@ SpirvShader::EmitResult SpirvShader::EmitImageTexelPointer(InsnIterator insn, Em
 	auto imageSizeInBytes = *Pointer<Int>(binding + OFFSET(vk::StorageImageDescriptor, sizeInBytes));
 
 	// VK_EXT_image_robustness requires checking for out-of-bounds accesses.
-	// TODO(b/159329067): Claim VK_EXT_image_robustness
 	// TODO(b/162327166): Only perform bounds checks when VK_EXT_image_robustness is enabled.
 	auto robustness = OutOfBoundsBehavior::Nullify;
 

src/Pipeline/SpirvShaderSampling.cpp

@@ -82,7 +82,6 @@ SpirvShader::ImageSampler *SpirvShader::getImageSampler(uint32_t inst, vk::Sampl
 		{
 			// OpImageFetch does not take a sampler descriptor, but for VK_EXT_image_robustness
 			// requires replacing invalid texels with zero.
-			// TODO(b/159329067): Claim VK_EXT_image_robustness
 			// TODO(b/162327166): Only perform bounds checks when VK_EXT_image_robustness is enabled.
 			samplerState.border = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK;
 		}
@@ -366,7 +365,6 @@ sw::AddressingMode SpirvShader::convertAddressingMode(int coordinateIndex, const
 
 		// VK_EXT_image_robustness requires nullifying out-of-bounds accesses.
 		// ADDRESSING_BORDER causes texel replacement to be performed.
-		// TODO(b/159329067): Claim VK_EXT_image_robustness
 		// TODO(b/162327166): Only perform bounds checks when VK_EXT_image_robustness is enabled.
 		return ADDRESSING_BORDER;
 	}

src/Vulkan/VkPhysicalDevice.cpp

@@ -191,6 +191,11 @@ void PhysicalDevice::getFeatures(VkPhysicalDeviceProvokingVertexFeaturesEXT *fea
 	features->provokingVertexLast = VK_TRUE;
 }
 
+void PhysicalDevice::getFeatures(VkPhysicalDeviceImageRobustnessFeaturesEXT *features) const
+{
+	features->robustImageAccess = VK_TRUE;
+}
+
 VkSampleCountFlags PhysicalDevice::getSampleCounts() const
 {
 	return VK_SAMPLE_COUNT_1_BIT | VK_SAMPLE_COUNT_4_BIT;

src/Vulkan/VkPhysicalDevice.hpp

@@ -45,6 +45,7 @@ public:
 	void getFeatures(VkPhysicalDeviceLineRasterizationFeaturesEXT *features) const;
 	void getFeatures(VkPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR *features) const;
 	void getFeatures(VkPhysicalDeviceProvokingVertexFeaturesEXT *features) const;
+	void getFeatures(VkPhysicalDeviceImageRobustnessFeaturesEXT *features) const;
 	bool hasFeatures(const VkPhysicalDeviceFeatures &requestedFeatures) const;
 
 	const VkPhysicalDeviceProperties &getProperties() const;