Fixed compilation and tests for Metal

Author: azhirnov

Graphics/GraphicsEngineMetal/interface/RasterizationRateMapMtl.h

@@ -31,6 +31,10 @@
 #include "../../GraphicsEngine/interface/Buffer.h"
 #include "../../GraphicsEngine/interface/TextureView.h"
 
+#if PLATFORM_TVOS
+@protocol MTLRasterizationRateMap; // Not available in tvOS
+#endif
+
 DILIGENT_BEGIN_NAMESPACE(Diligent)
 
 // {89148E0E-1300-4FF2-BEA4-F1127ED24CF9}
@@ -49,13 +53,13 @@ static const INTERFACE_ID IID_RasterizationRateMapMtl =
 
 /// Rasterization rate map description
 struct RasterizationRateMapDesc DILIGENT_DERIVE(DeviceObjectAttribs)
-    
+
     /// Width of the final render target
     Uint32 ScreenWidth  DEFAULT_INITIALIZER(0);
 
     /// Height of the final render target
     Uint32 ScreenHeight DEFAULT_INITIALIZER(0);
-    
+
     /// The number of layers (aka array size)
     Uint32 LayerCount   DEFAULT_INITIALIZER(0);
 };
@@ -87,7 +91,7 @@ struct RasterizationRateMapCreateInfo
 {
     /// Rasterization rate map description
     RasterizationRateMapDesc          Desc;
-    
+
     /// Array of rasterization rate map layer descriptions
     const RasterizationRateLayerDesc* pLayers    DEFAULT_INITIALIZER(nullptr);
 };

Graphics/GraphicsEngineMetal/interface/RenderDeviceMtl.h

@@ -28,10 +28,10 @@
 /// Definition of the Diligent::IRenderDeviceMtl interface
 
 #include "../../GraphicsEngine/interface/RenderDevice.h"
+#include "RasterizationRateMapMtl.h"
 
 #if PLATFORM_TVOS
 @protocol MTLAccelerationStructure; // Not available in tvOS
-@protocol MTLRasterizationRateMap;  // Not available in tvOS
 #endif
 
 DILIGENT_BEGIN_NAMESPACE(Diligent)
@@ -84,13 +84,13 @@ DILIGENT_BEGIN_INTERFACE(IRenderDeviceMtl, IRenderDevice)
 
     /// Creates a rasterization rate map from existing Metal resource
     VIRTUAL void METHOD(CreateRasterizationRateMapFromMtlResource)(THIS_
-                                                                   id<MTLRasterizationRateMap>       mtlRRM,
-                                                                   struct IRasterizationRateMapMtl** ppRRM) API_AVAILABLE(ios(13), macosx(10.15.4)) API_UNAVAILABLE(tvos) PURE;
+                                                                   id<MTLRasterizationRateMap> mtlRRM,
+                                                                   IRasterizationRateMapMtl**  ppRRM) API_AVAILABLE(ios(13), macosx(10.15.4)) API_UNAVAILABLE(tvos) PURE;
 
     /// Creates a rasterization rate map
     VIRTUAL void METHOD(CreateRasterizationRateMap)(THIS_
-                                                    const struct RasterizationRateMapCreateInfo REF CreateInfo,
-                                                    struct IRasterizationRateMapMtl**               ppRRM) PURE;
+                                                    const RasterizationRateMapCreateInfo REF CreateInfo,
+                                                    IRasterizationRateMapMtl**               ppRRM) PURE;
 
     /// Creates a sparse texture
     ///

Tests/DiligentCoreAPITest/src/SparseResourcesTest.cpp

@@ -1906,7 +1906,7 @@ TEST_F(SparseResourceTest, SparseTexture3D)
     {
         GTEST_SKIP() << "Sparse texture 3D is not supported by this device";
     }
-    if ((pDevice->GetSparseTextureFormatInfo(TEX_FORMAT_RGBA8_UNORM, RESOURCE_DIM_TEX_3D, 1).BindFlags & BIND_UNORDERED_ACCESS) != 0)
+    if ((pDevice->GetSparseTextureFormatInfo(TEX_FORMAT_RGBA8_UNORM, RESOURCE_DIM_TEX_3D, 1).BindFlags & BIND_UNORDERED_ACCESS) == 0)
     {
         GTEST_SKIP() << "Sparse texture UAV is not supported by this device";
     }

Tests/IncludeTest/GraphicsEngineMetal/RasterizationRateMapMtlH_test.m

@@ -43,6 +43,6 @@ void TestRasterizationRateMapMtl_CInterface(IRasterizationRateMapMtl* pRRM)
     IRasterizationRateMapMtl_GetPhysicalGranularity(pRRM, (Uint32*)NULL, (Uint32*)NULL);
     IRasterizationRateMapMtl_MapScreenToPhysicalCoordinates(pRRM, 0, 0.f, 0.f, (float*)NULL, (float*)NULL);
     IRasterizationRateMapMtl_MapPhysicalToScreenCoordinates(pRRM, 0, 0.f, 0.f, (float*)NULL, (float*)NULL);
-    IRasterizationRateMapMtl_GetParameterBufferSizeAndAlign(pRRM, (Uint32*)NULL, (Uint32*)NULL);
+    IRasterizationRateMapMtl_GetParameterBufferSizeAndAlign(pRRM, (Uint64*)NULL, (Uint32*)NULL);
     IRasterizationRateMapMtl_CopyParameterDataToBuffer(pRRM, (struct IBuffer*)NULL, 0);
 }