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

Internal/master

Author: UnityAljosha

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

@@ -0,0 +1,70 @@
+using System;
+using UnityEngine;
+using UnityEngine.Analytics;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.RenderGraphModule;
+
+namespace UnityEditor.Rendering.Analytics
+{
+    // schema = com.unity3d.data.schemas.editor.analytics.uRenderGraphViewerSessionCreated_v1
+    // taxonomy = editor.analytics.uRenderGraphViewerSessionCreated.v1
+    internal class RenderGraphViewerSessionCreatedAnalytic
+    {
+        const int k_MaxEventsPerHour = 1000;
+        const int k_MaxNumberOfElements = 1000;
+        const string k_VendorKey = "unity.srp";
+        const string k_EventName = "uRenderGraphViewerSessionCreated";
+
+        public enum SessionType
+        {
+            Local = 0,
+            Remote = 1
+        }
+
+        [AnalyticInfo(eventName: k_EventName, vendorKey: k_VendorKey, maxEventsPerHour: k_MaxEventsPerHour, maxNumberOfElements: k_MaxNumberOfElements)]
+        class Analytic : IAnalytic
+        {
+            public Analytic(SessionType sessionType, DebugMessageHandler.AnalyticsPayload payload)
+            {
+                using (GenericPool<Data>.Get(out var data))
+                {
+                    data.session_type = sessionType.ToString();
+                    data.graphics_device_type = payload.graphicsDeviceType.ToString();
+                    data.device_type = payload.deviceType.ToString();
+                    data.device_model = payload.deviceModel;
+                    data.gpu_vendor = payload.gpuVendor;
+                    data.gpu_name = payload.gpuName;
+
+                    m_Data = data;
+                }
+            }
+
+            [Serializable]
+            class Data : IAnalytic.IData
+            {
+                // Naming convention for analytics data
+                public string session_type;
+                public string graphics_device_type;
+                public string device_type;
+                public string device_model;
+                public string gpu_vendor;
+                public string gpu_name;
+            }
+
+            public bool TryGatherData(out IAnalytic.IData data, out Exception error)
+            {
+                data = m_Data;
+                error = null;
+                return true;
+            }
+
+            Data m_Data;
+        };
+
+        public static void Send(SessionType sessionType, DebugMessageHandler.AnalyticsPayload payload)
+        {
+            Analytic analytic = new Analytic(sessionType, payload);
+            AnalyticsUtils.SendData(analytic);
+        }
+    }
+}

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

@@ -58,6 +58,7 @@ class CommandBufferGenerator
 
         // Functions for compute only
         static List<FunctionInfo> computeFunctions = new List<FunctionInfo> {
+                "SetComputeParamsFromMaterial",
                 "SetComputeFloatParam",
                 "SetComputeIntParam",
                 "SetComputeVectorArrayParam",
@@ -68,11 +69,7 @@ class CommandBufferGenerator
                 new FunctionInfo("SetComputeTextureParam", textureArg: "rt"),
                 "SetComputeBufferParam",
                 "SetComputeConstantBufferParam",
-                "SetComputeFloatParam",
-                "SetComputeIntParam",
                 "SetComputeVectorParam",
-                "SetComputeVectorArrayParam",
-                "SetComputeMatrixParam",
                 "DispatchCompute",
                 "BuildRayTracingAccelerationStructure",
                 "SetRayTracingAccelerationStructure",
@@ -87,6 +84,7 @@ class CommandBufferGenerator
                 "SetRayTracingVectorArrayParam",
                 "SetRayTracingMatrixParam",
                 "SetRayTracingMatrixArrayParam",
+                "SetRayTracingShaderPass",
                 "DispatchRays",
                 "SetBufferData",
                 "SetBufferCounterValue",
@@ -119,6 +117,17 @@ class CommandBufferGenerator
                 "SetRenderTarget",
                 "Clear",
                 "RequestAsyncReadbackIntoNativeArray",
+                "RequestAsyncReadback",
+                "ClearRandomWriteTargets",
+                "SetRandomWriteTarget",
+                "CopyTexture",
+                "GenerateMips",
+                // Next APIs are already available in UnsafeCommandBuffer through compute or base functions lists,
+                // but the added overloads below relax safety rules to support texture parameters without texture handle usage.
+                new FunctionInfo("SetGlobalTexture", textureArg: "", modifiesGlobalState: true),
+                "SetRayTracingTextureParam",
+                "SetComputeTextureParam",
+                // End of added unsafe overloads
             };
         // Generated file header
         static string preamble =
@@ -129,6 +138,7 @@ class CommandBufferGenerator
 using UnityEngine.Profiling;
 using Unity.Profiling;
 using UnityEngine.Rendering.RenderGraphModule;
+using UnityEngine.Experimental.Rendering;
 
 // NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE
 //
@@ -255,28 +265,31 @@ static void GenerateCommandBufferType(string className, string docString, string
             BindingFlags flags = BindingFlags.Public | BindingFlags.Instance;
             var methods = commandBufferType.GetMethods(flags);
 
+            var allowedFuncInfoMethodList = new List<Tuple<FunctionInfo, MethodInfo>>();
+
+            // Filtering function list to only keep the ones existing in CommandBuffer
             foreach (var method in methods)
             {
-                bool allowed = false;
-                FunctionInfo info = new FunctionInfo();
                 foreach (var fn in functionList)
                 {
                     if (fn.name == method.Name)
-                    {
-                        allowed = true;
-                        info = fn;
-                        break;
-                    }
+                        allowedFuncInfoMethodList.Add(new Tuple<FunctionInfo, MethodInfo>(fn, method));
                 }
-                if (!allowed) continue;
+            }
 
+            // Generating function list, we can have duplicates due to overloads in methods and different support in the different functionLists (TextureHandle overload or not)
+            foreach (var allowedFuncInfoMethod in allowedFuncInfoMethodList)
+            {
                 StringBuilder argList = new StringBuilder();
                 StringBuilder typedArgList = new StringBuilder();
                 StringBuilder argDocList = new StringBuilder();
                 StringBuilder validationCode = new StringBuilder();
                 StringBuilder genericArgList = new StringBuilder();
                 StringBuilder genericConstraints = new StringBuilder();
 
+                var info = allowedFuncInfoMethod.Item1;
+                var method = allowedFuncInfoMethod.Item2;
+
                 if (info.modifiesGlobalState)
                 {
                     validationCode.Append("ThrowIfGlobalStateNotAllowed(); ");
@@ -326,7 +339,7 @@ static void GenerateCommandBufferType(string className, string docString, string
 
                 if (method.ContainsGenericParameters)
                 {
-                    // Hack: The current command buffer only inclues very simple single generic functions. We just hard code these but in the future we might need reflection on the generic arguments if needed.
+                    // Hack: The current command buffer only includes very simple single generic functions. We just hard code these but in the future we might need reflection on the generic arguments if needed.
                     genericArgList.Append("<T>");
                     genericConstraints.Append("where T : struct");
                     argDocList.Append("\n");

Packages/com.unity.render-pipelines.core/Editor/CommandBuffers/CommandBufferGenerator/CommandBufferGenerator.cs

@@ -537,7 +537,7 @@ void OnGUI()
                             if (dragging)
                             {
                                 splitterPos += Event.current.delta.x;
-                                splitterPos = Mathf.Clamp(splitterPos, minSideBarWidth, Screen.width - minContentWidth);
+                                splitterPos = Mathf.Clamp(splitterPos, minSideBarWidth, position.width - minContentWidth);
                                 Repaint();
                             }
                             break;

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs

@@ -647,7 +647,12 @@ public void Dispose()
 
         static bool m_IsInit = false;
         static BakingBatch m_BakingBatch;
-        static ProbeVolumeBakingSet m_BakingSet = null;
+        static ProbeVolumeBakingSetWeakReference m_BakingSetReference = new();
+        static ProbeVolumeBakingSet m_BakingSet
+        {
+            get => m_BakingSetReference.Get();
+            set => m_BakingSetReference.Set(value);
+        }
         static TouchupVolumeWithBoundsList s_AdjustmentVolumes;
 
         static Bounds globalBounds = new Bounds();