From 486ec08392e4820cd487467ce7ee0c074738b9af Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 10 Jun 2026 21:18:40 +0900 Subject: [PATCH 01/21] remove errors --- .../Runtime/UTSGraphicsTests.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs index efe6d208d..2a1fdd806 100644 --- a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs +++ b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs @@ -24,7 +24,7 @@ public IEnumerator Run(GraphicsTestCase testCase) { Assert.Ignore(); } - string sceneFileName = Path.GetFileNameWithoutExtension(testCase.ScenePath); + string sceneFileName = Path.GetFileNameWithoutExtension(testCase.FullName); #if UTS_TEST_USE_HDRP && UNITY_STANDALONE_OSX @@ -47,14 +47,14 @@ public IEnumerator Run(GraphicsTestCase testCase) { //Manually load the reference image for XR. Ex: URP/Linear/WindowsEditor/Vulkan/None/AngelRing.png Assert.IsNotNull(testCase.ReferenceImage); - string imagePath = AssetDatabase.GetAssetPath(testCase.ReferenceImage); + string imagePath = testCase.ReferenceImage.AssetPath; string imageFileName = Path.GetFileName(imagePath); string imageFolderName = Path.GetDirectoryName(Path.GetDirectoryName(imagePath)); Assert.IsNotNull(imageFolderName); string xrImagePath = Path.Combine(imageFolderName, loadedXRDevice,imageFileName); - testCase.ReferenceImagePathLog = xrImagePath; Assert.IsTrue(File.Exists(xrImagePath),$"XR Reference image not found at: {xrImagePath}"); - testCase.ReferenceImage = AssetDatabase.LoadAssetAtPath(xrImagePath); + + testCase.ReferenceImage = new ReferenceImage(xrImagePath, testCase.ReferenceImage.TextureFormat); yield return UTSGraphicsTests.RunInternal(testCase, isXR:true); @@ -78,7 +78,7 @@ public IEnumerator Run(GraphicsTestCase testCase) { public static class UTSGraphicsTests { internal static IEnumerator RunInternal(GraphicsTestCase testCase, bool isXR = false) { - SceneManager.LoadScene(testCase.ScenePath); + SceneManager.LoadScene(testCase.FullName); // Always wait one frame for scene load yield return null; @@ -126,8 +126,8 @@ internal static IEnumerator RunInternal(GraphicsTestCase testCase, bool isXR = f for (int i = 0; i < waitFrames; i++) yield return new WaitForEndOfFrame(); - ImageAssert.AreEqual(testCase.ReferenceImage, mainCamera, - imageComparisonSettings, testCase.ReferenceImagePathLog); + ImageAssert.AreEqual(testCase.ReferenceImage.Image, mainCamera, + imageComparisonSettings, testCase.ReferenceImage.AssetPath); // [TODO-sin: 2025-12-23] Check memory allocations // try { From f566840efcac8f85e84e9ee0004c766f83c4e9ef Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 10 Jun 2026 21:57:04 +0900 Subject: [PATCH 02/21] some progress --- .../Runtime/UTSGraphicsTests.cs | 39 ++++++++++++++++--- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs index 2a1fdd806..3ca46e12d 100644 --- a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs +++ b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs @@ -14,9 +14,21 @@ namespace Unity.ToonShader.GraphicsTest public class UTSGraphicsTestsXR { [UnityTest] - [UseGraphicsTestCases(UTSGraphicsTestConstants.ReferenceImagePath)] + [SceneGraphicsTest( + scenePaths: new string[] { + "Assets/Scenes", +#if UTS_TEST_USE_HDRP + "Assets/ToonSamplesHDRP", +#elif UTS_TEST_USE_URP + "Assets/ToonSamplesURP", +#else + "Assets/ToonSamples", +#endif + } + )] + [Timeout(3600000)] //1 hour - public IEnumerator Run(GraphicsTestCase testCase) { + public IEnumerator Run(SceneGraphicsTestCase testCase) { //[TODO-sin: 2025-7-18] ECS projects were never tested with XR, and currently they don't support XR. string projectName = Path.GetFileName(Path.GetDirectoryName(UnityEngine.Application.dataPath)); @@ -67,9 +79,20 @@ public IEnumerator Run(GraphicsTestCase testCase) { public class UTSGraphicsTestsNonXR { [UnityTest] - [UseGraphicsTestCases(UTSGraphicsTestConstants.ReferenceImagePath)] + [SceneGraphicsTest( + scenePaths: new string[] { + "Assets/Scenes", +#if UTS_TEST_USE_HDRP + "Assets/ToonSamplesHDRP", +#elif UTS_TEST_USE_URP + "Assets/ToonSamplesURP", +#else + "Assets/ToonSamples", +#endif + } + )] [Timeout(3600000)] //1 hour - public IEnumerator Run(GraphicsTestCase testCase) { + public IEnumerator Run(SceneGraphicsTestCase testCase) { yield return UTSGraphicsTests.RunInternal(testCase); } } @@ -77,9 +100,13 @@ public IEnumerator Run(GraphicsTestCase testCase) { //---------------------------------------------------------------------------------------------------------------------- public static class UTSGraphicsTests { - internal static IEnumerator RunInternal(GraphicsTestCase testCase, bool isXR = false) { - SceneManager.LoadScene(testCase.FullName); + internal static IEnumerator RunInternal(SceneGraphicsTestCase testCase, bool isXR = false) { + SceneManager.LoadScene(testCase.ScenePath); + + + Debug.Log(testCase.ReferenceImage.AssetPath); + // Always wait one frame for scene load yield return null; From 8998bcee919f279364e40876dec595f3e01d7d5a Mon Sep 17 00:00:00 2001 From: sin Date: Thu, 11 Jun 2026 13:45:33 +0900 Subject: [PATCH 03/21] hack XR --- .../Runtime/UTSGraphicsTests.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs index 3ca46e12d..559edd585 100644 --- a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs +++ b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs @@ -5,6 +5,7 @@ using UnityEngine.TestTools.Graphics; using UnityEngine.SceneManagement; using System.IO; +using System.Reflection; using UnityEditor; @@ -55,7 +56,7 @@ public IEnumerator Run(SceneGraphicsTestCase testCase) { //Enable XR XRUtility.EnableXRInEditor(); - string loadedXRDevice = UseGraphicsTestCasesAttribute.LoadedXRDevice; + const string XR_DEVICE = "MockHMDLoader"; //Manually load the reference image for XR. Ex: URP/Linear/WindowsEditor/Vulkan/None/AngelRing.png Assert.IsNotNull(testCase.ReferenceImage); @@ -63,20 +64,28 @@ public IEnumerator Run(SceneGraphicsTestCase testCase) { string imageFileName = Path.GetFileName(imagePath); string imageFolderName = Path.GetDirectoryName(Path.GetDirectoryName(imagePath)); Assert.IsNotNull(imageFolderName); - string xrImagePath = Path.Combine(imageFolderName, loadedXRDevice,imageFileName); + string xrImagePath = Path.Combine(imageFolderName, XR_DEVICE,imageFileName); Assert.IsTrue(File.Exists(xrImagePath),$"XR Reference image not found at: {xrImagePath}"); - testCase.ReferenceImage = new ReferenceImage(xrImagePath, testCase.ReferenceImage.TextureFormat); - + //Hack to set the reference image to xr + SetRefImageAssetPath(testCase.ReferenceImage, xrImagePath); + yield return UTSGraphicsTests.RunInternal(testCase, isXR:true); XRUtility.DisableXR(); } + static readonly FieldInfo REF_IMAGE_ASSET_PATH_FIELD = + typeof(ReferenceImage).GetField("m_AssetPath", BindingFlags.NonPublic | BindingFlags.Instance); + + private static void SetRefImageAssetPath(ReferenceImage image, string path) + => REF_IMAGE_ASSET_PATH_FIELD.SetValue(image, path); } #endif //UNITY_EDITOR + + public class UTSGraphicsTestsNonXR { [UnityTest] [SceneGraphicsTest( From c6bd59c3a96a4601017bbef8995a61c42e0da76f Mon Sep 17 00:00:00 2001 From: sin Date: Thu, 11 Jun 2026 13:45:40 +0900 Subject: [PATCH 04/21] remove log --- com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs index 559edd585..403086cb4 100644 --- a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs +++ b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs @@ -112,9 +112,6 @@ public static class UTSGraphicsTests { internal static IEnumerator RunInternal(SceneGraphicsTestCase testCase, bool isXR = false) { SceneManager.LoadScene(testCase.ScenePath); - - - Debug.Log(testCase.ReferenceImage.AssetPath); // Always wait one frame for scene load yield return null; From 3c082b1b4a0642ffe4443e0f72188d45cccbf208 Mon Sep 17 00:00:00 2001 From: sin Date: Thu, 11 Jun 2026 14:40:40 +0900 Subject: [PATCH 05/21] hack. but works for XR [skip-ci] --- .../Runtime/UTSGraphicsTests.cs | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs index 403086cb4..ed541e762 100644 --- a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs +++ b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs @@ -68,8 +68,12 @@ public IEnumerator Run(SceneGraphicsTestCase testCase) { Assert.IsTrue(File.Exists(xrImagePath),$"XR Reference image not found at: {xrImagePath}"); //Hack to set the reference image to xr + var prefRefImage = testCase.ReferenceImage; + testCase.ReferenceImage = new ReferenceImage(prefRefImage.Name, prefRefImage.TextureFormat); + SetRefImageAssetPath(testCase.ReferenceImage, xrImagePath); + ClearLoadedImage(testCase.ReferenceImage); yield return UTSGraphicsTests.RunInternal(testCase, isXR:true); XRUtility.DisableXR(); @@ -80,6 +84,13 @@ public IEnumerator Run(SceneGraphicsTestCase testCase) { private static void SetRefImageAssetPath(ReferenceImage image, string path) => REF_IMAGE_ASSET_PATH_FIELD.SetValue(image, path); + + static readonly FieldInfo s_LoadedImageField = + typeof(ReferenceImage).GetField("m_LoadedImage", BindingFlags.NonPublic | BindingFlags.Instance); + + public static void ClearLoadedImage(ReferenceImage image) + => s_LoadedImageField.SetValue(image, null); + } #endif //UNITY_EDITOR @@ -112,6 +123,15 @@ public static class UTSGraphicsTests { internal static IEnumerator RunInternal(SceneGraphicsTestCase testCase, bool isXR = false) { SceneManager.LoadScene(testCase.ScenePath); + + Debug.Log(testCase.ReferenceImage.Image); + Debug.Log(testCase.ReferenceImage.Image); + Debug.Log(testCase.ReferenceImage.Image); + + Debug.Log(testCase.ReferenceImage.AssetPath); + Debug.Log(testCase.ReferenceImage.AssetPath); + Debug.Log(testCase.ReferenceImage.AssetPath); + Debug.Log(testCase.ReferenceImage.AssetPath); // Always wait one frame for scene load yield return null; From 2cce5eaeea2c579676aa3cbc9d538dd5f5dde10e Mon Sep 17 00:00:00 2001 From: sin Date: Thu, 11 Jun 2026 14:43:26 +0900 Subject: [PATCH 06/21] the package --- .../ToonURPTest-6000.3/Packages/manifest.json | 3 +- .../Packages/packages-lock.json | 47 +++---------------- .../ProjectSettings/ProjectSettings.asset | 20 +++++--- 3 files changed, 21 insertions(+), 49 deletions(-) diff --git a/TestProjects/ToonURPTest-6000.3/Packages/manifest.json b/TestProjects/ToonURPTest-6000.3/Packages/manifest.json index 9982a3371..d404b7d7c 100644 --- a/TestProjects/ToonURPTest-6000.3/Packages/manifest.json +++ b/TestProjects/ToonURPTest-6000.3/Packages/manifest.json @@ -5,9 +5,8 @@ "com.unity.inputsystem": "1.19.0", "com.unity.render-pipelines.universal": "17.3.0", "com.unity.test-framework": "1.6.0", - "com.unity.testframework.graphics": "8.13.2-exp.1", + "com.unity.testframework.graphics": "9.0.0-pre.8", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", - "com.unity.toon-reference-images": "file:../../../com.unity.toon-reference-images", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.0.0", "com.unity.xr.mock-hmd": "1.4.0-preview.2", diff --git a/TestProjects/ToonURPTest-6000.3/Packages/packages-lock.json b/TestProjects/ToonURPTest-6000.3/Packages/packages-lock.json index 2e0b704c0..fca00ac44 100644 --- a/TestProjects/ToonURPTest-6000.3/Packages/packages-lock.json +++ b/TestProjects/ToonURPTest-6000.3/Packages/packages-lock.json @@ -18,7 +18,7 @@ }, "com.unity.burst": { "version": "1.8.29", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -45,15 +45,6 @@ "source": "builtin", "dependencies": {} }, - "com.unity.external.test-protocol": { - "version": "2.0.0-exp.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0-preview" - }, - "url": "https://packages.unity.com" - }, "com.unity.film-internal-utilities": { "version": "0.20.0-preview", "depth": 1, @@ -169,13 +160,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.settings-manager": { - "version": "2.1.1", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.shadergraph": { "version": "17.3.0", "depth": 1, @@ -206,31 +190,18 @@ "url": "https://packages.unity.com" }, "com.unity.testframework.graphics": { - "version": "8.13.2-exp.1", + "version": "9.0.0-pre.8", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.xr": "1.0.0", - "com.unity.addressables": "1.28.1", - "com.unity.xr.management": "4.4.0", + "com.unity.burst": "1.8.27", + "com.unity.addressables": "2.7.6", + "com.unity.test-framework": "1.6.0", "com.unity.nuget.newtonsoft-json": "3.2.2", - "com.unity.xr.legacyinputhelpers": "2.1.13", - "com.unity.external.test-protocol": "2.0.0-exp.1", - "com.unity.testtools.codecoverage": "1.2.7", "com.unity.modules.imageconversion": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.testtools.codecoverage": { - "version": "1.3.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.4.5", - "com.unity.settings-manager": "2.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { "version": "1.8.12", "depth": 2, @@ -251,12 +222,6 @@ "com.unity.testframework.graphics": "8.12.0-exp.2" } }, - "com.unity.toon-reference-images": { - "version": "file:../../../com.unity.toon-reference-images", - "depth": 0, - "source": "local", - "dependencies": {} - }, "com.unity.toonshader": { "version": "file:../../../com.unity.toonshader", "depth": 0, @@ -286,7 +251,7 @@ }, "com.unity.xr.legacyinputhelpers": { "version": "2.1.13", - "depth": 1, + "depth": 2, "source": "registry", "dependencies": { "com.unity.modules.vr": "1.0.0", diff --git a/TestProjects/ToonURPTest-6000.3/ProjectSettings/ProjectSettings.asset b/TestProjects/ToonURPTest-6000.3/ProjectSettings/ProjectSettings.asset index ebd828b26..b49080498 100644 --- a/TestProjects/ToonURPTest-6000.3/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/ToonURPTest-6000.3/ProjectSettings/ProjectSettings.asset @@ -70,6 +70,7 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 + androidDisplayOptions: 1 androidBlitType: 0 androidResizeableActivity: 0 androidDefaultWindowWidth: 1920 @@ -113,6 +114,7 @@ PlayerSettings: xboxEnableGuest: 0 xboxEnablePIXSampling: 0 metalFramebufferOnly: 0 + metalUseMetalDisplayLink: 0 xboxOneResolution: 0 xboxOneSResolution: 0 xboxOneXResolution: 3 @@ -133,6 +135,7 @@ PlayerSettings: switchNVNMaxPublicSamplerIDCount: 0 switchMaxWorkerMultiple: 8 switchNVNGraphicsFirmwareMemory: 32 + switchGraphicsJobsSyncAfterKick: 1 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 @@ -172,9 +175,10 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 23 + AndroidMinSdkVersion: 25 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 + AndroidPreferredDataLocation: 1 aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 @@ -189,11 +193,11 @@ PlayerSettings: VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 iOSSimulatorArchitecture: 0 - iOSTargetOSVersionString: 13.0 + iOSTargetOSVersionString: 15.0 tvOSSdkVersion: 0 tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 13.0 + tvOSTargetOSVersionString: 15.0 VisionOSSdkVersion: 0 VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 @@ -263,6 +267,7 @@ PlayerSettings: useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 + AndroidAllowedArchitectures: -1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: @@ -523,7 +528,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: - macOSTargetOSVersion: 11.0 + macOSTargetOSVersion: 12.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -759,7 +764,7 @@ PlayerSettings: webGLModulesDirectory: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 - webGLUseEmbeddedResources: 0 + webGLUseEmbeddedResources: 1 webGLCompressionFormat: 0 webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 @@ -771,12 +776,12 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 - webGLEnableWebGPU: 0 webGLPowerPreference: 2 webGLWebAssemblyTable: 0 webGLWebAssemblyBigInt: 0 webGLCloseOnQuit: 0 webWasm2023: 0 + webEnableSubmoduleStrippingCompatibility: 0 scriptingDefineSymbols: Android: UNITY_POST_PROCESSING_STACK_V2 Lumin: UNITY_POST_PROCESSING_STACK_V2 @@ -899,3 +904,6 @@ PlayerSettings: insecureHttpOption: 0 androidVulkanDenyFilterList: [] androidVulkanAllowFilterList: [] + androidVulkanDeviceFilterListAsset: {fileID: 0} + d3d12DeviceFilterListAsset: {fileID: 0} + allowedHttpConnections: 3 From 00fa6cd5909c1d54acaa7aea437be8bf21a8a0ab Mon Sep 17 00:00:00 2001 From: sin Date: Thu, 11 Jun 2026 14:43:40 +0900 Subject: [PATCH 07/21] symlink --- TestProjects/ToonURPTest-6000.3/Assets/ReferenceImages | 1 + .../ToonURPTest-6000.3/Assets/ReferenceImages.meta | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 120000 TestProjects/ToonURPTest-6000.3/Assets/ReferenceImages create mode 100644 TestProjects/ToonURPTest-6000.3/Assets/ReferenceImages.meta diff --git a/TestProjects/ToonURPTest-6000.3/Assets/ReferenceImages b/TestProjects/ToonURPTest-6000.3/Assets/ReferenceImages new file mode 120000 index 000000000..bb4c0e306 --- /dev/null +++ b/TestProjects/ToonURPTest-6000.3/Assets/ReferenceImages @@ -0,0 +1 @@ +../../../com.unity.toon-reference-images/URP \ No newline at end of file diff --git a/TestProjects/ToonURPTest-6000.3/Assets/ReferenceImages.meta b/TestProjects/ToonURPTest-6000.3/Assets/ReferenceImages.meta new file mode 100644 index 000000000..ee81f46ae --- /dev/null +++ b/TestProjects/ToonURPTest-6000.3/Assets/ReferenceImages.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd75de7180d009649ae148cccfae6df5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 416be4b47186be07855a996e8a34469d7120ab0b Mon Sep 17 00:00:00 2001 From: sin Date: Thu, 11 Jun 2026 14:43:56 +0900 Subject: [PATCH 08/21] BuildSettings [skip ci] --- .../Resources/GraphicsTestBuildSettings.asset | 114 ++++++++++++++++++ .../GraphicsTestBuildSettings.asset.meta | 8 ++ 2 files changed, 122 insertions(+) create mode 100644 TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset create mode 100644 TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset.meta diff --git a/TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset b/TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset new file mode 100644 index 000000000..8709bd6d5 --- /dev/null +++ b/TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset @@ -0,0 +1,114 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac8020f36911b4458ec9257ceb20861, type: 3} + m_Name: GraphicsTestBuildSettings + m_EditorClassIdentifier: UnityEngine.TestTools.Graphics::UnityEngine.TestTools.Graphics.GraphicsTestBuildSettings + m_AutoBuildTestCases: 1 + m_TestContentBundlePaths: [] + m_ImageResultsPath: + m_SaveActualImages: 0 + m_OverrideIgnoreAttributes: 0 + m_ShaderWarningsAsErrors: 0 + m_PreviousScenesPaths: + - Assets/ToonSamplesURP/Scenes/AngelRing/AngelRing.unity + - Assets/ToonSamplesURP/Scenes/BoxProjection/BoxProjection.unity + - Assets/ToonSamplesURP/Scenes/Cube_HardEdge/Cube_HardEdge.unity + - Assets/ToonSamplesURP/Scenes/EmissiveAnimation/EmissiveAnimation.unity + - Assets/ToonSamplesURP/Scenes/LightAndShadows_BakedLight/LightAndShadows_BakedLight.unity + - Assets/ToonSamplesURP/Scenes/MatCapMask/MatCapMask.unity + - Assets/ToonSamplesURP/Scenes/Mirror/MirrorTest.unity + - Assets/ToonSamplesURP/Scenes/NormalMap/NormalMap.unity + - Assets/ToonSamplesURP/Scenes/PointLightTest/PointLightTest.unity + - Assets/ToonSamplesURP/Scenes/KageBall/KageBall.unity + - Assets/ToonSamplesURP/Scenes/SceneLights Hi-Cut_Filter Test/SceneLights Hi-Cut_Filter + Test.unity + - Assets/ToonSamplesURP/Scenes/ShaderBall/ShaderBall.unity + - Assets/ToonSamplesURP/Scenes/UnityChan/UnityChan.unity + - Assets/ToonSamplesURP/Scenes/UnityChan_CelLook/UnityChan_CelLook.unity + - Assets/ToonSamplesURP/Scenes/UnityChan_Emissive/UnityChan_Emissive.unity + - Assets/ToonSamplesURP/Scenes/UnityChan_Firefly/UnityChan_Firefly.unity + - Assets/ToonSamplesURP/Scenes/UnityChan_LightCulling/UnityChan_LightCulling.unity + - Assets/Scenes/MetaverseOutlineLighting/OutlineLighting03_Color.unity + - Assets/Scenes/MetaverseOutlineLighting/OutlineLighting02_Gradient.unity + - Assets/Scenes/MetaverseOutlineLighting/OutlineLighting01_Skybox.unity + - Assets/ScenesDev/BallsAndPlanes2D/BallsAndPlanes2D.unity + - Assets/ScenesDev/UnityChan_3Das2D/UnityChan_3Das2D.unity + - Assets/Scenes/BallsAndPlanesSSS/BallsAndPlanesSSS.unity + m_PreviousScenesEnabled: 0101010101010101010101010101010101010101010101 + m_ReloadDomainWhenEditingTestSceneAssets: 1 + m_AutoOptimizeReferenceImages: 0 + m_EnableShaderStripping: 1 + m_ShouldCleanUpAfterBuild: 0 + m_HeatmapColorScheme: 2 + m_MaxConcurrentImageOptimizations: 12 + m_PlatformSchemata: + - name: Default + rootPath: Assets/ReferenceImages + nodes: + - ColorSpace + - RuntimePlatform + - Architecture + - GraphicsDeviceType + - XrDevice + typeString: UnityEngine.ColorSpace, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null;UnityEngine.RuntimePlatform, UnityEngine.CoreModule, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null;System.Runtime.InteropServices.Architecture, + mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;UnityEngine.Rendering.GraphicsDeviceType, + UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null;UnityEngine.TestTools.Graphics.Platforms.XrDevice, + UnityEngine.TestTools.Graphics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - name: Default Base + rootPath: Assets/ReferenceImagesBase + nodes: [] + typeString: + m_BuildPlatformSchemata: + - name: Default + rootPath: Assets/ReferenceImages + nodes: + - ColorSpace + - RuntimePlatform + - Architecture + - GraphicsDeviceType + - XrDevice + typeString: UnityEngine.ColorSpace, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null;UnityEngine.RuntimePlatform, UnityEngine.CoreModule, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null;System.Runtime.InteropServices.Architecture, + mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;UnityEngine.Rendering.GraphicsDeviceType, + UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null;UnityEngine.TestTools.Graphics.Platforms.XrDevice, + UnityEngine.TestTools.Graphics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - name: Default Base + rootPath: Assets/ReferenceImagesBase + nodes: [] + typeString: + m_BuildPlatformNames: + - default-linear-windowseditor-vulkan-mockhmdloader + - default-base- + m_SceneLists: + - {fileID: 2388462734650195677} +--- !u!114 &2388462734650195677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: afc2435270e0c4dad876e4878f1c336d, type: 3} + m_Name: Run + m_EditorClassIdentifier: UnityEngine.TestTools.Graphics::UnityEngine.TestTools.Graphics.SceneList + scenePaths: + - Assets/ToonSamplesURP/Scenes/AngelRing/AngelRing.unity + id: + typeName: Unity.ToonShader.GraphicsTest.UTSGraphicsTestsNonXR + methodName: Run + parameterTypeNames: + - UnityEngine.TestTools.Graphics.SceneGraphicsTestCase diff --git a/TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset.meta b/TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset.meta new file mode 100644 index 000000000..4f0ec751a --- /dev/null +++ b/TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab59b2b416ce14c40a12abdbcc844b64 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: From 81126657a7eb8f7afb81a9ab91c180d786a91e8c Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 14:37:58 +0900 Subject: [PATCH 09/21] update graphicstest package --- .../ToonURPTest-6000.0/Packages/manifest.json | 2 +- .../Packages/packages-lock.json | 43 +++---------------- 2 files changed, 8 insertions(+), 37 deletions(-) diff --git a/TestProjects/ToonURPTest-6000.0/Packages/manifest.json b/TestProjects/ToonURPTest-6000.0/Packages/manifest.json index f0f8e9338..58bc46d77 100644 --- a/TestProjects/ToonURPTest-6000.0/Packages/manifest.json +++ b/TestProjects/ToonURPTest-6000.0/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.inputsystem": "1.19.0", "com.unity.render-pipelines.universal": "17.0.4", "com.unity.test-framework": "1.6.0", - "com.unity.testframework.graphics": "8.13.2-exp.1", + "com.unity.testframework.graphics": "9.0.0-pre.12", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", "com.unity.toon-reference-images": "file:../../../com.unity.toon-reference-images", "com.unity.toonshader": "file:../../../com.unity.toonshader", diff --git a/TestProjects/ToonURPTest-6000.0/Packages/packages-lock.json b/TestProjects/ToonURPTest-6000.0/Packages/packages-lock.json index 4d8d0b349..138da114d 100644 --- a/TestProjects/ToonURPTest-6000.0/Packages/packages-lock.json +++ b/TestProjects/ToonURPTest-6000.0/Packages/packages-lock.json @@ -18,7 +18,7 @@ }, "com.unity.burst": { "version": "1.8.29", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -45,15 +45,6 @@ "source": "builtin", "dependencies": {} }, - "com.unity.external.test-protocol": { - "version": "2.0.0-exp.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0-preview" - }, - "url": "https://packages.unity.com" - }, "com.unity.film-internal-utilities": { "version": "0.20.0-preview", "depth": 1, @@ -180,13 +171,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.settings-manager": { - "version": "2.1.0", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.shadergraph": { "version": "17.0.4", "depth": 1, @@ -217,31 +201,18 @@ "url": "https://packages.unity.com" }, "com.unity.testframework.graphics": { - "version": "8.13.2-exp.1", + "version": "9.0.0-pre.12", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.xr": "1.0.0", - "com.unity.addressables": "1.28.1", - "com.unity.xr.management": "4.4.0", + "com.unity.burst": "1.8.27", + "com.unity.addressables": "2.7.6", + "com.unity.test-framework": "1.6.0", "com.unity.nuget.newtonsoft-json": "3.2.2", - "com.unity.xr.legacyinputhelpers": "2.1.13", - "com.unity.external.test-protocol": "2.0.0-exp.1", - "com.unity.testtools.codecoverage": "1.2.7", "com.unity.modules.imageconversion": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.testtools.codecoverage": { - "version": "1.3.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.4.5", - "com.unity.settings-manager": "2.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { "version": "1.8.12", "depth": 2, @@ -296,8 +267,8 @@ "url": "https://packages.unity.com" }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.13", - "depth": 1, + "version": "2.1.12", + "depth": 2, "source": "registry", "dependencies": { "com.unity.modules.vr": "1.0.0", From aac89fbc452da25ed53e4ed4e042d4d5bbb0ef5c Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 14:53:47 +0900 Subject: [PATCH 10/21] move GraphicsTestBuildSettings --- .../GraphicsTestBuildSettings.asset | 0 .../GraphicsTestBuildSettings.asset.meta | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {TestProjects/ToonURPTest-6000.3/Assets/Resources => com.unity.toon-resources}/GraphicsTestBuildSettings.asset (100%) rename {TestProjects/ToonURPTest-6000.3/Assets/Resources => com.unity.toon-resources}/GraphicsTestBuildSettings.asset.meta (100%) diff --git a/TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset b/com.unity.toon-resources/GraphicsTestBuildSettings.asset similarity index 100% rename from TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset rename to com.unity.toon-resources/GraphicsTestBuildSettings.asset diff --git a/TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset.meta b/com.unity.toon-resources/GraphicsTestBuildSettings.asset.meta similarity index 100% rename from TestProjects/ToonURPTest-6000.3/Assets/Resources/GraphicsTestBuildSettings.asset.meta rename to com.unity.toon-resources/GraphicsTestBuildSettings.asset.meta From 9b057b224b2c8f592e2acb0c3d587509a6181fbf Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 15:25:47 +0900 Subject: [PATCH 11/21] Resources symlink --- TestProjects/ToonBuiltInRPTest-6000.0/Assets/Resources | 1 + TestProjects/ToonHDRPTest-6000.0/Assets/Resources | 1 + TestProjects/ToonHDRPTestDX12-6000.0/Assets/Resources | 1 + .../ToonURPResidentDrawerGraphicsTest-6000.0/Assets/Resources | 1 + TestProjects/ToonURPTest-6000.0/Assets/Resources | 1 + TestProjects/ToonURPTest-6000.3/Assets/Resources | 1 + TestProjects/ToonURPTest-6000.6/Assets/Resources | 1 + TestProjects/ToonURPTestECS-6000.0/Assets/Resources | 1 + 8 files changed, 8 insertions(+) create mode 120000 TestProjects/ToonBuiltInRPTest-6000.0/Assets/Resources create mode 120000 TestProjects/ToonHDRPTest-6000.0/Assets/Resources create mode 120000 TestProjects/ToonHDRPTestDX12-6000.0/Assets/Resources create mode 120000 TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Assets/Resources create mode 120000 TestProjects/ToonURPTest-6000.0/Assets/Resources create mode 120000 TestProjects/ToonURPTest-6000.3/Assets/Resources create mode 120000 TestProjects/ToonURPTest-6000.6/Assets/Resources create mode 120000 TestProjects/ToonURPTestECS-6000.0/Assets/Resources diff --git a/TestProjects/ToonBuiltInRPTest-6000.0/Assets/Resources b/TestProjects/ToonBuiltInRPTest-6000.0/Assets/Resources new file mode 120000 index 000000000..ded6a4b94 --- /dev/null +++ b/TestProjects/ToonBuiltInRPTest-6000.0/Assets/Resources @@ -0,0 +1 @@ +../../../com.unity.toon-resources \ No newline at end of file diff --git a/TestProjects/ToonHDRPTest-6000.0/Assets/Resources b/TestProjects/ToonHDRPTest-6000.0/Assets/Resources new file mode 120000 index 000000000..ded6a4b94 --- /dev/null +++ b/TestProjects/ToonHDRPTest-6000.0/Assets/Resources @@ -0,0 +1 @@ +../../../com.unity.toon-resources \ No newline at end of file diff --git a/TestProjects/ToonHDRPTestDX12-6000.0/Assets/Resources b/TestProjects/ToonHDRPTestDX12-6000.0/Assets/Resources new file mode 120000 index 000000000..ded6a4b94 --- /dev/null +++ b/TestProjects/ToonHDRPTestDX12-6000.0/Assets/Resources @@ -0,0 +1 @@ +../../../com.unity.toon-resources \ No newline at end of file diff --git a/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Assets/Resources b/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Assets/Resources new file mode 120000 index 000000000..ded6a4b94 --- /dev/null +++ b/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Assets/Resources @@ -0,0 +1 @@ +../../../com.unity.toon-resources \ No newline at end of file diff --git a/TestProjects/ToonURPTest-6000.0/Assets/Resources b/TestProjects/ToonURPTest-6000.0/Assets/Resources new file mode 120000 index 000000000..ded6a4b94 --- /dev/null +++ b/TestProjects/ToonURPTest-6000.0/Assets/Resources @@ -0,0 +1 @@ +../../../com.unity.toon-resources \ No newline at end of file diff --git a/TestProjects/ToonURPTest-6000.3/Assets/Resources b/TestProjects/ToonURPTest-6000.3/Assets/Resources new file mode 120000 index 000000000..ded6a4b94 --- /dev/null +++ b/TestProjects/ToonURPTest-6000.3/Assets/Resources @@ -0,0 +1 @@ +../../../com.unity.toon-resources \ No newline at end of file diff --git a/TestProjects/ToonURPTest-6000.6/Assets/Resources b/TestProjects/ToonURPTest-6000.6/Assets/Resources new file mode 120000 index 000000000..ded6a4b94 --- /dev/null +++ b/TestProjects/ToonURPTest-6000.6/Assets/Resources @@ -0,0 +1 @@ +../../../com.unity.toon-resources \ No newline at end of file diff --git a/TestProjects/ToonURPTestECS-6000.0/Assets/Resources b/TestProjects/ToonURPTestECS-6000.0/Assets/Resources new file mode 120000 index 000000000..ded6a4b94 --- /dev/null +++ b/TestProjects/ToonURPTestECS-6000.0/Assets/Resources @@ -0,0 +1 @@ +../../../com.unity.toon-resources \ No newline at end of file From ccff128756082b6571e2d6177436171c10360e34 Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 15:27:26 +0900 Subject: [PATCH 12/21] ReferenceImages symlink --- TestProjects/ToonBuiltInRPTest-6000.0/Assets/ReferenceImages | 1 + TestProjects/ToonHDRPTest-6000.0/Assets/ReferenceImages | 1 + TestProjects/ToonHDRPTestDX12-6000.0/Assets/ReferenceImages | 1 + .../Assets/ReferenceImages | 1 + TestProjects/ToonURPTest-6000.0/Assets/ReferenceImages | 1 + TestProjects/ToonURPTest-6000.6/Assets/ReferenceImages | 1 + TestProjects/ToonURPTestECS-6000.0/Assets/ReferenceImages | 1 + 7 files changed, 7 insertions(+) create mode 120000 TestProjects/ToonBuiltInRPTest-6000.0/Assets/ReferenceImages create mode 120000 TestProjects/ToonHDRPTest-6000.0/Assets/ReferenceImages create mode 120000 TestProjects/ToonHDRPTestDX12-6000.0/Assets/ReferenceImages create mode 120000 TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Assets/ReferenceImages create mode 120000 TestProjects/ToonURPTest-6000.0/Assets/ReferenceImages create mode 120000 TestProjects/ToonURPTest-6000.6/Assets/ReferenceImages create mode 120000 TestProjects/ToonURPTestECS-6000.0/Assets/ReferenceImages diff --git a/TestProjects/ToonBuiltInRPTest-6000.0/Assets/ReferenceImages b/TestProjects/ToonBuiltInRPTest-6000.0/Assets/ReferenceImages new file mode 120000 index 000000000..95a3a10d2 --- /dev/null +++ b/TestProjects/ToonBuiltInRPTest-6000.0/Assets/ReferenceImages @@ -0,0 +1 @@ +../../../com.unity.toon-reference-images/Built-In \ No newline at end of file diff --git a/TestProjects/ToonHDRPTest-6000.0/Assets/ReferenceImages b/TestProjects/ToonHDRPTest-6000.0/Assets/ReferenceImages new file mode 120000 index 000000000..03211e59a --- /dev/null +++ b/TestProjects/ToonHDRPTest-6000.0/Assets/ReferenceImages @@ -0,0 +1 @@ +../../../com.unity.toon-reference-images/HDRP \ No newline at end of file diff --git a/TestProjects/ToonHDRPTestDX12-6000.0/Assets/ReferenceImages b/TestProjects/ToonHDRPTestDX12-6000.0/Assets/ReferenceImages new file mode 120000 index 000000000..03211e59a --- /dev/null +++ b/TestProjects/ToonHDRPTestDX12-6000.0/Assets/ReferenceImages @@ -0,0 +1 @@ +../../../com.unity.toon-reference-images/HDRP \ No newline at end of file diff --git a/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Assets/ReferenceImages b/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Assets/ReferenceImages new file mode 120000 index 000000000..bb4c0e306 --- /dev/null +++ b/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Assets/ReferenceImages @@ -0,0 +1 @@ +../../../com.unity.toon-reference-images/URP \ No newline at end of file diff --git a/TestProjects/ToonURPTest-6000.0/Assets/ReferenceImages b/TestProjects/ToonURPTest-6000.0/Assets/ReferenceImages new file mode 120000 index 000000000..bb4c0e306 --- /dev/null +++ b/TestProjects/ToonURPTest-6000.0/Assets/ReferenceImages @@ -0,0 +1 @@ +../../../com.unity.toon-reference-images/URP \ No newline at end of file diff --git a/TestProjects/ToonURPTest-6000.6/Assets/ReferenceImages b/TestProjects/ToonURPTest-6000.6/Assets/ReferenceImages new file mode 120000 index 000000000..bb4c0e306 --- /dev/null +++ b/TestProjects/ToonURPTest-6000.6/Assets/ReferenceImages @@ -0,0 +1 @@ +../../../com.unity.toon-reference-images/URP \ No newline at end of file diff --git a/TestProjects/ToonURPTestECS-6000.0/Assets/ReferenceImages b/TestProjects/ToonURPTestECS-6000.0/Assets/ReferenceImages new file mode 120000 index 000000000..bb4c0e306 --- /dev/null +++ b/TestProjects/ToonURPTestECS-6000.0/Assets/ReferenceImages @@ -0,0 +1 @@ +../../../com.unity.toon-reference-images/URP \ No newline at end of file From 69f6aa77e4e6857c110234cb2a9bef980671904c Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 15:28:44 +0900 Subject: [PATCH 13/21] remove toon reference images from manifest.json --- TestProjects/ToonBuiltInRPTest-6000.0/Packages/manifest.json | 1 - TestProjects/ToonHDRPTest-6000.0/Packages/manifest.json | 1 - TestProjects/ToonHDRPTestDX12-6000.0/Packages/manifest.json | 1 - .../Packages/manifest.json | 1 - TestProjects/ToonURPTest-6000.0/Packages/manifest.json | 1 - TestProjects/ToonURPTest-6000.6/Packages/manifest.json | 1 - TestProjects/ToonURPTestECS-6000.0/Packages/manifest.json | 1 - 7 files changed, 7 deletions(-) diff --git a/TestProjects/ToonBuiltInRPTest-6000.0/Packages/manifest.json b/TestProjects/ToonBuiltInRPTest-6000.0/Packages/manifest.json index d802d6596..cb9c9ed02 100644 --- a/TestProjects/ToonBuiltInRPTest-6000.0/Packages/manifest.json +++ b/TestProjects/ToonBuiltInRPTest-6000.0/Packages/manifest.json @@ -7,7 +7,6 @@ "com.unity.test-framework": "1.6.0", "com.unity.testframework.graphics": "8.13.2-exp.1", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", - "com.unity.toon-reference-images": "file:../../../com.unity.toon-reference-images", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.0.0", "com.unity.xr.mock-hmd": "1.4.0-preview.2", diff --git a/TestProjects/ToonHDRPTest-6000.0/Packages/manifest.json b/TestProjects/ToonHDRPTest-6000.0/Packages/manifest.json index 9edd35144..23c763a98 100644 --- a/TestProjects/ToonHDRPTest-6000.0/Packages/manifest.json +++ b/TestProjects/ToonHDRPTest-6000.0/Packages/manifest.json @@ -10,7 +10,6 @@ "com.unity.test-framework": "1.6.0", "com.unity.testframework.graphics": "8.13.2-exp.1", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", - "com.unity.toon-reference-images": "file:../../../com.unity.toon-reference-images", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.0.0", "com.unity.xr.management": "4.5.4", diff --git a/TestProjects/ToonHDRPTestDX12-6000.0/Packages/manifest.json b/TestProjects/ToonHDRPTestDX12-6000.0/Packages/manifest.json index 8e0219188..75adbc551 100644 --- a/TestProjects/ToonHDRPTestDX12-6000.0/Packages/manifest.json +++ b/TestProjects/ToonHDRPTestDX12-6000.0/Packages/manifest.json @@ -9,7 +9,6 @@ "com.unity.test-framework": "1.6.0", "com.unity.testframework.graphics": "8.13.2-exp.1", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", - "com.unity.toon-reference-images": "file:../../../com.unity.toon-reference-images", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.0.0", "com.unity.xr.management": "4.5.4", diff --git a/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/manifest.json b/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/manifest.json index 4c8d7c49c..22f91efd6 100644 --- a/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/manifest.json +++ b/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/manifest.json @@ -8,7 +8,6 @@ "com.unity.test-framework": "1.6.0", "com.unity.timeline": "1.8.12", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", - "com.unity.toon-reference-images": "file:../../../com.unity.toon-reference-images", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.0.0", "com.unity.xr.mock-hmd": "1.4.0-preview.2", diff --git a/TestProjects/ToonURPTest-6000.0/Packages/manifest.json b/TestProjects/ToonURPTest-6000.0/Packages/manifest.json index 58bc46d77..8eceecff4 100644 --- a/TestProjects/ToonURPTest-6000.0/Packages/manifest.json +++ b/TestProjects/ToonURPTest-6000.0/Packages/manifest.json @@ -7,7 +7,6 @@ "com.unity.test-framework": "1.6.0", "com.unity.testframework.graphics": "9.0.0-pre.12", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", - "com.unity.toon-reference-images": "file:../../../com.unity.toon-reference-images", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.0.0", "com.unity.xr.mock-hmd": "1.4.0-preview.2", diff --git a/TestProjects/ToonURPTest-6000.6/Packages/manifest.json b/TestProjects/ToonURPTest-6000.6/Packages/manifest.json index 057e867f0..e6a48beef 100644 --- a/TestProjects/ToonURPTest-6000.6/Packages/manifest.json +++ b/TestProjects/ToonURPTest-6000.6/Packages/manifest.json @@ -7,7 +7,6 @@ "com.unity.test-framework": "1.8.0", "com.unity.testframework.graphics": "8.14.0-exp.2", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", - "com.unity.toon-reference-images": "file:../../../com.unity.toon-reference-images", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.6.0", "com.unity.xr.mock-hmd": "1.4.0-preview.2", diff --git a/TestProjects/ToonURPTestECS-6000.0/Packages/manifest.json b/TestProjects/ToonURPTestECS-6000.0/Packages/manifest.json index ecd5376c7..5d6d3690f 100644 --- a/TestProjects/ToonURPTestECS-6000.0/Packages/manifest.json +++ b/TestProjects/ToonURPTestECS-6000.0/Packages/manifest.json @@ -8,7 +8,6 @@ "com.unity.test-framework": "1.6.0", "com.unity.testframework.graphics": "8.13.2-exp.1", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", - "com.unity.toon-reference-images": "file:../../../com.unity.toon-reference-images", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.0.0", "com.unity.xr.mock-hmd": "1.4.0-preview.2", From cd8d617d82b50562292a2e6307b252e7429eef4c Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 16:46:32 +0900 Subject: [PATCH 14/21] udate testframework.graphics package --- TestProjects/ToonBuiltInRPTest-6000.0/Packages/manifest.json | 2 +- TestProjects/ToonHDRPTest-6000.0/Packages/manifest.json | 2 +- TestProjects/ToonHDRPTestDX12-6000.0/Packages/manifest.json | 2 +- .../Packages/manifest.json | 1 + TestProjects/ToonURPTest-6000.6/Packages/manifest.json | 2 +- TestProjects/ToonURPTestECS-6000.0/Packages/manifest.json | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/TestProjects/ToonBuiltInRPTest-6000.0/Packages/manifest.json b/TestProjects/ToonBuiltInRPTest-6000.0/Packages/manifest.json index cb9c9ed02..6d786bed8 100644 --- a/TestProjects/ToonBuiltInRPTest-6000.0/Packages/manifest.json +++ b/TestProjects/ToonBuiltInRPTest-6000.0/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.inputsystem": "1.19.0", "com.unity.postprocessing": "3.5.4", "com.unity.test-framework": "1.6.0", - "com.unity.testframework.graphics": "8.13.2-exp.1", + "com.unity.testframework.graphics": "9.0.0-pre.12", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.0.0", diff --git a/TestProjects/ToonHDRPTest-6000.0/Packages/manifest.json b/TestProjects/ToonHDRPTest-6000.0/Packages/manifest.json index 23c763a98..ec42b4361 100644 --- a/TestProjects/ToonHDRPTest-6000.0/Packages/manifest.json +++ b/TestProjects/ToonHDRPTest-6000.0/Packages/manifest.json @@ -8,7 +8,7 @@ "com.unity.render-pipelines.high-definition": "17.0.4", "com.unity.render-pipelines.high-definition-config": "17.0.4", "com.unity.test-framework": "1.6.0", - "com.unity.testframework.graphics": "8.13.2-exp.1", + "com.unity.testframework.graphics": "9.0.0-pre.12", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.0.0", diff --git a/TestProjects/ToonHDRPTestDX12-6000.0/Packages/manifest.json b/TestProjects/ToonHDRPTestDX12-6000.0/Packages/manifest.json index 75adbc551..dcb26f4ea 100644 --- a/TestProjects/ToonHDRPTestDX12-6000.0/Packages/manifest.json +++ b/TestProjects/ToonHDRPTestDX12-6000.0/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.render-pipelines.high-definition": "17.0.4", "com.unity.render-pipelines.high-definition-config": "17.0.4", "com.unity.test-framework": "1.6.0", - "com.unity.testframework.graphics": "8.13.2-exp.1", + "com.unity.testframework.graphics": "9.0.0-pre.12", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.0.0", diff --git a/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/manifest.json b/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/manifest.json index 22f91efd6..36070fd84 100644 --- a/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/manifest.json +++ b/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/manifest.json @@ -6,6 +6,7 @@ "com.unity.multiplayer.center": "1.0.0", "com.unity.render-pipelines.universal": "17.0.4", "com.unity.test-framework": "1.6.0", + "com.unity.testframework.graphics": "9.0.0-pre.12", "com.unity.timeline": "1.8.12", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", "com.unity.toonshader": "file:../../../com.unity.toonshader", diff --git a/TestProjects/ToonURPTest-6000.6/Packages/manifest.json b/TestProjects/ToonURPTest-6000.6/Packages/manifest.json index e6a48beef..e88bf6e97 100644 --- a/TestProjects/ToonURPTest-6000.6/Packages/manifest.json +++ b/TestProjects/ToonURPTest-6000.6/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.inputsystem": "1.19.0", "com.unity.render-pipelines.universal": "17.6.0", "com.unity.test-framework": "1.8.0", - "com.unity.testframework.graphics": "8.14.0-exp.2", + "com.unity.testframework.graphics": "9.0.0-pre.8", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.6.0", diff --git a/TestProjects/ToonURPTestECS-6000.0/Packages/manifest.json b/TestProjects/ToonURPTestECS-6000.0/Packages/manifest.json index 5d6d3690f..df17e57ed 100644 --- a/TestProjects/ToonURPTestECS-6000.0/Packages/manifest.json +++ b/TestProjects/ToonURPTestECS-6000.0/Packages/manifest.json @@ -6,7 +6,7 @@ "com.unity.inputsystem": "1.19.0", "com.unity.render-pipelines.universal": "17.0.4", "com.unity.test-framework": "1.6.0", - "com.unity.testframework.graphics": "8.13.2-exp.1", + "com.unity.testframework.graphics": "9.0.0-pre.12", "com.unity.toon-graphics-test": "file:../../../com.unity.toon-graphics-test", "com.unity.toonshader": "file:../../../com.unity.toonshader", "com.unity.ugui": "2.0.0", From 4204a54e87f2767f6380a6f104c5c512af363ae4 Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 16:46:52 +0900 Subject: [PATCH 15/21] update packages-lock.json --- .../Packages/packages-lock.json | 49 ++------------ .../Packages/packages-lock.json | 47 ++------------ .../Packages/packages-lock.json | 47 ++------------ .../Packages/packages-lock.json | 64 ++++--------------- .../Packages/packages-lock.json | 6 -- .../Packages/packages-lock.json | 49 ++------------ .../Packages/packages-lock.json | 49 ++------------ 7 files changed, 47 insertions(+), 264 deletions(-) diff --git a/TestProjects/ToonBuiltInRPTest-6000.0/Packages/packages-lock.json b/TestProjects/ToonBuiltInRPTest-6000.0/Packages/packages-lock.json index 366812fd2..4e430f8f8 100644 --- a/TestProjects/ToonBuiltInRPTest-6000.0/Packages/packages-lock.json +++ b/TestProjects/ToonBuiltInRPTest-6000.0/Packages/packages-lock.json @@ -18,7 +18,7 @@ }, "com.unity.burst": { "version": "1.8.29", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -45,15 +45,6 @@ "source": "builtin", "dependencies": {} }, - "com.unity.external.test-protocol": { - "version": "2.0.0-exp.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0-preview" - }, - "url": "https://packages.unity.com" - }, "com.unity.film-internal-utilities": { "version": "0.20.0-preview", "depth": 1, @@ -165,13 +156,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.settings-manager": { - "version": "2.1.0", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.test-framework": { "version": "1.6.0", "depth": 0, @@ -193,31 +177,18 @@ "url": "https://packages.unity.com" }, "com.unity.testframework.graphics": { - "version": "8.13.2-exp.1", + "version": "9.0.0-pre.12", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.xr": "1.0.0", - "com.unity.addressables": "1.28.1", - "com.unity.xr.management": "4.4.0", + "com.unity.burst": "1.8.27", + "com.unity.addressables": "2.7.6", + "com.unity.test-framework": "1.6.0", "com.unity.nuget.newtonsoft-json": "3.2.2", - "com.unity.xr.legacyinputhelpers": "2.1.13", - "com.unity.external.test-protocol": "2.0.0-exp.1", - "com.unity.testtools.codecoverage": "1.2.7", "com.unity.modules.imageconversion": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.testtools.codecoverage": { - "version": "1.3.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.4.5", - "com.unity.settings-manager": "2.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { "version": "1.8.12", "depth": 2, @@ -238,12 +209,6 @@ "com.unity.testframework.graphics": "8.12.0-exp.2" } }, - "com.unity.toon-reference-images": { - "version": "file:../../../com.unity.toon-reference-images", - "depth": 0, - "source": "local", - "dependencies": {} - }, "com.unity.toonshader": { "version": "file:../../../com.unity.toonshader", "depth": 0, @@ -272,8 +237,8 @@ "url": "https://packages.unity.com" }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.13", - "depth": 1, + "version": "2.1.12", + "depth": 2, "source": "registry", "dependencies": { "com.unity.modules.vr": "1.0.0", diff --git a/TestProjects/ToonHDRPTest-6000.0/Packages/packages-lock.json b/TestProjects/ToonHDRPTest-6000.0/Packages/packages-lock.json index 58dbdafa9..26743b705 100644 --- a/TestProjects/ToonHDRPTest-6000.0/Packages/packages-lock.json +++ b/TestProjects/ToonHDRPTest-6000.0/Packages/packages-lock.json @@ -27,7 +27,7 @@ }, "com.unity.burst": { "version": "1.8.29", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -54,15 +54,6 @@ "source": "builtin", "dependencies": {} }, - "com.unity.external.test-protocol": { - "version": "2.0.0-exp.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0-preview" - }, - "url": "https://packages.unity.com" - }, "com.unity.film-internal-utilities": { "version": "0.20.0-preview", "depth": 1, @@ -213,13 +204,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.settings-manager": { - "version": "2.1.0", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.shadergraph": { "version": "17.0.4", "depth": 1, @@ -250,31 +234,18 @@ "url": "https://packages.unity.com" }, "com.unity.testframework.graphics": { - "version": "8.13.2-exp.1", + "version": "9.0.0-pre.12", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.xr": "1.0.0", - "com.unity.addressables": "1.28.1", - "com.unity.xr.management": "4.4.0", + "com.unity.burst": "1.8.27", + "com.unity.addressables": "2.7.6", + "com.unity.test-framework": "1.6.0", "com.unity.nuget.newtonsoft-json": "3.2.2", - "com.unity.xr.legacyinputhelpers": "2.1.13", - "com.unity.external.test-protocol": "2.0.0-exp.1", - "com.unity.testtools.codecoverage": "1.2.7", "com.unity.modules.imageconversion": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.testtools.codecoverage": { - "version": "1.3.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.4.5", - "com.unity.settings-manager": "2.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { "version": "1.8.12", "depth": 1, @@ -295,12 +266,6 @@ "com.unity.testframework.graphics": "8.12.0-exp.2" } }, - "com.unity.toon-reference-images": { - "version": "file:../../../com.unity.toon-reference-images", - "depth": 0, - "source": "local", - "dependencies": {} - }, "com.unity.toonshader": { "version": "file:../../../com.unity.toonshader", "depth": 0, @@ -338,7 +303,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.13", + "version": "2.1.12", "depth": 1, "source": "registry", "dependencies": { diff --git a/TestProjects/ToonHDRPTestDX12-6000.0/Packages/packages-lock.json b/TestProjects/ToonHDRPTestDX12-6000.0/Packages/packages-lock.json index 731d349f1..51196ef91 100644 --- a/TestProjects/ToonHDRPTestDX12-6000.0/Packages/packages-lock.json +++ b/TestProjects/ToonHDRPTestDX12-6000.0/Packages/packages-lock.json @@ -18,7 +18,7 @@ }, "com.unity.burst": { "version": "1.8.29", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -45,15 +45,6 @@ "source": "builtin", "dependencies": {} }, - "com.unity.external.test-protocol": { - "version": "2.0.0-exp.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0-preview" - }, - "url": "https://packages.unity.com" - }, "com.unity.film-internal-utilities": { "version": "0.20.0-preview", "depth": 1, @@ -193,13 +184,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.settings-manager": { - "version": "2.1.0", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.shadergraph": { "version": "17.0.4", "depth": 1, @@ -230,31 +214,18 @@ "url": "https://packages.unity.com" }, "com.unity.testframework.graphics": { - "version": "8.13.2-exp.1", + "version": "9.0.0-pre.12", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.xr": "1.0.0", - "com.unity.addressables": "1.28.1", - "com.unity.xr.management": "4.4.0", + "com.unity.burst": "1.8.27", + "com.unity.addressables": "2.7.6", + "com.unity.test-framework": "1.6.0", "com.unity.nuget.newtonsoft-json": "3.2.2", - "com.unity.xr.legacyinputhelpers": "2.1.13", - "com.unity.external.test-protocol": "2.0.0-exp.1", - "com.unity.testtools.codecoverage": "1.2.7", "com.unity.modules.imageconversion": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.testtools.codecoverage": { - "version": "1.3.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.4.5", - "com.unity.settings-manager": "2.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { "version": "1.8.12", "depth": 2, @@ -275,12 +246,6 @@ "com.unity.testframework.graphics": "8.12.0-exp.2" } }, - "com.unity.toon-reference-images": { - "version": "file:../../../com.unity.toon-reference-images", - "depth": 0, - "source": "local", - "dependencies": {} - }, "com.unity.toonshader": { "version": "file:../../../com.unity.toonshader", "depth": 0, @@ -318,7 +283,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.13", + "version": "2.1.12", "depth": 1, "source": "registry", "dependencies": { diff --git a/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/packages-lock.json b/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/packages-lock.json index b5f36f854..1ce11afc5 100644 --- a/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/packages-lock.json +++ b/TestProjects/ToonURPResidentDrawerGraphicsTest-6000.0/Packages/packages-lock.json @@ -2,7 +2,7 @@ "dependencies": { "com.unity.addressables": { "version": "2.9.1", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.profiling.core": "1.0.2", @@ -18,7 +18,7 @@ }, "com.unity.burst": { "version": "1.8.29", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -45,15 +45,6 @@ "source": "builtin", "dependencies": {} }, - "com.unity.external.test-protocol": { - "version": "1.0.0-preview", - "depth": 2, - "source": "registry", - "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0-preview" - }, - "url": "https://packages.unity.com" - }, "com.unity.film-internal-utilities": { "version": "0.20.0-preview", "depth": 1, @@ -115,15 +106,15 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.2.1", - "depth": 2, + "version": "3.2.2", + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.profiling.core": { "version": "1.0.3", - "depth": 3, + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -173,7 +164,7 @@ }, "com.unity.scriptablebuildpipeline": { "version": "2.6.1", - "depth": 3, + "depth": 2, "source": "registry", "dependencies": { "com.unity.test-framework": "1.4.5", @@ -188,13 +179,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.settings-manager": { - "version": "2.1.0", - "depth": 3, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.shadergraph": { "version": "17.0.4", "depth": 1, @@ -225,32 +209,18 @@ "url": "https://packages.unity.com" }, "com.unity.testframework.graphics": { - "version": "8.12.0-exp.2", - "depth": 1, + "version": "9.0.0-pre.12", + "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.xr": "1.0.0", - "com.unity.addressables": "1.21.12", - "com.unity.xr.management": "4.0.5", - "com.unity.nuget.newtonsoft-json": "2.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.8", - "com.unity.external.test-protocol": "1.0.0-preview", - "com.unity.testtools.codecoverage": "1.2.0", + "com.unity.burst": "1.8.27", + "com.unity.addressables": "2.7.6", + "com.unity.test-framework": "1.6.0", + "com.unity.nuget.newtonsoft-json": "3.2.2", "com.unity.modules.imageconversion": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.testtools.codecoverage": { - "version": "1.3.0", - "depth": 2, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.4.5", - "com.unity.settings-manager": "2.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { "version": "1.8.12", "depth": 0, @@ -271,12 +241,6 @@ "com.unity.testframework.graphics": "8.12.0-exp.2" } }, - "com.unity.toon-reference-images": { - "version": "file:../../../com.unity.toon-reference-images", - "depth": 0, - "source": "local", - "dependencies": {} - }, "com.unity.toonshader": { "version": "file:../../../com.unity.toonshader", "depth": 0, @@ -343,7 +307,7 @@ }, "com.unity.modules.assetbundle": { "version": "1.0.0", - "depth": 3, + "depth": 2, "source": "builtin", "dependencies": {} }, @@ -460,7 +424,7 @@ }, "com.unity.modules.unitywebrequestassetbundle": { "version": "1.0.0", - "depth": 3, + "depth": 2, "source": "builtin", "dependencies": { "com.unity.modules.assetbundle": "1.0.0", diff --git a/TestProjects/ToonURPTest-6000.0/Packages/packages-lock.json b/TestProjects/ToonURPTest-6000.0/Packages/packages-lock.json index 138da114d..f3f0be9bd 100644 --- a/TestProjects/ToonURPTest-6000.0/Packages/packages-lock.json +++ b/TestProjects/ToonURPTest-6000.0/Packages/packages-lock.json @@ -233,12 +233,6 @@ "com.unity.testframework.graphics": "8.12.0-exp.2" } }, - "com.unity.toon-reference-images": { - "version": "file:../../../com.unity.toon-reference-images", - "depth": 0, - "source": "local", - "dependencies": {} - }, "com.unity.toonshader": { "version": "file:../../../com.unity.toonshader", "depth": 0, diff --git a/TestProjects/ToonURPTest-6000.6/Packages/packages-lock.json b/TestProjects/ToonURPTest-6000.6/Packages/packages-lock.json index 6ed3d8e33..4290339bd 100644 --- a/TestProjects/ToonURPTest-6000.6/Packages/packages-lock.json +++ b/TestProjects/ToonURPTest-6000.6/Packages/packages-lock.json @@ -18,7 +18,7 @@ }, "com.unity.burst": { "version": "1.8.29", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -43,15 +43,6 @@ "source": "builtin", "dependencies": {} }, - "com.unity.external.test-protocol": { - "version": "2.0.0-exp.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0-preview" - }, - "url": "https://packages.unity.com" - }, "com.unity.film-internal-utilities": { "version": "0.20.0-preview", "depth": 1, @@ -92,7 +83,7 @@ }, "com.unity.mathematics": { "version": "1.4.0", - "depth": 3, + "depth": 2, "source": "builtin", "dependencies": {} }, @@ -162,13 +153,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.settings-manager": { - "version": "2.1.1", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.shadergraph": { "version": "17.6.0", "depth": 1, @@ -199,31 +183,18 @@ "url": "https://packages.unity.com" }, "com.unity.testframework.graphics": { - "version": "8.14.0-exp.2", + "version": "9.0.0-pre.8", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.xr": "1.0.0", - "com.unity.addressables": "1.28.1", - "com.unity.xr.management": "4.4.0", + "com.unity.burst": "1.8.27", + "com.unity.addressables": "2.7.6", + "com.unity.test-framework": "1.6.0", "com.unity.nuget.newtonsoft-json": "3.2.2", - "com.unity.xr.legacyinputhelpers": "2.1.13", - "com.unity.external.test-protocol": "2.0.0-exp.1", - "com.unity.testtools.codecoverage": "1.2.7", "com.unity.modules.imageconversion": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.testtools.codecoverage": { - "version": "1.3.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.4.5", - "com.unity.settings-manager": "2.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { "version": "6.6.0", "depth": 2, @@ -243,12 +214,6 @@ "com.unity.testframework.graphics": "8.12.0-exp.2" } }, - "com.unity.toon-reference-images": { - "version": "file:../../../com.unity.toon-reference-images", - "depth": 0, - "source": "local", - "dependencies": {} - }, "com.unity.toonshader": { "version": "file:../../../com.unity.toonshader", "depth": 0, @@ -281,7 +246,7 @@ }, "com.unity.xr.legacyinputhelpers": { "version": "3.0.1", - "depth": 1, + "depth": 2, "source": "registry", "dependencies": { "com.unity.modules.xr": "1.0.0" diff --git a/TestProjects/ToonURPTestECS-6000.0/Packages/packages-lock.json b/TestProjects/ToonURPTestECS-6000.0/Packages/packages-lock.json index 9442de4ad..133fba28f 100644 --- a/TestProjects/ToonURPTestECS-6000.0/Packages/packages-lock.json +++ b/TestProjects/ToonURPTestECS-6000.0/Packages/packages-lock.json @@ -18,7 +18,7 @@ }, "com.unity.burst": { "version": "1.8.29", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -78,15 +78,6 @@ "source": "builtin", "dependencies": {} }, - "com.unity.external.test-protocol": { - "version": "2.0.0-exp.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0-preview" - }, - "url": "https://packages.unity.com" - }, "com.unity.film-internal-utilities": { "version": "0.20.0-preview", "depth": 1, @@ -223,13 +214,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.settings-manager": { - "version": "2.1.0", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.shadergraph": { "version": "17.0.4", "depth": 1, @@ -260,31 +244,18 @@ "url": "https://packages.unity.com" }, "com.unity.testframework.graphics": { - "version": "8.13.2-exp.1", + "version": "9.0.0-pre.12", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.xr": "1.0.0", - "com.unity.addressables": "1.28.1", - "com.unity.xr.management": "4.4.0", + "com.unity.burst": "1.8.27", + "com.unity.addressables": "2.7.6", + "com.unity.test-framework": "1.6.0", "com.unity.nuget.newtonsoft-json": "3.2.2", - "com.unity.xr.legacyinputhelpers": "2.1.13", - "com.unity.external.test-protocol": "2.0.0-exp.1", - "com.unity.testtools.codecoverage": "1.2.7", "com.unity.modules.imageconversion": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.testtools.codecoverage": { - "version": "1.3.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.4.5", - "com.unity.settings-manager": "2.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { "version": "1.8.12", "depth": 2, @@ -305,12 +276,6 @@ "com.unity.testframework.graphics": "8.12.0-exp.2" } }, - "com.unity.toon-reference-images": { - "version": "file:../../../com.unity.toon-reference-images", - "depth": 0, - "source": "local", - "dependencies": {} - }, "com.unity.toonshader": { "version": "file:../../../com.unity.toonshader", "depth": 0, @@ -339,8 +304,8 @@ "url": "https://packages.unity.com" }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.13", - "depth": 1, + "version": "2.1.12", + "depth": 2, "source": "registry", "dependencies": { "com.unity.modules.vr": "1.0.0", From 69d271ff00cdb09066cd9d24cdbc9754673ee004 Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 16:53:46 +0900 Subject: [PATCH 16/21] remove debug logs --- com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs index ed541e762..1a1b27ba2 100644 --- a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs +++ b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs @@ -123,15 +123,6 @@ public static class UTSGraphicsTests { internal static IEnumerator RunInternal(SceneGraphicsTestCase testCase, bool isXR = false) { SceneManager.LoadScene(testCase.ScenePath); - - Debug.Log(testCase.ReferenceImage.Image); - Debug.Log(testCase.ReferenceImage.Image); - Debug.Log(testCase.ReferenceImage.Image); - - Debug.Log(testCase.ReferenceImage.AssetPath); - Debug.Log(testCase.ReferenceImage.AssetPath); - Debug.Log(testCase.ReferenceImage.AssetPath); - Debug.Log(testCase.ReferenceImage.AssetPath); // Always wait one frame for scene load yield return null; From 834049775ba2d1e315783040d282dd95a1e05b6b Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 16:53:56 +0900 Subject: [PATCH 17/21] cleanup --- .../Runtime/UTSGraphicsTests.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs index 1a1b27ba2..8d8ffb8e1 100644 --- a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs +++ b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs @@ -67,13 +67,9 @@ public IEnumerator Run(SceneGraphicsTestCase testCase) { string xrImagePath = Path.Combine(imageFolderName, XR_DEVICE,imageFileName); Assert.IsTrue(File.Exists(xrImagePath),$"XR Reference image not found at: {xrImagePath}"); - //Hack to set the reference image to xr - var prefRefImage = testCase.ReferenceImage; - testCase.ReferenceImage = new ReferenceImage(prefRefImage.Name, prefRefImage.TextureFormat); - SetRefImageAssetPath(testCase.ReferenceImage, xrImagePath); - ClearLoadedImage(testCase.ReferenceImage); + yield return UTSGraphicsTests.RunInternal(testCase, isXR:true); XRUtility.DisableXR(); @@ -82,14 +78,15 @@ public IEnumerator Run(SceneGraphicsTestCase testCase) { static readonly FieldInfo REF_IMAGE_ASSET_PATH_FIELD = typeof(ReferenceImage).GetField("m_AssetPath", BindingFlags.NonPublic | BindingFlags.Instance); + static readonly FieldInfo LOADED_IMAGE_FIELD = + typeof(ReferenceImage).GetField("m_LoadedImage", BindingFlags.NonPublic | BindingFlags.Instance); + private static void SetRefImageAssetPath(ReferenceImage image, string path) => REF_IMAGE_ASSET_PATH_FIELD.SetValue(image, path); - static readonly FieldInfo s_LoadedImageField = - typeof(ReferenceImage).GetField("m_LoadedImage", BindingFlags.NonPublic | BindingFlags.Instance); - public static void ClearLoadedImage(ReferenceImage image) - => s_LoadedImageField.SetValue(image, null); + private static void ClearLoadedImage(ReferenceImage image) + => LOADED_IMAGE_FIELD.SetValue(image, null); } From 8c9a1edbb1769957b9d9a8d77c83c4796c060016 Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 16:58:48 +0900 Subject: [PATCH 18/21] reset loaded content --- com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs index 8d8ffb8e1..c59e79aff 100644 --- a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs +++ b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs @@ -55,6 +55,7 @@ public IEnumerator Run(SceneGraphicsTestCase testCase) { //Enable XR XRUtility.EnableXRInEditor(); + TestContentLoader.Reset(); //reset loaded images const string XR_DEVICE = "MockHMDLoader"; @@ -73,6 +74,7 @@ public IEnumerator Run(SceneGraphicsTestCase testCase) { yield return UTSGraphicsTests.RunInternal(testCase, isXR:true); XRUtility.DisableXR(); + TestContentLoader.Reset(); //reset loaded images } static readonly FieldInfo REF_IMAGE_ASSET_PATH_FIELD = From 5db23e0271ed175f0de1d8c4159ee486c5c84a42 Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 17:00:50 +0900 Subject: [PATCH 19/21] add meta files --- .../ToonBuiltInRPTest-6000.0/Assets/ReferenceImages.meta | 8 ++++++++ .../ToonBuiltInRPTest-6000.0/Assets/Resources.meta | 8 ++++++++ .../ToonHDRPTest-6000.0/Assets/ReferenceImages.meta | 8 ++++++++ TestProjects/ToonHDRPTest-6000.0/Assets/Resources.meta | 8 ++++++++ .../ToonHDRPTestDX12-6000.0/Assets/ReferenceImages.meta | 8 ++++++++ .../ToonHDRPTestDX12-6000.0/Assets/Resources.meta | 8 ++++++++ .../ToonURPTest-6000.0/Assets/ReferenceImages.meta | 8 ++++++++ TestProjects/ToonURPTest-6000.0/Assets/Resources.meta | 8 ++++++++ TestProjects/ToonURPTest-6000.3/Assets/Resources.meta | 8 ++++++++ .../ToonURPTest-6000.6/Assets/ReferenceImages.meta | 8 ++++++++ TestProjects/ToonURPTest-6000.6/Assets/Resources.meta | 8 ++++++++ .../ToonURPTestECS-6000.0/Assets/ReferenceImages.meta | 8 ++++++++ TestProjects/ToonURPTestECS-6000.0/Assets/Resources.meta | 8 ++++++++ 13 files changed, 104 insertions(+) create mode 100644 TestProjects/ToonBuiltInRPTest-6000.0/Assets/ReferenceImages.meta create mode 100644 TestProjects/ToonBuiltInRPTest-6000.0/Assets/Resources.meta create mode 100644 TestProjects/ToonHDRPTest-6000.0/Assets/ReferenceImages.meta create mode 100644 TestProjects/ToonHDRPTest-6000.0/Assets/Resources.meta create mode 100644 TestProjects/ToonHDRPTestDX12-6000.0/Assets/ReferenceImages.meta create mode 100644 TestProjects/ToonHDRPTestDX12-6000.0/Assets/Resources.meta create mode 100644 TestProjects/ToonURPTest-6000.0/Assets/ReferenceImages.meta create mode 100644 TestProjects/ToonURPTest-6000.0/Assets/Resources.meta create mode 100644 TestProjects/ToonURPTest-6000.3/Assets/Resources.meta create mode 100644 TestProjects/ToonURPTest-6000.6/Assets/ReferenceImages.meta create mode 100644 TestProjects/ToonURPTest-6000.6/Assets/Resources.meta create mode 100644 TestProjects/ToonURPTestECS-6000.0/Assets/ReferenceImages.meta create mode 100644 TestProjects/ToonURPTestECS-6000.0/Assets/Resources.meta diff --git a/TestProjects/ToonBuiltInRPTest-6000.0/Assets/ReferenceImages.meta b/TestProjects/ToonBuiltInRPTest-6000.0/Assets/ReferenceImages.meta new file mode 100644 index 000000000..3765a2584 --- /dev/null +++ b/TestProjects/ToonBuiltInRPTest-6000.0/Assets/ReferenceImages.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33519a960077c4c45aba22049df1c1b7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonBuiltInRPTest-6000.0/Assets/Resources.meta b/TestProjects/ToonBuiltInRPTest-6000.0/Assets/Resources.meta new file mode 100644 index 000000000..d8132d80c --- /dev/null +++ b/TestProjects/ToonBuiltInRPTest-6000.0/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 257a21474f7f90348848b4828d4f2e44 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonHDRPTest-6000.0/Assets/ReferenceImages.meta b/TestProjects/ToonHDRPTest-6000.0/Assets/ReferenceImages.meta new file mode 100644 index 000000000..4dcf5330b --- /dev/null +++ b/TestProjects/ToonHDRPTest-6000.0/Assets/ReferenceImages.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae216022dab561543ba30716f6053afd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonHDRPTest-6000.0/Assets/Resources.meta b/TestProjects/ToonHDRPTest-6000.0/Assets/Resources.meta new file mode 100644 index 000000000..755674595 --- /dev/null +++ b/TestProjects/ToonHDRPTest-6000.0/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3487de54694651a42899c44c7aff6b76 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonHDRPTestDX12-6000.0/Assets/ReferenceImages.meta b/TestProjects/ToonHDRPTestDX12-6000.0/Assets/ReferenceImages.meta new file mode 100644 index 000000000..7e9a3240f --- /dev/null +++ b/TestProjects/ToonHDRPTestDX12-6000.0/Assets/ReferenceImages.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a400a8bbb226aa846bbe23b4a4ce4718 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonHDRPTestDX12-6000.0/Assets/Resources.meta b/TestProjects/ToonHDRPTestDX12-6000.0/Assets/Resources.meta new file mode 100644 index 000000000..f28acb770 --- /dev/null +++ b/TestProjects/ToonHDRPTestDX12-6000.0/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f46140a11ccff441807c68d5879bc6a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonURPTest-6000.0/Assets/ReferenceImages.meta b/TestProjects/ToonURPTest-6000.0/Assets/ReferenceImages.meta new file mode 100644 index 000000000..53ddbea6d --- /dev/null +++ b/TestProjects/ToonURPTest-6000.0/Assets/ReferenceImages.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 919b9e4a7d9c50a4aa9545a53e40a5f0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonURPTest-6000.0/Assets/Resources.meta b/TestProjects/ToonURPTest-6000.0/Assets/Resources.meta new file mode 100644 index 000000000..12a13ba63 --- /dev/null +++ b/TestProjects/ToonURPTest-6000.0/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db180e1a621721243b34ce2daacd40a2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonURPTest-6000.3/Assets/Resources.meta b/TestProjects/ToonURPTest-6000.3/Assets/Resources.meta new file mode 100644 index 000000000..a6ea467f5 --- /dev/null +++ b/TestProjects/ToonURPTest-6000.3/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f7479a8361403a4fa9d2dcccde9a844 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonURPTest-6000.6/Assets/ReferenceImages.meta b/TestProjects/ToonURPTest-6000.6/Assets/ReferenceImages.meta new file mode 100644 index 000000000..95f6b01f9 --- /dev/null +++ b/TestProjects/ToonURPTest-6000.6/Assets/ReferenceImages.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 562d2a0d0c80aec4595875aec838bf66 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonURPTest-6000.6/Assets/Resources.meta b/TestProjects/ToonURPTest-6000.6/Assets/Resources.meta new file mode 100644 index 000000000..8ebbd9d9d --- /dev/null +++ b/TestProjects/ToonURPTest-6000.6/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04a7dbcd9d36f8246971225fa451ad7c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonURPTestECS-6000.0/Assets/ReferenceImages.meta b/TestProjects/ToonURPTestECS-6000.0/Assets/ReferenceImages.meta new file mode 100644 index 000000000..be49681a7 --- /dev/null +++ b/TestProjects/ToonURPTestECS-6000.0/Assets/ReferenceImages.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d058f6cee1a7b9f408a79859f084aab7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonURPTestECS-6000.0/Assets/Resources.meta b/TestProjects/ToonURPTestECS-6000.0/Assets/Resources.meta new file mode 100644 index 000000000..5fba47372 --- /dev/null +++ b/TestProjects/ToonURPTestECS-6000.0/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30f73593c5df3694ea66b2ccfad8a6fc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From c5a020b22c2bb6352b2051b1875a532ed9dde9dd Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 23:12:41 +0900 Subject: [PATCH 20/21] update constants --- .../Runtime/UTSGraphicsTestConstants.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTestConstants.cs b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTestConstants.cs index 99f727d0f..241e3372b 100644 --- a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTestConstants.cs +++ b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTestConstants.cs @@ -1,14 +1,7 @@ namespace Unity.ToonShader.GraphicsTest { public class UTSGraphicsTestConstants { -#if UTS_TEST_USE_HDRP - internal const string ReferenceImagePath = "Packages/com.unity.toon-reference-images/HDRP"; -#elif UTS_TEST_USE_URP - internal const string ReferenceImagePath = "Packages/com.unity.toon-reference-images/URP"; -#else - internal const string ReferenceImagePath = "Packages/com.unity.toon-reference-images/Built-In"; -#endif - + internal const string ReferenceImagePath = "Assets/ReferenceImages"; } } //end namespace From 74c5b9163fb701f1aafb6b3bc26ea434639d530a Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 24 Jun 2026 23:19:51 +0900 Subject: [PATCH 21/21] simplify --- .../Runtime/UTSGraphicsTests.cs | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs index c59e79aff..f3387a444 100644 --- a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs +++ b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs @@ -68,27 +68,11 @@ public IEnumerator Run(SceneGraphicsTestCase testCase) { string xrImagePath = Path.Combine(imageFolderName, XR_DEVICE,imageFileName); Assert.IsTrue(File.Exists(xrImagePath),$"XR Reference image not found at: {xrImagePath}"); - SetRefImageAssetPath(testCase.ReferenceImage, xrImagePath); - ClearLoadedImage(testCase.ReferenceImage); - yield return UTSGraphicsTests.RunInternal(testCase, isXR:true); XRUtility.DisableXR(); TestContentLoader.Reset(); //reset loaded images } - - static readonly FieldInfo REF_IMAGE_ASSET_PATH_FIELD = - typeof(ReferenceImage).GetField("m_AssetPath", BindingFlags.NonPublic | BindingFlags.Instance); - - static readonly FieldInfo LOADED_IMAGE_FIELD = - typeof(ReferenceImage).GetField("m_LoadedImage", BindingFlags.NonPublic | BindingFlags.Instance); - - private static void SetRefImageAssetPath(ReferenceImage image, string path) - => REF_IMAGE_ASSET_PATH_FIELD.SetValue(image, path); - - - private static void ClearLoadedImage(ReferenceImage image) - => LOADED_IMAGE_FIELD.SetValue(image, null); }