Merge pull request #8031 from Unity-Technologies/internal/master

Internal/master

Author: UnityAljosha

Packages/com.unity.render-pipelines.core/Editor/Analytics/AnalyticsUtils.cs

@@ -231,7 +231,6 @@ static string[] ToStringArray(Dictionary<string, string> diff)
         /// <param name="current">The current object to obtain the fields and values.</param>
         /// <param name="compareAndSimplifyWithDefault">If a comparison against the default value must be done.</param>
         /// <returns>The nested columns in form of {key.nestedKey : value} </returns>
-        /// <exception cref="ArgumentNullException"></exception>
         public static string[] ToNestedColumn<T>([DisallowNull] this T current, bool compareAndSimplifyWithDefault = false)
             where T : new()
         {
@@ -262,6 +261,28 @@ public static string[] ToNestedColumn<T>([DisallowNull] this T current, bool com
             return ToStringArray(diff);
         }
 
+        /// <summary>
+        /// Obtains the Serialized fields and values in form of nested columns for BigQuery
+        /// https://cloud.google.com/bigquery/docs/nested-repeated
+        /// </summary>
+        /// <typeparam name="T">The given type</typeparam>
+        /// <param name="current">The current object to obtain the fields and values.</param>
+        /// <param name="defaultInstance">The default instance to compare values</param>
+        /// <returns>The nested columns in form of {key.nestedKey : value} </returns>
+        public static string[] ToNestedColumn<T>([DisallowNull] this T current, T defaultInstance)
+        {
+            if (current == null)
+                throw new ArgumentNullException(nameof(current));
+
+            if (defaultInstance == null)
+                throw new ArgumentNullException(nameof(defaultInstance));
+
+            var type = current.GetType();
+
+            Dictionary<string, string> diff = GetDiffAsDictionary(type, current, defaultInstance);
+            return ToStringArray(diff);
+        }
+
 
         /// <summary>
         /// Obtains the Serialized fields and values in form of nested columns for BigQuery

Packages/com.unity.render-pipelines.core/Editor/Analytics/RenderPipelineGraphicsSettingsAnalytics.cs

@@ -0,0 +1,67 @@
+using System;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+using UnityEngine.Analytics;
+using UnityEngine.Rendering;
+
+namespace UnityEditor.Rendering
+{
+    class RenderPipelineGraphicsSettingsAnalytics : IPostprocessBuildWithReport
+    {
+        const int k_MaxEventsPerHour = 1000;
+        const int k_MaxNumberOfElements = 1000;
+        const string k_VendorKey = "unity.srp";
+        const string k_EventName = "uRenderPipelineGraphicsSettingsUsage";
+
+        [AnalyticInfo(eventName: k_EventName, vendorKey: k_VendorKey, maxEventsPerHour: k_MaxEventsPerHour, maxNumberOfElements: k_MaxNumberOfElements)]
+        public class Analytic : IAnalytic
+        {
+            [Serializable]
+            public struct AnalyticsData : IAnalytic.IData
+            {
+                public string settings;
+                public string[] usage;
+            }
+
+            public bool TryGatherData(out IAnalytic.IData data, out Exception error)
+            {
+                data = GatherDataToBeSent();
+                error = null;
+                return true;
+            }
+
+            public static IAnalytic.DataList<AnalyticsData> GatherDataToBeSent()
+            {
+                using (ListPool<AnalyticsData>.Get(out var tmp))
+                {
+                    GraphicsSettings.ForEach(settings =>
+                    {
+                        var settingsType = settings.GetType();
+                        var usage = settings.ToNestedColumn(Activator.CreateInstance(settingsType));
+                        if (usage.Length != 0)
+                            tmp.Add(new AnalyticsData() { settings = settingsType.FullName, usage = usage  });
+                    });
+
+                    return new IAnalytic.DataList<AnalyticsData>(tmp.ToArray());
+                }
+            }
+        }
+
+        static void SendUniversalEvent()
+        {
+            //The event shouldn't be able to report if this is disabled but if we know we're not going to report
+            //Lets early out and not waste time gathering all the data
+            if (!EditorAnalytics.enabled)
+                return;
+
+            Analytic analytic = new Analytic();
+            EditorAnalytics.SendAnalytic(analytic);
+        }
+
+        public int callbackOrder { get; }
+        public void OnPostprocessBuild(BuildReport report)
+        {
+            SendUniversalEvent();
+        }
+    }
+}

Packages/com.unity.render-pipelines.core/Editor/Analytics/RenderPipelineGraphicsSettingsAnalytics.cs.meta

@@ -52,25 +52,30 @@ private CoreBuildData(BuildTarget buildTarget)
             var asset = renderPipelineAssets[0];
             currentRenderPipelineAssetType = asset.GetType();
 
-            CheckGPUResidentDrawerUsage(asset);
+            CheckGPUResidentDrawerUsage();
         }
 
         private static CoreBuildData CreateInstance()
             => new(EditorUserBuildSettings.activeBuildTarget);
 
-        private void CheckGPUResidentDrawerUsage(RenderPipelineAsset asset)
+        private void CheckGPUResidentDrawerUsage()
         {
-            //We can check only the first as we don't support multiple pipeline type in player
-            pipelineSupportGPUResidentDrawer = asset is IGPUResidentRenderPipeline gpuResidentRenderPipeline && gpuResidentRenderPipeline.IsGPUResidentDrawerSupportedBySRP();
-            if (!pipelineSupportGPUResidentDrawer)
-                return;
-
-            foreach (IGPUResidentRenderPipeline gpuResidentPipelineAsset in renderPipelineAssets)
-                if (gpuResidentPipelineAsset.gpuResidentDrawerSettings.mode != GPUResidentDrawerMode.Disabled)
+            foreach (var renderPipelineAsset in renderPipelineAssets)
+            {
+                if (renderPipelineAsset is IGPUResidentRenderPipeline gpuResidentPipelineAsset
+                    && gpuResidentPipelineAsset.IsGPUResidentDrawerSupportedBySRP())
                 {
-                    playerNeedGPUResidentDrawer = true;
-                    break;
+                    // Record if any pipeline supports the GPU resident drawer
+                    pipelineSupportGPUResidentDrawer = true;
+
+                    // If any pipeline already has GPU resident drawer enabled, then record this and also early out
+                    if (gpuResidentPipelineAsset.gpuResidentDrawerSettings.mode != GPUResidentDrawerMode.Disabled)
+                    {
+                        playerNeedGPUResidentDrawer = true;
+                        break;
+                    }
                 }
+            }
 
             if (!playerNeedGPUResidentDrawer)
                 return;

Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/CoreBuildData.cs

@@ -5,15 +5,19 @@
 namespace UnityEditor.Rendering
 {
     /// <summary> UITK component to display header styled foldout</summary>
-    public class HeaderFoldout : Foldout
+    [UxmlElement]
+    public partial class HeaderFoldout : Foldout
     {
         const string k_StylesheetPathFormat = "Packages/com.unity.render-pipelines.core/Editor/StyleSheets/HeaderFoldout{0}.uss";
         const string k_Class = "header-foldout";
+        const string k_IconName = "header-foldout__icon";
 
         private string m_DocumentationURL;
+        private Texture2D m_Icon;
         private Func<GenericMenu> m_ContextMenuGenerator;
         private VisualElement m_HelpButton;
         private VisualElement m_ContextMenuButton;
+        private VisualElement m_IconElement;
 
         /// <summary>URL to use on documentation icon. If null, button don't show.</summary>
         public string documentationURL
@@ -29,7 +33,7 @@ public string documentationURL
             }
         }
 
-        /// <summary>Context menu to show on clic of the context button. If null, button don't show.</summary>
+        /// <summary>Context menu to show on click of the context button. If null, button don't show.</summary>
         public Func<GenericMenu> contextMenuGenerator //Use ImGUI for now
         {
             get => m_ContextMenuGenerator;
@@ -42,6 +46,21 @@ public string documentationURL
                 m_ContextMenuButton?.SetEnabled(m_ContextMenuGenerator != null);
             }
         }
+        
+        /// <summary>Optional icon image. If not set, no icon is shown.</summary>
+        public Texture2D icon
+        {
+            get => m_Icon;
+            set
+            {
+                if (m_Icon == value)
+                    return;
+
+                m_Icon = value;
+                m_IconElement.style.backgroundImage = Background.FromTexture2D(m_Icon);
+                m_IconElement.style.display = m_Icon != null ? DisplayStyle.Flex : DisplayStyle.None;
+            }
+        }
 
         /// <summary>Constructor</summary>
         public HeaderFoldout() : base()
@@ -61,6 +80,12 @@ public HeaderFoldout() : base()
             m_ContextMenuButton = new Button(Background.FromTexture2D(CoreEditorStyles.paneOptionsIcon), () => ShowMenu());
             m_ContextMenuButton.SetEnabled(m_ContextMenuGenerator != null);
             line.Add(m_ContextMenuButton);
+            
+            m_IconElement = new Image();
+            m_IconElement.name = k_IconName;
+            m_IconElement.style.display = DisplayStyle.None; // Disable by default, will be enabled if icon is set
+            // Delay insertion of icon to happen after foldout is constructed so we can put it in the right place
+            RegisterCallbackOnce<AttachToPanelEvent>(evt => line.Insert(1, m_IconElement));
         }
 
         void DelayedInit(AttachToPanelEvent evt)