2
0
Бранимир Караџић 1 сар өмнө
parent
commit
5e46bf86f7

+ 11 - 0
src/renderer_mtl.h

@@ -247,6 +247,17 @@ namespace bgfx { namespace mtl
 	constexpr MTLPixelFormat kMtlPixelFormatX32_Stencil8          = MTLPixelFormat(261);
 	constexpr MTLPixelFormat kMtlPixelFormatX32_Stencil8          = MTLPixelFormat(261);
 	constexpr MTLPixelFormat kMtlPixelFormatX24_Stencil8          = MTLPixelFormat(262);
 	constexpr MTLPixelFormat kMtlPixelFormatX24_Stencil8          = MTLPixelFormat(262);
 
 
+	constexpr MTLGPUFamily kMtlGPUFamilyApple1  = MTLGPUFamily(1001);
+	constexpr MTLGPUFamily kMtlGPUFamilyApple2  = MTLGPUFamily(1002);
+	constexpr MTLGPUFamily kMtlGPUFamilyApple3  = MTLGPUFamily(1003);
+	constexpr MTLGPUFamily kMtlGPUFamilyApple4  = MTLGPUFamily(1004);
+	constexpr MTLGPUFamily kMtlGPUFamilyApple5  = MTLGPUFamily(1005);
+	constexpr MTLGPUFamily kMtlGPUFamilyApple6  = MTLGPUFamily(1006);
+	constexpr MTLGPUFamily kMtlGPUFamilyApple7  = MTLGPUFamily(1007);
+	constexpr MTLGPUFamily kMtlGPUFamilyApple8  = MTLGPUFamily(1008);
+	constexpr MTLGPUFamily kMtlGPUFamilyApple9  = MTLGPUFamily(1009);
+	constexpr MTLGPUFamily kMtlGPUFamilyApple10 = MTLGPUFamily(1010);
+
 	//runtime os check
 	//runtime os check
 	inline bool iOSVersionEqualOrGreater(const char* _version)
 	inline bool iOSVersionEqualOrGreater(const char* _version)
 	{
 	{

+ 9 - 9
src/renderer_mtl.mm

@@ -516,32 +516,32 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
 
 
 			retain(m_device);
 			retain(m_device);
 
 
-			if (m_device.supportsFamily(MTLGPUFamilyApple4) )
+			if (m_device.supportsFamily(kMtlGPUFamilyApple4) )
 			{
 			{
 				g_caps.vendorId = BGFX_PCI_ID_APPLE;
 				g_caps.vendorId = BGFX_PCI_ID_APPLE;
 				g_caps.deviceId = 1004;
 				g_caps.deviceId = 1004;
 
 
-				if (m_device.supportsFamily(MTLGPUFamilyApple10) )
+				if (m_device.supportsFamily(kMtlGPUFamilyApple10) )
 				{
 				{
 					g_caps.deviceId = 1010;
 					g_caps.deviceId = 1010;
 				}
 				}
-				else if (m_device.supportsFamily(MTLGPUFamilyApple9) )
+				else if (m_device.supportsFamily(kMtlGPUFamilyApple9) )
 				{
 				{
 					g_caps.deviceId = 1009;
 					g_caps.deviceId = 1009;
 				}
 				}
-				else if (m_device.supportsFamily(MTLGPUFamilyApple8) )
+				else if (m_device.supportsFamily(kMtlGPUFamilyApple8) )
 				{
 				{
 					g_caps.deviceId = 1008;
 					g_caps.deviceId = 1008;
 				}
 				}
-				else if (m_device.supportsFamily(MTLGPUFamilyApple7) )
+				else if (m_device.supportsFamily(kMtlGPUFamilyApple7) )
 				{
 				{
 					g_caps.deviceId = 1007;
 					g_caps.deviceId = 1007;
 				}
 				}
-				else if (m_device.supportsFamily(MTLGPUFamilyApple6) )
+				else if (m_device.supportsFamily(kMtlGPUFamilyApple6) )
 				{
 				{
 					g_caps.deviceId = 1006;
 					g_caps.deviceId = 1006;
 				}
 				}
-				else if (m_device.supportsFamily(MTLGPUFamilyApple5) )
+				else if (m_device.supportsFamily(kMtlGPUFamilyApple5) )
 				{
 				{
 					g_caps.deviceId = 1005;
 					g_caps.deviceId = 1005;
 				}
 				}
@@ -598,7 +598,7 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
 				| BGFX_CAPS_VERTEX_ID
 				| BGFX_CAPS_VERTEX_ID
 				);
 				);
 
 
-			g_caps.supported |= m_device.supportsFamily(MTLGPUFamilyApple7)
+			g_caps.supported |= m_device.supportsFamily(kMtlGPUFamilyApple7)
 				? BGFX_CAPS_PRIMITIVE_ID
 				? BGFX_CAPS_PRIMITIVE_ID
 				: 0
 				: 0
 				;
 				;
@@ -606,7 +606,7 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
 			// Reference(s):
 			// Reference(s):
 			// - Metal feature set tables
 			// - Metal feature set tables
 			//   https://web.archive.org/web/20230330111145/https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf
 			//   https://web.archive.org/web/20230330111145/https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf
-			g_caps.limits.maxTextureSize = m_device.supportsFamily(MTLGPUFamilyApple3) ? 16384 : 8192;
+			g_caps.limits.maxTextureSize = m_device.supportsFamily(kMtlGPUFamilyApple3) ? 16384 : 8192;
 			g_caps.limits.maxFBAttachments = 8;
 			g_caps.limits.maxFBAttachments = 8;
 			g_caps.supported |= m_device.supportsFamily(MTLGPUFamilyCommon2)
 			g_caps.supported |= m_device.supportsFamily(MTLGPUFamilyCommon2)
 				? BGFX_CAPS_DRAW_INDIRECT
 				? BGFX_CAPS_DRAW_INDIRECT