Fix external texture for metal (#1273)

bghgary · web-flow · commit b612a9073259 · 2023-08-14T13:34:04.000-07:00
Also add external texture plugin to Playground app so that it is at
least built
diff --git a/Apps/Playground/CMakeLists.txt b/Apps/Playground/CMakeLists.txt
@@ -116,6 +116,7 @@ target_link_libraries(Playground
     PRIVATE AppRuntime
     PRIVATE Canvas
     PRIVATE Console
+    PRIVATE ExternalTexture
     PRIVATE GraphicsDevice
     PRIVATE NativeCapture
     PRIVATE NativeEngine
diff --git a/Plugins/ExternalTexture/Source/ExternalTexture_Base.h b/Plugins/ExternalTexture/Source/ExternalTexture_Base.h
@@ -44,7 +44,7 @@ namespace Babylon::Plugins
             return mipLevel == static_cast<uint16_t>(std::floor(std::log2(std::max(static_cast<float>(width), static_cast<float>(height))) + 1));
         }
 
-        static auto RenderTargetSamplesToBgfxMsaaFlag(uint32_t renderTargetSamples)
+        static auto RenderTargetSamplesToBgfxMsaaFlag(uint64_t renderTargetSamples)
         {
             switch (renderTargetSamples)
             {
diff --git a/Plugins/ExternalTexture/Source/ExternalTexture_Metal.mm b/Plugins/ExternalTexture/Source/ExternalTexture_Metal.mm
@@ -39,21 +39,37 @@
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ATC
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ATCE
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ATCI
-    #if BX_PLATFORM_IOS && !TARGET_OS_MACCATALYST
+#if BX_PLATFORM_IOS && !TARGET_OS_MACCATALYST
         { MTLPixelFormatASTC_4x4_LDR,                   MTLPixelFormatASTC_4x4_sRGB                 }, // ASTC4x4
+        { MTLPixelFormatASTC_5x4_LDR,                   MTLPixelFormatASTC_5x4_sRGB                 }, // ASTC5x4
         { MTLPixelFormatASTC_5x5_LDR,                   MTLPixelFormatASTC_5x5_sRGB                 }, // ASTC5x5
+        { MTLPixelFormatASTC_6x5_LDR,                   MTLPixelFormatASTC_6x5_sRGB                 }, // ASTC6x5
         { MTLPixelFormatASTC_6x6_LDR,                   MTLPixelFormatASTC_6x6_sRGB                 }, // ASTC6x6
         { MTLPixelFormatASTC_8x5_LDR,                   MTLPixelFormatASTC_8x5_sRGB                 }, // ASTC8x5
         { MTLPixelFormatASTC_8x6_LDR,                   MTLPixelFormatASTC_8x6_sRGB                 }, // ASTC8x6
+        { MTLPixelFormatASTC_8x8_LDR,                   MTLPixelFormatASTC_8x8_sRGB                 }, // ASTC8x8
         { MTLPixelFormatASTC_10x5_LDR,                  MTLPixelFormatASTC_10x5_sRGB                }, // ASTC10x5
-    #else
+        { MTLPixelFormatASTC_10x6_LDR,                  MTLPixelFormatASTC_10x6_sRGB                }, // ASTC10x6
+        { MTLPixelFormatASTC_10x8_LDR,                  MTLPixelFormatASTC_10x8_sRGB                }, // ASTC10x8
+        { MTLPixelFormatASTC_10x10_LDR,                 MTLPixelFormatASTC_10x10_sRGB               }, // ASTC10x10
+        { MTLPixelFormatASTC_12x10_LDR,                 MTLPixelFormatASTC_12x10_sRGB               }, // ASTC12x10
+        { MTLPixelFormatASTC_12x12_LDR,                 MTLPixelFormatASTC_12x12_sRGB               }, // ASTC12x12
+#else
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC4x4
+        { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC5x4
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC5x5
+        { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC6x5
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC6x6
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC8x5
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC8x6
+        { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC8x8
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC10x5
-    #endif // BX_PLATFORM_IOS && !TARGET_OS_MACCATALYST
+        { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC10x6
+        { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC10x8
+        { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC10x10
+        { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC12x10
+        { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC12x12
+#endif // BX_PLATFORM_IOS && !TARGET_OS_MACCATALYST
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // Unknown
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // R1
         { MTLPixelFormatA8Unorm,                        MTLPixelFormatInvalid                       }, // A8
@@ -99,9 +115,12 @@
         { MTLPixelFormatRGBA32Sint,                     MTLPixelFormatInvalid                       }, // RGBA32I
         { MTLPixelFormatRGBA32Uint,                     MTLPixelFormatInvalid                       }, // RGBA32U
         { MTLPixelFormatRGBA32Float,                    MTLPixelFormatInvalid                       }, // RGBA32F
-        { MTLPixelFormat(40/*B5G6R5Unorm*/),            MTLPixelFormatInvalid                       }, // R5G6B5
-        { MTLPixelFormat(42/*ABGR4Unorm*/),             MTLPixelFormatInvalid                       }, // RGBA4
-        { MTLPixelFormat(41/*A1BGR5Unorm*/),            MTLPixelFormatInvalid                       }, // RGB5A1
+        { MTLPixelFormatB5G6R5Unorm,                    MTLPixelFormatInvalid                       }, // B5G6R5
+        { MTLPixelFormatB5G6R5Unorm,                    MTLPixelFormatInvalid                       }, // R5G6B5
+        { MTLPixelFormatABGR4Unorm,                     MTLPixelFormatInvalid                       }, // BGRA4
+        { MTLPixelFormatABGR4Unorm,                     MTLPixelFormatInvalid                       }, // RGBA4
+        { MTLPixelFormatBGR5A1Unorm,                    MTLPixelFormatInvalid                       }, // BGR5A1
+        { MTLPixelFormatBGR5A1Unorm,                    MTLPixelFormatInvalid                       }, // RGB5A1
         { MTLPixelFormatRGB10A2Unorm,                   MTLPixelFormatInvalid                       }, // RGB10A2
         { MTLPixelFormatRG11B10Float,                   MTLPixelFormatInvalid                       }, // RG11B10F
         { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // UnknownDepth

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ namespace Babylon::Plugins`
`44`	`44`	`return mipLevel == static_cast<uint16_t>(std::floor(std::log2(std::max(static_cast<float>(width), static_cast<float>(height))) + 1));`
`45`	`45`	`}`
`46`	`46`
`47`		`- static auto RenderTargetSamplesToBgfxMsaaFlag(uint32_t renderTargetSamples)`
	`47`	`+ static auto RenderTargetSamplesToBgfxMsaaFlag(uint64_t renderTargetSamples)`
`48`	`48`	`{`
`49`	`49`	`switch (renderTargetSamples)`
`50`	`50`	`{`