Address reviews.

xamarin · Sep 30, 2021 · ba86323 · ba86323
1 parent daa50ed
commit ba86323
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/src/Metal/MTLRasterizationRateLayerDescriptor.cs b/src/Metal/MTLRasterizationRateLayerDescriptor.cs
@@ -12,8 +12,11 @@
 namespace Metal {
 	public partial class MTLRasterizationRateLayerDescriptor
 	{
-/*  Selectors reported as not working by introspection: https://github.com/xamarin/maccore/issues/1976
-		[NoMac]
+#if !NET
+		[MacCatalyst (15,0)]
+#else
+		[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 		public double[] HorizontalSampleStorage { 
 			get {
 				var width = (int)SampleCount.Width;
@@ -23,7 +26,11 @@ public double[] HorizontalSampleStorage {
 			}
 		}
 
-		[NoMac]
+#if !NET
+		[MacCatalyst (15,0)]
+#else
+		[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 		public double[] VerticalSampleStorage {
 			get {
 				var height = (int)SampleCount.Height;
@@ -32,11 +39,11 @@ public double[] VerticalSampleStorage {
 				return floatArray;
 			}
 		}
-*/
-#if NET
-		[UnsupportedOSPlatform ("macos")]
+
+#if !NET
+		[MacCatalyst (15,0)]
 #else
-		[NoMac]
+		[SupportedOSPlatform ("maccatalyst15.0")]
 #endif
 		static public MTLRasterizationRateLayerDescriptor Create (MTLSize sampleCount, float[] horizontal, float[] vertical)
 		{

diff --git a/tests/monotouch-test/Metal/MTLDeviceTests.cs b/tests/monotouch-test/Metal/MTLDeviceTests.cs
@@ -21,10 +21,13 @@ public void Setup ()
 			TestRuntime.AssertXcodeVersion (9, 0);
 		}
 
-#if __MACOS__
+#if __MACOS__ || __MACCATALYST__
 		[Test]
 		public void GetAllDevicesTest ()
 		{
+#if __MACCATALYST__
+			TestRuntime.AssertXcodeVersion (13, 0);
+#endif 
 			NSObject refObj = new NSObject();
 			var devices = MTLDevice.GetAllDevices(ref refObj, (IMTLDevice device, NSString notifyName) => { });
 

diff --git a/tests/monotouch-test/Metal/MTLRasterizationRateLayerDescriptorTest.cs b/tests/monotouch-test/Metal/MTLRasterizationRateLayerDescriptorTest.cs
@@ -1,3 +1,4 @@
+#if !__WATCHOS__
 using Foundation;
 using Metal;
 
@@ -51,3 +52,4 @@ public void SampleCount ()
 			});
 	}
 }
+#endif
diff --git a/tests/monotouch-test/Metal/MTLRenderPipelineDescriptorTest.cs b/tests/monotouch-test/Metal/MTLRenderPipelineDescriptorTest.cs
@@ -1,3 +1,4 @@
+#if !__WATCHOS__
 using Foundation;
 using Metal;
 
@@ -136,3 +137,4 @@ public void TessellationControlPointIndexTypeTest ()
 			});
 	}
 }
+#endif