Catch up HLSL/Metal fragment shaders with their Vulkan corresponding

Samples/Media/Hlms/Terra/HLSL/PixelShader_ps.hlsl

@@ -15,6 +15,8 @@ struct PS_INPUT
 	@insertpiece( Terra_VStoPS_block )
 };
 
+@pset( currSampler, samplerStateStart )
+
 @property( !hlms_render_depth_only )
 	@property( hlms_gen_normals_gbuffer )
 		#define outPs_normals outPs.normals
@@ -66,7 +68,7 @@ SamplerState samplerStateTerra		: register(s@value(terrainNormals));
 		@property( !hlms_cubemaps_use_dpm )
 			TextureCubeArray	texEnvProbeMap : register(t@value(texEnvProbeMap));
 		@else
-			@property( use_envprobe_map )Texture2DArray	texEnvProbeMap : register(t@value(texEnvProbeMap));@end
+			Texture2DArray	texEnvProbeMap : register(t@value(texEnvProbeMap));
 			@insertpiece( DeclDualParaboloidFunc )
 		@end
 	@end
@@ -76,7 +78,7 @@ SamplerState samplerStateTerra		: register(s@value(terrainNormals));
 @end
 
 @foreach( num_samplers, n )
-	SamplerState samplerState@value(samplerStateStart) : register(s@counter(samplerStateStart));@end
+	SamplerState samplerState@value(currSampler) : register(s@counter(currSampler));@end
 
 @property( use_parallax_correct_cubemaps )
 	@insertpiece( DeclParallaxLocalCorrect )
@@ -92,6 +94,7 @@ SamplerState samplerStateTerra		: register(s@value(terrainNormals));
 @insertpiece( DeclAreaLtcLightFuncs )
 
 @insertpiece( DeclVctTextures )
+@insertpiece( DeclIrradianceFieldTextures )
 
 @insertpiece( DeclOutputType )
 

Samples/Media/Hlms/Terra/Metal/PixelShader_ps.metal

@@ -17,6 +17,8 @@ struct PS_INPUT
 	@insertpiece( Terra_VStoPS_block )
 };
 
+@pset( currSampler, samplerStateStart )
+
 @property( !hlms_render_depth_only )
 	@property( hlms_gen_normals_gbuffer )
 		#define outPs_normals outPs.normals
@@ -111,12 +113,10 @@ fragment @insertpiece( output_type ) main_metal
 	@property( use_envprobe_map )
 		@property( !hlms_enable_cubemaps_auto )
 			, texturecube<float>	texEnvProbeMap [[texture(@value(texEnvProbeMap))]]
-		@end
-		@property( hlms_enable_cubemaps_auto )
+		@else
 			@property( !hlms_cubemaps_use_dpm )
 				, texturecube_array<float>	texEnvProbeMap [[texture(@value(texEnvProbeMap))]]
-			@end
-			@property( hlms_cubemaps_use_dpm )
+			@else
 				, texture2d_array<float>	texEnvProbeMap [[texture(@value(texEnvProbeMap))]]
 			@end
 		@end
@@ -125,11 +125,12 @@ fragment @insertpiece( output_type ) main_metal
 		@end
 	@end
 	@foreach( num_samplers, n )
-		, sampler samplerState@value(samplerStateStart) [[sampler(@counter(samplerStateStart))]]@end
+		, sampler samplerState@value(currSampler) [[sampler(@counter(currSampler))]]@end
 	@insertpiece( DeclDecalsSamplers )
 	@insertpiece( DeclShadowSamplers )
 	@insertpiece( DeclAreaLtcTextures )
 	@insertpiece( DeclVctTextures )
+	@insertpiece( DeclIrradianceFieldTextures )
 )
 {
 	PS_OUTPUT outPs;