Remove memory calls that are not really supported anymore

Author: JohannesDeml

Assets/Plugins/WebGL/WebTools/WebToolPlugins.cs

@@ -34,10 +34,6 @@ public static class WebToolPlugins
 		private static extern string _GetUserAgent();
 		[DllImport("__Internal")]
 		private static extern uint _GetTotalMemorySize();
-		[DllImport("__Internal")]
-		private static extern uint _GetStaticMemorySize();
-		[DllImport("__Internal")]
-		private static extern uint _GetDynamicMemorySize();
 #endif
 
 		private static bool _infoPanelVisible = false;
@@ -154,82 +150,31 @@ public static bool IsMobileDevice()
 				userAgent.Contains("Android");
 		}
 
-		/// <summary>
-		/// Get the total memory size used by the application in MB
-		/// </summary>
-		/// <returns>Size in MB</returns>
-		public static float GetTotalMemorySize()
-		{
-#if UNITY_WEBGL && !UNITY_EDITOR
-			var bytes = _GetTotalMemorySize();
-			return GetMegaBytes(bytes);
-#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
-			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetTotalMemorySize)} called");
-			return -1f;
-#else
-			return -1f;
-#endif
-		}
-
 		/// <summary>
 		/// Log all current memory data in MB
 		/// </summary>
 		public static void LogMemory()
 		{
 #if UNITY_WEBGL && !UNITY_EDITOR
 			var managed = GetManagedMemorySize();
-			var native = GetNativeMemorySize();
 			var total = GetTotalMemorySize();
-			Debug.Log($"Memory stats:\nManaged: {managed:0.00}MB\nNative: {native:0.00}MB\nTotal: {total:0.00}MB");
+			Debug.Log($"Memory stats:\nManaged: {managed:0.00}MB\nTotal: {total:0.00}MB");
 #elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(LogMemory)} called");
 #endif
 		}
 
 		/// <summary>
-		/// Get the static memory size used by the application in MB
-		/// </summary>
-		/// <returns>Size in MB</returns>
-		public static float GetStaticMemorySize()
-		{
-#if UNITY_WEBGL && !UNITY_EDITOR
-			var bytes = _GetStaticMemorySize();
-			return GetMegaBytes(bytes);
-#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
-			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetStaticMemorySize)} called");
-			return -1f;
-#else
-			return -1f;
-#endif
-		}
-
-		/// <summary>
-		/// Get the dynamic memory size used by the application in MB
+		/// Get the total memory size used by the application in MB
 		/// </summary>
 		/// <returns>Size in MB</returns>
-		public static float GetDynamicMemorySize()
+		public static float GetTotalMemorySize()
 		{
 #if UNITY_WEBGL && !UNITY_EDITOR
-			var bytes = _GetStaticMemorySize();
+			var bytes = _GetTotalMemorySize();
 			return GetMegaBytes(bytes);
 #elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
-			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetDynamicMemorySize)} called");
-			return -1f;
-#else
-			return -1f;
-#endif
-		}
-
-		/// <summary>
-		/// Get the native memory size used by the application in MB (Static + Dynamic memory)
-		/// </summary>
-		/// <returns>Size in MB</returns>
-		public static float GetNativeMemorySize()
-		{
-#if UNITY_WEBGL && !UNITY_EDITOR
-			return GetDynamicMemorySize() + GetStaticMemorySize();
-#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
-			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetNativeMemorySize)} called");
+			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetTotalMemorySize)} called");
 			return -1f;
 #else
 			return -1f;

Assets/Plugins/WebGL/WebTools/WebToolPlugins.jslib

@@ -46,7 +46,7 @@ var WebGlPlugins =
         }
 
         var currentTimeRounded = currentTime.toFixed(2);
-        console.log('Time tracker event ' +eventNameText +': ' + currentTimeRounded + 'ms');
+        console.log('Time tracker event ' + eventNameText + ': ' + currentTimeRounded + 'ms');
     },
 
     _AddFpsTrackingEvent: function(fps) {
@@ -97,45 +97,6 @@ var WebGlPlugins =
 
         console.warn("Problem with retrieving total memory size");
         return -1;
-    },
-
-    _GetTotalStackSize: function()
-    {
-        if(typeof Module !== 'undefined' && typeof Module.STACK_SIZE !== 'undefined') {
-            return Module.STACK_SIZE;
-        }
-        if(typeof TOTAL_STACK !== 'undefined') {  // Legacy support
-            return TOTAL_STACK;
-        }
-
-        console.warn("Problem with retrieving stack size");
-        return -1;
-    },
-
-    _GetStaticMemorySize: function()
-    {
-        if(typeof Module !== 'undefined' && typeof Module.staticAlloc !== 'undefined') {
-            return Module.staticAlloc;
-        }
-        if(typeof STATICTOP !== 'undefined' && typeof STATIC_BASE !== 'undefined') {  // Legacy support
-            return STATICTOP - STATIC_BASE;
-        }
-
-        console.warn("Problem with retrieving static memory size");
-        return -1;
-    },
-
-    _GetDynamicMemorySize: function()
-    {
-        if(typeof Module !== 'undefined' && typeof Module.dynamicAlloc !== 'undefined') {
-            return Module.dynamicAlloc;
-        }
-        if(typeof HEAP32 !== 'undefined' && typeof DYNAMICTOP_PTR !== 'undefined' && typeof DYNAMIC_BASE !== 'undefined') {  // Legacy support
-            return HEAP32[DYNAMICTOP_PTR >> 2] - DYNAMIC_BASE;
-        }
-
-        console.warn("Problem with retrieving dynamic memory size");
-        return -1;
     }
 };