Graphics Performance Test Framework UIToolkit update and additional loadable scenes for tests

This PR aims to add changes to the Graphics Performance Tests Package. The changes were made while working on the performance tests for the URP version of the Fantasy Kingdom demo. Those tests will live in the Fantasy Kingdom repo. 

**PerformanceTests.cs** : Bug where scene name is the a substring in another scene name

**TestSceneAsset.cs**: Mostly come from Remi's PR. Added additionable scenes to add in build settings, added manual alias for RPAssets that shows up in test names

**TestSceneAssetEditor.cs**: Update editor to UIToolkit

Author: guillaumelevass

Tests/SRPTests/Packages/com.unity.testing.graphics-performance/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [17.2.0] - 2024-04-16
+- Converted Performance Tests Asset Editor to UIToolkit
+- Added additional loadable scenes to Test Scene asset
+- Added manually definable alias for Render Assets
+- Added R8G8B8A8_SRGB to the list of available color buffer Formats
+
 ## [17.1.2] - 2024-04-03
 
 - Update com.unity.render-pipelines.core dependency.

Tests/SRPTests/Packages/com.unity.testing.graphics-performance/Editor/Common/Boxed.uss

@@ -0,0 +1,20 @@
+Boxed
+{
+    background-color: var(--unity-colors-tab-background-checked);
+    border-color: var(--unity-colors-toolbar_button-border);
+    border-width: 1px 1px 1px 1px;
+    border-radius: 5px 5px 5px 5px;
+    padding: 3px 6px 3px 6px;
+    margin: 4px 0px 2px -10px;
+}
+
+Boxed > Toggle
+{
+    margin-left: 0px;
+}
+
+Boxed > Toggle Label
+{
+    -unity-font-style: bold;
+    -unity-text-align: middle-center;
+}

Tests/SRPTests/Packages/com.unity.testing.graphics-performance/Editor/Common/Boxed.uss.meta

@@ -12,6 +12,7 @@ public enum ColorBufferFormat
             R8G8B8A8 = GraphicsFormat.R8G8B8A8_SNorm,
             R16G16B16A16 = GraphicsFormat.R16G16B16A16_SFloat,
             R11G11B10 = GraphicsFormat.B10G11R11_UFloatPack32,
+            R8G8B8A8_SRGB = GraphicsFormat.R8G8B8A8_SRGB
         }
 
         [HideInInspector, System.NonSerialized]

Tests/SRPTests/Packages/com.unity.testing.graphics-performance/Editor/Common/TestSceneAssetEditor.cs

@@ -26,15 +26,7 @@ public void Setup()
             // Add all test scenes from the asset to the build settings:
             if (testScenesAsset)
             {
-                var testScenes = testScenesAsset.GetAllTests()
-                                                .Select(test =>
-                                                {
-                                                    var scene = SceneManager.GetSceneByName(test.sceneData.scene);
-                                                    var sceneGUID = AssetDatabase.FindAssets($"t:Scene {test.sceneData.scene}").FirstOrDefault();
-                                                    var scenePath = AssetDatabase.GUIDToAssetPath(sceneGUID);
-                                                    return new EditorBuildSettingsScene(scenePath, true);
-                                                });
-                EditorBuildSettings.scenes = testScenes.ToArray();
+                EditorBuildSettings.scenes = testScenesAsset.ConvertTestDataScenesToBuildSettings();
             }
 
             EditorUserBuildSettings.ps4HardwareTarget = PS4HardwareTarget.BaseOnly;

Tests/SRPTests/Packages/com.unity.testing.graphics-performance/Runtime/PerformanceTestSceneSettings.cs

@@ -2,68 +2,101 @@
 using UnityEngine;
 using System;
 using System.Linq;
+using UnityEditor;
 using UnityEngine.Rendering;
 using static UnityEngine.TestTools.Graphics.Performance.PerformanceMetricNames;
 
 namespace UnityEngine.TestTools.Graphics.Performance
 {
     [CreateAssetMenu(menuName = "Testing/Performance Test Description")]
     public class TestSceneAsset : ScriptableObject
+	{
+
+            [Serializable]
+    	    public class SceneData
+    	    {
+        	public string                   scene;
+        	public string                   sceneLabels;
+        	public string                   scenePath; //See also ScenePathUpdater
+        	public bool                     enabled;
+    	    }
+
+	    [Serializable]
+	    public class SRPAssetData
+	    {
+	        public RenderPipelineAsset  asset;
+	        public string               assetLabels;
+	        public string               alias; // reference named used in the test
+	    }
+
+    [Serializable]
+    public class SRPAssetDataAliasByHand : SRPAssetData { }
+
+    [Serializable]
+    public class TestSuiteData
     {
-        [Serializable]
-        public class SceneData
-        {
-            public string                   scene;
-            public string                   sceneLabels;
-            public string                   scenePath;
-            public bool                     enabled;
-        }
+        public List<SceneData>      scenes;
+        public List<SRPAssetData>   srpAssets;
 
-        [Serializable]
-        public class SRPAssetData
+        public IEnumerable<(SceneData sceneData, SRPAssetData assetData)> GetTestList()
         {
-            public RenderPipelineAsset  asset;
-            public string               assetLabels;
-            public string               alias; // reference named used in the test
+            foreach (var srpAsset in srpAssets)
+                foreach (var scene in scenes)
+                    if (scene.enabled)
+                        yield return (scene, srpAsset);
         }
+    }
 
-        [Serializable]
-        public class TestSuiteData
-        {
-            public List<SceneData>      scenes;
-            public List<SRPAssetData>   srpAssets;
-
-            public IEnumerable<(SceneData sceneData, SRPAssetData assetData)> GetTestList()
-            {
-                foreach (var srpAsset in srpAssets)
-                    foreach (var scene in scenes)
-                        if (scene.enabled)
-                            yield return (scene, srpAsset);
-            }
-        }
+    // Store the name of the scenes so we can load them at runtime
+    public TestSuiteData    counterTestSuite = new TestSuiteData();
+    public TestSuiteData    memoryTestSuite = new TestSuiteData();
+    public TestSuiteData    buildTestSuite = new TestSuiteData();
+
+    public List<SRPAssetDataAliasByHand> srpAssetAliases = new List<SRPAssetDataAliasByHand>();
+    public List<SceneData> additionalLoadableScenes = new List<SceneData>();
 
-        // Store the name of the scenes so we can load them at runtime
-        public TestSuiteData    counterTestSuite = new TestSuiteData();
-        public TestSuiteData    memoryTestSuite = new TestSuiteData();
-        public TestSuiteData    buildTestSuite = new TestSuiteData();
+    public IEnumerable<(SceneData sceneData, SRPAssetData assetData)> GetAllTests()
+    {
+        foreach (var test in counterTestSuite.GetTestList())
+            yield return test;
+        foreach (var test in memoryTestSuite.GetTestList())
+            yield return test;
+        foreach (var test in buildTestSuite.GetTestList())
+            yield return test;
+    }
 
-        public List<SRPAssetData> srpAssetAliases = new List<SRPAssetData>();
+    public string GetScenePath(string sceneName)
+        => GetAllTests().FirstOrDefault(s => s.sceneData.scene == sceneName).sceneData?.scenePath
+        ?? additionalLoadableScenes.FirstOrDefault(s => s.scene == sceneName)?.scenePath;
 
-        public IEnumerable<(SceneData sceneData, SRPAssetData assetData)> GetAllTests()
-        {
-            foreach (var test in counterTestSuite.GetTestList())
-                yield return test;
-            foreach (var test in memoryTestSuite.GetTestList())
-                yield return test;
-            foreach (var test in buildTestSuite.GetTestList())
-                yield return test;
-        }
+    public string GetSRPAssetAlias(RenderPipelineAsset srpAsset)
+        => srpAssetAliases.Where(a => a.asset == srpAsset).FirstOrDefault()?.alias;
+
+    IEnumerable<SceneData> GetAllSceneData()
+    {
+        foreach (var scene in counterTestSuite.scenes)
+            yield return scene;
+        foreach (var scene in memoryTestSuite.scenes)
+            yield return scene;
+        foreach (var scene in buildTestSuite.scenes)
+            yield return scene;
+        foreach (var scene in additionalLoadableScenes)
+            yield return scene;
+    }
 
-        public string GetScenePath(string sceneName) => GetAllTests().FirstOrDefault(s => s.sceneData.scene == sceneName).sceneData?.scenePath;
+#if UNITY_EDITOR
+    public UnityEditor.EditorBuildSettingsScene[] ConvertTestDataScenesToBuildSettings()
+    {
+        var scenesForTests = GetAllSceneData();
 
-        public string GetSRPAssetAlias(RenderPipelineAsset srpAsset) => srpAssetAliases.Where(a => a.asset == srpAsset).FirstOrDefault()?.alias;
+        var scenesForTestsConvertedBuildSettingsScenes =
+            scenesForTests.Select(x => new EditorBuildSettingsScene(x.scenePath, x.enabled)).ToArray();
+
+        return scenesForTestsConvertedBuildSettingsScenes;
     }
 
+#endif
+}
     public struct CounterTestDescription
     {
         public TestSceneAsset.SceneData    sceneData;

Tests/SRPTests/Packages/com.unity.testing.graphics-performance/Runtime/PerformanceTests.cs

@@ -3,7 +3,7 @@
     [
         {
              "ValidationTest": "NDA Filename Validation",
-             "PackageVersion": "17.1.1"
+             "PackageVersion": "17.2.0"
         }
     ]
 }

Tests/SRPTests/Packages/com.unity.testing.graphics-performance/Runtime/TestSceneAsset.cs

@@ -1,7 +1,7 @@
 {
   "name": "com.unity.testing.graphics-performance",
   "displayName": "Performance Graphics Tests Framework",
-  "version": "17.1.2",
+  "version": "17.2.0",
   "unity": "6000.0",
   "unityRelease": "0b15",
   "rootNamespace": "UnityEngine.TestTools.Graphics.Performance",