Merge branch 'master' into 6000.2-urp

# Conflicts:
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/ProjectVersion.txt

Author: JohannesDeml

Assets/Plugins/WebGL/WebBridge/CommonCommands.cs

@@ -66,6 +66,25 @@ public void LogMemory()
 			WebToolPlugins.LogMemory();
 		}
 
+		/// <summary>
+		/// Logs the rough device memory capped between 0.25 and 8 GB
+		/// Browser Usage: <code>unityGame.SendMessage("WebGL","LogDeviceMemory");</code>
+		/// </summary>
+		[WebCommand(Description = "Logs the device memory")]
+		[ContextMenu(nameof(LogDeviceMemory))]
+		public void LogDeviceMemory()
+		{
+			float deviceMemoryInMb = WebToolPlugins.GetDeviceMemory();
+			if (deviceMemoryInMb > 0)
+			{
+				Debug.Log($"Device Memory: {deviceMemoryInMb} GB");
+			}
+			else
+			{
+				Debug.Log("Device Memory information is not available on this device or browser.");
+			}
+		}
+
 		/// <summary>
 		/// Allocate memory to test memory usage and limits
 		/// The memory will be stored in a list to prevent it from being garbage collected

Assets/Plugins/WebGL/WebTools/WebToolPlugins.cs

@@ -35,6 +35,8 @@ public static class WebToolPlugins
 		[DllImport("__Internal")]
 		private static extern uint _GetTotalMemorySize();
 		[DllImport("__Internal")]
+		private static extern uint _GetDeviceMemorySize();
+		[DllImport("__Internal")]
 		private static extern bool _CopyToClipboard(string text);
 		[DllImport("__Internal")]
 		private static extern int _IsOnline();
@@ -191,6 +193,29 @@ public static float GetTotalMemorySize()
 #endif
 		}
 
+		/// <summary>
+		/// Get the device memory size in MB if supported by the browser
+		/// Uses navigator.deviceMemory which is supported by chromium based browsers
+		/// <see href="https://developer.mozilla.org/en-US/docs/Web/API/Navigator/deviceMemory"/>
+		/// </summary>
+		/// <returns>Size in MB or -1 if not supported</returns>
+		public static float GetDeviceMemory()
+		{
+#if UNITY_WEBGL && !UNITY_EDITOR
+			var gb = _GetDeviceMemorySize();
+			if (gb > 0)
+			{
+				return gb * 1024f; // convert to MB
+			}
+			return -1f;
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
+			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetDeviceMemory)} called");
+			return -1f;
+#else
+			return -1f;
+#endif
+		}
+
 		/// <summary>
 		/// Get the managed memory size used by the application in MB
 		/// </summary>

Assets/Plugins/WebGL/WebTools/WebToolPlugins.jslib

@@ -99,6 +99,14 @@ var WebGlPlugins =
         return -1;
     },
 
+    _GetDeviceMemorySize: function()
+    {
+        if(navigator.deviceMemory) {
+            return navigator.deviceMemory;
+        }
+        return -1;
+    },
+
     _CopyToClipboard: function(text) {
         var str = UTF8ToString(text);
         navigator.clipboard.writeText(str)