From db94a6b0895b0b64d44f61b10c617503de6ed5fa Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Wed, 14 Apr 2021 17:26:34 +0200 Subject: [PATCH 1/7] Created test package and moved test files to package. --- .../Editor/CopyImageToReferenceFolders.cs | 79 -------- .../Assets/Test/Editor/MultipleViewGCTest.cs | 51 ----- .../Editor/UniversalProjectEditorTests.cs | 60 ------ .../Assets/Test/Runtime/ArrayDrawer.cs | 50 ----- .../Test/Runtime/CameraCallbackTests.cs | 176 ------------------ .../Test/Runtime/CustomRenderPipeline.meta | 8 - .../CustomRenderGraphData.cs | 12 -- .../Assets/Test/Runtime/Renderer2DTests.cs | 121 ------------ .../Test/Runtime/Renderer2DTests.cs.meta | 11 -- .../Test/Runtime/UniversalGraphicsTests.cs | 92 --------- .../Packages/manifest.json | 4 +- .../Test/Editor/MultipleViewGCTest.cs.meta | 11 -- .../Test/Editor/SetupGraphicsTestCases.cs | 15 -- .../Editor/SetupGraphicsTestCases.cs.meta | 11 -- .../Unity.Testing.SRP.Universal.Editor.asmdef | 27 --- ...y.Testing.SRP.Universal.Editor.asmdef.meta | 7 - .../UniversalProjectEditorTests.cs.meta | 3 - .../Assets/Test/Runtime/ArrayDrawer.cs.meta | 11 -- .../Test/Runtime/CameraCallbackTests.cs.meta | 11 -- .../CustomRenderGraph.asset | 15 -- .../CustomRenderGraph.asset.meta | 8 - .../CustomRenderGraphData.cs.meta | 11 -- .../CustomRenderPipeline/CustomRenderer.cs | 31 --- .../CustomRenderer.cs.meta | 11 -- ...Unity.Testing.SRP.Universal.Runtime.asmdef | 24 --- .../Runtime/UniversalGraphicsTestSettings.cs | 16 -- .../UniversalGraphicsTestSettings.cs.meta | 11 -- .../Runtime/UniversalGraphicsTests.cs.meta | 11 -- .../Packages/manifest.json | 4 +- .../Assets/Test/Editor.meta | 8 - .../Editor/CopyImageToReferenceFolders.cs | 79 -------- .../CopyImageToReferenceFolders.cs.meta | 11 -- .../Assets/Test/Editor/MultipleViewGCTest.cs | 51 ----- .../Test/Editor/MultipleViewGCTest.cs.meta | 11 -- .../Test/Editor/SetupGraphicsTestCases.cs | 15 -- .../Editor/SetupGraphicsTestCases.cs.meta | 11 -- .../Unity.Testing.SRP.Universal.Editor.asmdef | 27 --- ...y.Testing.SRP.Universal.Editor.asmdef.meta | 7 - .../Editor/UniversalProjectEditorTests.cs | 60 ------ .../UniversalProjectEditorTests.cs.meta | 3 - .../Assets/Test/Runtime.meta | 8 - .../Assets/Test/Runtime/ArrayDrawer.cs | 50 ----- .../Assets/Test/Runtime/ArrayDrawer.cs.meta | 11 -- .../Test/Runtime/CameraCallbackTests.cs | 176 ------------------ .../Test/Runtime/CameraCallbackTests.cs.meta | 11 -- ...Unity.Testing.SRP.Universal.Runtime.asmdef | 24 --- ....Testing.SRP.Universal.Runtime.asmdef.meta | 7 - .../Runtime/UniversalGraphicsTestSettings.cs | 16 -- .../UniversalGraphicsTestSettings.cs.meta | 11 -- .../Test/Runtime/UniversalGraphicsTests.cs | 93 --------- .../Runtime/UniversalGraphicsTests.cs.meta | 11 -- .../Packages/manifest.json | 4 +- .../Assets/Test/Editor.meta | 8 - .../Editor/CopyImageToReferenceFolders.cs | 79 -------- .../CopyImageToReferenceFolders.cs.meta | 11 -- .../Assets/Test/Editor/MultipleViewGCTest.cs | 51 ----- .../Test/Editor/MultipleViewGCTest.cs.meta | 11 -- .../Test/Editor/SetupGraphicsTestCases.cs | 15 -- .../Editor/SetupGraphicsTestCases.cs.meta | 11 -- .../Unity.Testing.SRP.Universal.Editor.asmdef | 27 --- ...y.Testing.SRP.Universal.Editor.asmdef.meta | 7 - .../Editor/UniversalProjectEditorTests.cs | 60 ------ .../UniversalProjectEditorTests.cs.meta | 3 - .../Assets/Test/Runtime.meta | 8 - .../Assets/Test/Runtime/ArrayDrawer.cs | 50 ----- .../Assets/Test/Runtime/ArrayDrawer.cs.meta | 11 -- .../Test/Runtime/CameraCallbackTests.cs | 176 ------------------ .../Test/Runtime/CameraCallbackTests.cs.meta | 11 -- .../Test/Runtime/CustomRenderPipeline.meta | 8 - .../CustomRenderGraph.asset | 15 -- .../CustomRenderGraph.asset.meta | 8 - .../CustomRenderGraphData.cs | 12 -- .../CustomRenderGraphData.cs.meta | 11 -- .../CustomRenderPipeline/CustomRenderer.cs | 31 --- .../CustomRenderer.cs.meta | 11 -- ...Unity.Testing.SRP.Universal.Runtime.asmdef | 24 --- ....Testing.SRP.Universal.Runtime.asmdef.meta | 7 - .../Runtime/UniversalGraphicsTestSettings.cs | 16 -- .../UniversalGraphicsTestSettings.cs.meta | 11 -- .../Test/Runtime/UniversalGraphicsTests.cs | 92 --------- .../Runtime/UniversalGraphicsTests.cs.meta | 11 -- .../Packages/manifest.json | 4 +- .../Assets/Test/Editor.meta | 8 - .../Editor/CopyImageToReferenceFolders.cs | 79 -------- .../CopyImageToReferenceFolders.cs.meta | 11 -- .../Assets/Test/Editor/MultipleViewGCTest.cs | 51 ----- .../Test/Editor/MultipleViewGCTest.cs.meta | 11 -- .../Test/Editor/SetupGraphicsTestCases.cs | 15 -- .../Editor/SetupGraphicsTestCases.cs.meta | 11 -- .../Unity.Testing.SRP.Universal.Editor.asmdef | 27 --- ...y.Testing.SRP.Universal.Editor.asmdef.meta | 7 - .../Editor/UniversalProjectEditorTests.cs | 60 ------ .../UniversalProjectEditorTests.cs.meta | 3 - .../Assets/Test/Runtime.meta | 8 - .../Assets/Test/Runtime/ArrayDrawer.cs | 50 ----- .../Assets/Test/Runtime/ArrayDrawer.cs.meta | 11 -- .../Test/Runtime/CameraCallbackTests.cs | 176 ------------------ .../Test/Runtime/CameraCallbackTests.cs.meta | 11 -- .../Test/Runtime/CustomRenderPipeline.meta | 8 - .../CustomRenderGraph.asset | 15 -- .../CustomRenderGraph.asset.meta | 8 - .../CustomRenderGraphData.cs | 12 -- .../CustomRenderGraphData.cs.meta | 11 -- .../CustomRenderPipeline/CustomRenderer.cs | 31 --- .../CustomRenderer.cs.meta | 11 -- ...Unity.Testing.SRP.Universal.Runtime.asmdef | 24 --- ....Testing.SRP.Universal.Runtime.asmdef.meta | 7 - .../Runtime/UniversalGraphicsTestSettings.cs | 16 -- .../UniversalGraphicsTestSettings.cs.meta | 11 -- .../Test/Runtime/UniversalGraphicsTests.cs | 92 --------- .../Runtime/UniversalGraphicsTests.cs.meta | 11 -- .../Packages/manifest.json | 4 +- .../CommonAssets.meta | 2 +- .../Scripts.meta | 2 +- .../Scripts}/Editor.meta | 0 .../Editor/CopyImageToReferenceFolders.cs | 0 .../CopyImageToReferenceFolders.cs.meta | 0 .../Scripts}/Editor/MultipleViewGCTest.cs | 0 .../Editor/MultipleViewGCTest.cs.meta | 0 .../Scripts}/Editor/SetupGraphicsTestCases.cs | 0 .../Editor/SetupGraphicsTestCases.cs.meta | 0 .../Unity.Testing.SRP.Universal.Editor.asmdef | 0 ...y.Testing.SRP.Universal.Editor.asmdef.meta | 0 .../Editor/UniversalProjectEditorTests.cs | 0 .../UniversalProjectEditorTests.cs.meta | 0 .../Scripts}/Runtime.meta | 0 .../Scripts}/Runtime/ArrayDrawer.cs | 0 .../Scripts}/Runtime/ArrayDrawer.cs.meta | 0 .../Scripts}/Runtime/CameraCallbackTests.cs | 0 .../Runtime/CameraCallbackTests.cs.meta | 0 .../Runtime/CustomRenderPipeline.meta | 0 .../CustomRenderGraph.asset | 0 .../CustomRenderGraph.asset.meta | 0 .../CustomRenderGraphData.cs | 0 .../CustomRenderGraphData.cs.meta | 0 .../CustomRenderPipeline/CustomRenderer.cs | 0 .../CustomRenderer.cs.meta | 0 .../Scripts/Runtime/SetQualityLevelOnAwake.cs | 43 +++++ .../Runtime/SetQualityLevelOnAwake.cs.meta | 2 +- ...Unity.Testing.SRP.Universal.Runtime.asmdef | 0 ....Testing.SRP.Universal.Runtime.asmdef.meta | 0 .../Runtime/UniversalGraphicsTestSettings.cs | 0 .../UniversalGraphicsTestSettings.cs.meta | 0 .../Runtime/UniversalGraphicsTests.cs | 0 .../Runtime/UniversalGraphicsTests.cs.meta | 0 com.unity.testing.urp/package.json | 13 ++ .../package.json.meta | 4 +- 147 files changed, 76 insertions(+), 3197 deletions(-) delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline.meta delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/MultipleViewGCTest.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/SetupGraphicsTestCases.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/ArrayDrawer.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CameraCallbackTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/CopyImageToReferenceFolders.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/MultipleViewGCTest.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/MultipleViewGCTest.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/SetupGraphicsTestCases.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/UniversalProjectEditorTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/ArrayDrawer.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/ArrayDrawer.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/CameraCallbackTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/CameraCallbackTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/CopyImageToReferenceFolders.cs delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/MultipleViewGCTest.cs delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/MultipleViewGCTest.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/SetupGraphicsTestCases.cs delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/UniversalProjectEditorTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/ArrayDrawer.cs delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/ArrayDrawer.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CameraCallbackTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CameraCallbackTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/CopyImageToReferenceFolders.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/MultipleViewGCTest.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/MultipleViewGCTest.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/SetupGraphicsTestCases.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/UniversalProjectEditorTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/ArrayDrawer.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/ArrayDrawer.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CameraCallbackTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CameraCallbackTests.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTests.cs delete mode 100644 TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta rename TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor.meta => com.unity.testing.urp/CommonAssets.meta (77%) rename TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime.meta => com.unity.testing.urp/Scripts.meta (77%) rename {TestProjects/UniversalGraphicsTest_Foundation/Assets/Test => com.unity.testing.urp/Scripts}/Editor.meta (100%) rename {TestProjects/UniversalGraphicsTest_Foundation/Assets/Test => com.unity.testing.urp/Scripts}/Editor/CopyImageToReferenceFolders.cs (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Editor/CopyImageToReferenceFolders.cs.meta (100%) rename {TestProjects/UniversalGraphicsTest_Foundation/Assets/Test => com.unity.testing.urp/Scripts}/Editor/MultipleViewGCTest.cs (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Editor/MultipleViewGCTest.cs.meta (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Editor/SetupGraphicsTestCases.cs (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Editor/SetupGraphicsTestCases.cs.meta (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Editor/Unity.Testing.SRP.Universal.Editor.asmdef (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta (100%) rename {TestProjects/UniversalGraphicsTest_Foundation/Assets/Test => com.unity.testing.urp/Scripts}/Editor/UniversalProjectEditorTests.cs (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Editor/UniversalProjectEditorTests.cs.meta (100%) rename {TestProjects/UniversalGraphicsTest_Foundation/Assets/Test => com.unity.testing.urp/Scripts}/Runtime.meta (100%) rename {TestProjects/UniversalGraphicsTest_Foundation/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/ArrayDrawer.cs (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/ArrayDrawer.cs.meta (100%) rename {TestProjects/UniversalGraphicsTest_Foundation/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/CameraCallbackTests.cs (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/CameraCallbackTests.cs.meta (100%) rename {TestProjects/UniversalGraphicsTest_Foundation/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/CustomRenderPipeline.meta (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/CustomRenderPipeline/CustomRenderGraph.asset (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta (100%) rename {TestProjects/UniversalGraphicsTest_Foundation/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/CustomRenderPipeline/CustomRenderer.cs (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta (100%) create mode 100644 com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs rename TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta => com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs.meta (83%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/UniversalGraphicsTestSettings.cs (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/UniversalGraphicsTestSettings.cs.meta (100%) rename {TestProjects/UniversalGraphicsTest_Foundation/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/UniversalGraphicsTests.cs (100%) rename {TestProjects/UniversalGraphicsTest_2D/Assets/Test => com.unity.testing.urp/Scripts}/Runtime/UniversalGraphicsTests.cs.meta (100%) create mode 100644 com.unity.testing.urp/package.json rename TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta => com.unity.testing.urp/package.json.meta (59%) diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs deleted file mode 100644 index 3fa8be97c61..00000000000 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs +++ /dev/null @@ -1,79 +0,0 @@ -using UnityEngine; -using UnityEditor; -using System.IO; -using System.Collections.Generic; -using System.Text; -using System.Linq; - -public class CopyImageToReferenceFolders -{ - // Add a new menu item that is accessed by right-clicking on an asset in the project view - - [MenuItem("Assets/CopyToReferenceImages", priority = 1)] - private static void CopyImages() - { - string referenceImagesPath = Path.Combine("Assets", "ReferenceImages", "Linear"); - string[] leafFolders = EnumerateLeafFolders(referenceImagesPath).ToArray(); - int numOfLeafFolders = leafFolders.Length; - - Object[] selectedObjects = Selection.objects; - int numOfCopies = numOfLeafFolders * selectedObjects.Length; - - for (int i = 0; i < selectedObjects.Length; i++) - { - Texture2D selected = selectedObjects[i] as Texture2D; - if (selected != null) - { - string pathToOriginalImage = AssetDatabase.GetAssetPath(selected); - string extension = Path.GetExtension(pathToOriginalImage); - string imageName = selected.name + extension; - - StringBuilder sb = new StringBuilder(); - sb.AppendLine("Copied \"" + imageName + "\" to..."); - - for (int j = 0; j < numOfLeafFolders; j++) - { - string leafFolder = leafFolders[j]; - if (EditorUtility.DisplayCancelableProgressBar( - "Copy " + imageName + " to ReferenceImages", - string.Format("({0} of {1}) {2}", j, numOfCopies, leafFolder), - j / numOfLeafFolders) - ) - { - break; - } - - AssetDatabase.CopyAsset(pathToOriginalImage, Path.Combine(leafFolder, imageName)); - sb.AppendLine("-> " + leafFolder); - } - - EditorUtility.ClearProgressBar(); - - Debug.Log(sb); - } - } - } - - private static IEnumerable EnumerateLeafFolders(string root) - { - Stack dir = new Stack(); - dir.Push(root); - - while (dir.Count != 0) - { - bool anySubfolders = false; - root = dir.Pop(); - - foreach (var subfolder in Directory.EnumerateDirectories(root)) - { - dir.Push(subfolder); - anySubfolders = true; - } - - if (!anySubfolders) - { - yield return root; - } - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs deleted file mode 100644 index 19dd3c4eb54..00000000000 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs +++ /dev/null @@ -1,51 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEngine; -using UnityEngine.Profiling; - -[TestFixture] -public class MultipleViewGCTest : MonoBehaviour -{ - Recorder m_gcAllocRecorder; - EditorWindow m_sceneView; - - [OneTimeSetUp] - public void SetUp() - { - //Issue was caused by different nbr of cameras between views - var mainCamera = Camera.main; - for(int i = 0; i < 4; ++i) - { - var newCam = Instantiate(mainCamera); - } - - m_sceneView = EditorWindow.GetWindow(); - - m_gcAllocRecorder = Recorder.Get("GC.Alloc"); - m_gcAllocRecorder.FilterToCurrentThread(); - m_gcAllocRecorder.enabled = false; - - // Render first frame where gc is ok - m_sceneView.Repaint(); - Camera.main.Render(); - } - - [Test] - public void RenderSceneAndGameView() - { - Profiler.BeginSample("GC_Alloc_URP_MultipleViews"); - { - m_gcAllocRecorder.enabled = true; - m_sceneView.Repaint(); - Camera.main.Render(); - m_gcAllocRecorder.enabled = false; - } - int allocationCountOfRenderPipeline = m_gcAllocRecorder.sampleBlockCount; - - if (allocationCountOfRenderPipeline > 0) - { - Debug.LogError($"Memory was allocated {allocationCountOfRenderPipeline} times"); - } - Profiler.EndSample(); - } -} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs deleted file mode 100644 index 55638f844b2..00000000000 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs +++ /dev/null @@ -1,60 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; - -public class UniversalProjectEditorTests -{ - private static UniversalRenderPipelineAsset currentAsset; - - [Test] - public void GetCurrentAsset() - { - GetUniversalAsset(); - } - - [Test] - public void CheckAllLightingSettings() - { - var guids = AssetDatabase.FindAssets("t:LightingSettings"); - foreach (var guid in guids) - { - string path = AssetDatabase.GUIDToAssetPath(guid); - LightingSettings lightingSettings = AssetDatabase.LoadAssetAtPath(path); - if (lightingSettings.bakedGI) - { - Assert.IsTrue(lightingSettings.lightmapper != LightingSettings.Lightmapper.Enlighten, - $"Lighting settings ({path}) uses deprecated lightmapper Enlighten."); - Assert.IsTrue(lightingSettings.filteringMode == LightingSettings.FilterMode.None, - $"Lighting settings ({path}) have baked GI with filter mode enabled. It is recommended to turn of filter mode to reduce halo effect (If you still want to use it please contact URP team first)."); - } - } - } - - //[Test] - public void GetDefaultRenderer() - { - GetUniversalAsset(); - - Assert.IsNotNull(currentAsset.scriptableRenderer, "Current ScriptableRenderer is null."); - } - - //Utilities - void GetUniversalAsset() - { - var renderpipelineAsset = GraphicsSettings.currentRenderPipeline; - - if(renderpipelineAsset == null) - Assert.Fail("No Render Pipeline Asset assigned."); - - if (renderpipelineAsset.GetType() == typeof(UniversalRenderPipelineAsset)) - { - currentAsset = renderpipelineAsset as UniversalRenderPipelineAsset; - } - else - { - Assert.Inconclusive("Project not setup for Universal RP."); - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs deleted file mode 100644 index 834ae378268..00000000000 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs +++ /dev/null @@ -1,50 +0,0 @@ -using UnityEngine; - -[ExecuteInEditMode] -public class ArrayDrawer : MonoBehaviour -{ - [Space] - public int columns = 10; - public float interval = 1; - public float cellSize = 0.1f; - - [Space] - [ColorUsage(false, true)] - public Color color1 = Color.green; - - [ColorUsage(false, true)] - public Color color2 = Color.red; - - public Mesh mesh; - public Material material; - - MaterialPropertyBlock _props; - - void Update() - { - if (_props == null) - _props = new MaterialPropertyBlock(); - - var origin = transform.position + new Vector3( - interval * columns * -0.5f, - interval * columns * -0.5f, 0f - ); - var rotation = transform.rotation; - var scale = Vector3.one * cellSize; - - for (int y = 0; y <= columns; y++) - { - for (int x = 0; x <= columns; x++) - { - var position = origin + new Vector3(x, y, 0f) * interval; - var matrix = Matrix4x4.TRS(position, rotation, scale); - - var c1 = color1 * ((float)x / columns); - var c2 = color2 * ((float)y / columns); - _props.SetColor("_EmissionColor", c1 + c2); - - Graphics.DrawMesh(mesh, matrix, material, 0, null, 0, _props); - } - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs deleted file mode 100644 index b3042bba022..00000000000 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs +++ /dev/null @@ -1,176 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; -using UnityEngine.Rendering.Universal.Internal; - -[CreateAssetMenu] -public class CameraCallbackTests : ScriptableRendererFeature -{ - static RenderTargetHandle beforeAll; - static RenderTargetHandle afterOpaque; - static RenderTargetHandle afterSkybox; - static RenderTargetHandle afterSkybox2; - static RenderTargetHandle afterTransparent; - static RenderTargetHandle afterPost; - static RenderTargetHandle afterAll; - - BlitPass m_BlitRenderPassesToScreen; - Material m_SamplingMaterial; - - public CameraCallbackTests() - { - beforeAll.Init("_BeforeAll"); - afterOpaque.Init("_AfterOpaque"); - afterSkybox.Init("_AfterSkybox"); - afterSkybox2.Init("_AfterSkybox2"); - afterTransparent.Init("_AfterTransparent"); - afterPost.Init("_AfterPostProcessTexture"); - afterAll.Init("_AfterAll"); - } - - public override void Create() - { - UniversalRendererData data = null; - if (UniversalRenderPipeline.asset.m_RendererDataList[0] != null) - data = UniversalRenderPipeline.asset.m_RendererDataList[0] as UniversalRendererData; - - if (data == null) - return; - - if (data.shaders == null) - return; - - if (data.shaders.samplingPS == null) - return; - - if (m_SamplingMaterial == null) - m_SamplingMaterial = CoreUtils.CreateEngineMaterial(data.shaders.samplingPS); - } - - public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) - { - Downsampling downSamplingMethod = UniversalRenderPipeline.asset.opaqueDownsampling; - - var cameraColorTarget = renderer.cameraColorTarget; - var clearRenderPass = new ClearColorPass(RenderPassEvent.BeforeRenderingOpaques, cameraColorTarget); - - var copyBeforeOpaquePass = new CopyColorPass(RenderPassEvent.BeforeRenderingOpaques, m_SamplingMaterial); - copyBeforeOpaquePass.Setup(cameraColorTarget, beforeAll, downSamplingMethod); - - var copyAfterOpaquePass = new CopyColorPass(RenderPassEvent.AfterRenderingOpaques, m_SamplingMaterial); - copyAfterOpaquePass.Setup(cameraColorTarget, afterOpaque, downSamplingMethod); - - var copyAfterSkyboxPass = new CopyColorPass(RenderPassEvent.AfterRenderingSkybox, m_SamplingMaterial); - copyAfterSkyboxPass.Setup(cameraColorTarget, afterSkybox, downSamplingMethod); - - var copyAfterSkyboxPass2 = new CopyColorPass(RenderPassEvent.AfterRenderingSkybox, m_SamplingMaterial); - copyAfterSkyboxPass.Setup(cameraColorTarget, afterSkybox2, downSamplingMethod); - - var copyAfterTransparents = new CopyColorPass(RenderPassEvent.AfterRenderingTransparents, m_SamplingMaterial); - copyAfterTransparents.Setup(cameraColorTarget, afterTransparent, downSamplingMethod); - - var copyAfterEverything = new CopyColorPass(RenderPassEvent.AfterRenderingPostProcessing, m_SamplingMaterial); - copyAfterEverything.Setup(afterPost.id, afterAll, downSamplingMethod); - - if (m_BlitRenderPassesToScreen == null) - m_BlitRenderPassesToScreen = new BlitPass(RenderPassEvent.AfterRendering, cameraColorTarget); - - // Inserts out of order so we also test render passes sort correctly - renderer.EnqueuePass(copyAfterEverything); - renderer.EnqueuePass(m_BlitRenderPassesToScreen); - renderer.EnqueuePass(copyAfterOpaquePass); - renderer.EnqueuePass(copyAfterSkyboxPass); - renderer.EnqueuePass(copyAfterSkyboxPass2); - renderer.EnqueuePass(copyAfterTransparents); - renderer.EnqueuePass(clearRenderPass); - renderer.EnqueuePass(copyBeforeOpaquePass); - } - - protected override void Dispose(bool disposing) - { - CoreUtils.Destroy(m_SamplingMaterial); - m_BlitRenderPassesToScreen?.Cleanup(); - } - - internal class ClearColorPass : ScriptableRenderPass - { - RenderTargetIdentifier m_ColorHandle; - - public ClearColorPass(RenderPassEvent renderPassEvent, RenderTargetIdentifier colorHandle) - { - m_ColorHandle = colorHandle; - this.renderPassEvent = renderPassEvent; - } - - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) - { - var cmd = CommandBufferPool.Get("Clear Color"); - cmd.SetRenderTarget(m_ColorHandle); - cmd.ClearRenderTarget(true, true, Color.yellow); - context.ExecuteCommandBuffer(cmd); - CommandBufferPool.Release(cmd); - } - } - - class BlitPass : ScriptableRenderPass - { - private RenderTargetIdentifier colorHandle; - Material m_BlitMaterial; - - public BlitPass(RenderPassEvent renderPassEvent, RenderTargetIdentifier colorHandle) - { - this.colorHandle = colorHandle; - this.renderPassEvent = renderPassEvent; - m_BlitMaterial = CoreUtils.CreateEngineMaterial(Shader.Find("Hidden/Universal Render Pipeline/Blit")); - } - - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) - { - var mesh = RenderingUtils.fullscreenMesh; - CommandBuffer cmd = CommandBufferPool.Get("Blit Pass"); - cmd.SetRenderTarget(colorHandle); - cmd.SetViewProjectionMatrices(Matrix4x4.identity, Matrix4x4.identity); - - cmd.SetViewport(new Rect(0, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", beforeAll.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterOpaque.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f * 2.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterSkybox.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterSkybox2.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterTransparent.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f * 2.0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterAll.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - context.ExecuteCommandBuffer(cmd); - CommandBufferPool.Release(cmd); - } - - public override void OnCameraCleanup(CommandBuffer cmd) - { - if (cmd == null) - throw new ArgumentNullException("cmd"); - - base.OnCameraCleanup(cmd); - } - - public void Cleanup() - { - CoreUtils.Destroy(m_BlitMaterial); - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline.meta deleted file mode 100644 index 38c1199c220..00000000000 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 86b1b397ac56d494a8506bcada4b13eb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs deleted file mode 100644 index 8d6f4132931..00000000000 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace UnityEngine.Rendering.Universal -{ - //[CreateAssetMenu()] - public class CustomRenderGraphData : ScriptableRendererData - { - protected override ScriptableRenderer Create() - { - return new CustomRenderer(this); - } - } -} - diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs deleted file mode 100644 index 21b14e6f223..00000000000 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs +++ /dev/null @@ -1,121 +0,0 @@ -using NUnit.Framework; -using UnityEngine; -using UnityEngine.Rendering.Universal; -using UnityEngine.Rendering.Universal; - -[TestFixture] -class Renderer2DTests -{ - GameObject m_BaseObj; - GameObject m_OverlayObj; - Camera m_BaseCamera; - Camera m_OverlayCamera; - UniversalAdditionalCameraData m_BaseCameraData; - UniversalAdditionalCameraData m_OverlayCameraData; - - [SetUp] - public void Setup() - { - m_BaseObj = new GameObject(); - m_BaseCamera = m_BaseObj.AddComponent(); - m_BaseCameraData = m_BaseObj.AddComponent(); - - m_BaseCamera.allowHDR = false; - m_BaseCameraData.SetRenderer(3); // 2D Renderer. See the list of Renderers in CommonAssets/UniversalRPAsset. - m_BaseCameraData.renderType = CameraRenderType.Base; - m_BaseCameraData.renderPostProcessing = false; - - m_OverlayObj = new GameObject(); - m_OverlayCamera = m_OverlayObj.AddComponent(); - m_OverlayCameraData = m_OverlayObj.AddComponent(); - - m_OverlayCamera.allowHDR = false; - m_OverlayCameraData.SetRenderer(3); // 2D Renderer. See the list of Renderers in CommonAssets/UniversalRPAsset. - m_OverlayCameraData.renderType = CameraRenderType.Overlay; - m_OverlayCameraData.renderPostProcessing = false; - } - - [TearDown] - public void Cleanup() - { - Object.DestroyImmediate(m_OverlayObj); - Object.DestroyImmediate(m_BaseObj); - } - - [Test] - public void BaseRendererDoesNotCreateRenderTexturesIfStackIsEmpty() - { - m_BaseCamera.Render(); - - Renderer2D baseRenderer = m_BaseCameraData.scriptableRenderer as Renderer2D; - - // XRTODO: investigate why baseRenderer.createColorTexture (due to sRGB) is true when XR is enabled - if (UnityEngine.Rendering.XRGraphicsAutomatedTests.enabled) - return; - - Assert.IsFalse(baseRenderer.createColorTexture); - Assert.AreEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget); - - Assert.IsFalse(baseRenderer.createDepthTexture); - Assert.AreEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraDepthTarget); - } - - [Test] - public void BaseRendererCreatesRenderTexturesIfStackIsNotEmpty() - { - m_BaseCameraData.cameraStack.Add(m_OverlayCamera); - - m_BaseCamera.Render(); - - Renderer2D baseRenderer = m_BaseCameraData.scriptableRenderer as Renderer2D; - - Assert.IsTrue(baseRenderer.createColorTexture); - Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget); - - Assert.IsTrue(baseRenderer.createDepthTexture); - Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraDepthTarget); - } - - [Test] - public void BaseRendererUsesDepthAttachmentOfColorTextureIfNoDepthTextureCreated() - { - m_BaseCameraData.renderPostProcessing = true; // This will make the renderer create color texture. - - m_BaseCamera.Render(); - - Renderer2D baseRenderer = m_BaseCameraData.scriptableRenderer as Renderer2D; - - Assert.IsTrue(baseRenderer.createColorTexture); - Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget); - - Assert.IsFalse(baseRenderer.createDepthTexture); - Assert.AreEqual(baseRenderer.cameraColorTarget, baseRenderer.cameraDepthTarget); - } - - [Test] - public void OverlayRendererUsesRenderTexturesFromBase() - { - m_BaseCameraData.cameraStack.Add(m_OverlayCamera); - - m_BaseCamera.Render(); - - Renderer2D baseRenderer = m_BaseCameraData.scriptableRenderer as Renderer2D; - Renderer2D overlayRenderer = m_OverlayCameraData.scriptableRenderer as Renderer2D; - - Assert.AreEqual(baseRenderer.cameraColorTarget, overlayRenderer.cameraColorTarget); - Assert.AreEqual(baseRenderer.cameraDepthTarget, overlayRenderer.cameraDepthTarget); - } - - [Test] - public void OverlayRendererSetsTheCreateTextureFlags() - { - m_BaseCameraData.cameraStack.Add(m_OverlayCamera); - - m_BaseCamera.Render(); - - Renderer2D overlayRenderer = m_OverlayCameraData.scriptableRenderer as Renderer2D; - - Assert.IsTrue(overlayRenderer.createColorTexture); - Assert.IsTrue(overlayRenderer.createDepthTexture); - } -} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs.meta deleted file mode 100644 index c12a75a66a8..00000000000 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 81dcce77bc315694c8a725ccd840629e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs deleted file mode 100644 index acd20bbfe09..00000000000 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs +++ /dev/null @@ -1,92 +0,0 @@ -using NUnit.Framework; -using System.Collections; -using System.Linq; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.SceneManagement; -using UnityEngine.TestTools; -using UnityEngine.TestTools.Graphics; - -public class UniversalGraphicsTests -{ -#if UNITY_ANDROID - static bool wasFirstSceneRan = false; - const int firstSceneAdditionalFrames = 3; -#endif - - public const string universalPackagePath = "Assets/ReferenceImages"; - - [UnityTest, Category("UniversalRP")] - [PrebuildSetup("SetupGraphicsTestCases")] - [UseGraphicsTestCases(universalPackagePath)] - public IEnumerator Run(GraphicsTestCase testCase) - { - SceneManager.LoadScene(testCase.ScenePath); - - // Always wait one frame for scene load - yield return null; - - var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x=>x.GetComponent()); - var settings = Object.FindObjectOfType(); - Assert.IsNotNull(settings, "Invalid test scene, couldn't find UniversalGraphicsTestSettings"); - - int waitFrames = Unity.Testing.XR.Runtime.ConfigureMockHMD.SetupTest(settings.XRCompatible, settings.WaitFrames, settings.ImageComparisonSettings); - - Scene scene = SceneManager.GetActiveScene(); - - yield return null; - - if (settings.ImageComparisonSettings.UseBackBuffer && waitFrames < 1) - waitFrames = 1; - - for (int i = 0; i < waitFrames; i++) - yield return new WaitForEndOfFrame(); - -#if UNITY_ANDROID - // On Android first scene often needs a bit more frames to load all the assets - // otherwise the screenshot is just a black screen - if (!wasFirstSceneRan) - { - for(int i = 0; i < firstSceneAdditionalFrames; i++) - { - yield return new WaitForEndOfFrame(); - } - wasFirstSceneRan = true; - } -#endif - - ImageAssert.AreEqual(testCase.ReferenceImage, cameras.Where(x => x != null), settings.ImageComparisonSettings); - - // Does it allocate memory when it renders what's on the main camera? - bool allocatesMemory = false; - var mainCamera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent(); - - try - { - ImageAssert.AllocatesMemory(mainCamera, settings?.ImageComparisonSettings); - } - catch (AssertionException) - { - allocatesMemory = true; - } - - if (allocatesMemory) - Assert.Fail("Allocated memory when rendering what is on main camera"); - } - -#if UNITY_EDITOR - [TearDown] - public void DumpImagesInEditor() - { - UnityEditor.TestTools.Graphics.ResultsUtility.ExtractImagesFromTestProperties(TestContext.CurrentContext.Test); - } - -#if ENABLE_VR - [TearDown] - public void TearDownXR() - { - XRGraphicsAutomatedTests.running = false; - } -#endif -#endif -} diff --git a/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json index 070d86001b0..bd57ab5c511 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json @@ -10,6 +10,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", + "com.unity.testing.urp": "file:../../../com.unity.testing.urp", "com.unity.test-framework": "1.1.18", "com.unity.test-framework.build": "0.0.1-preview.14", "com.unity.test-framework.utp-reporter": "1.0.2-preview", @@ -52,6 +53,7 @@ "com.unity.render-pipelines.core", "com.unity.render-pipelines.universal", "com.unity.testframework.graphics", - "com.unity.testing.xr" + "com.unity.testing.xr", + "com.unity.testing.urp" ] } diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/MultipleViewGCTest.cs.meta b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/MultipleViewGCTest.cs.meta deleted file mode 100644 index f7a7c411a69..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/MultipleViewGCTest.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ee6faed4fcdc01e4b91eb8b0b4f2360d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/SetupGraphicsTestCases.cs b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/SetupGraphicsTestCases.cs deleted file mode 100644 index 36c5722bc15..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/SetupGraphicsTestCases.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UnityEngine.TestTools; - -public class SetupGraphicsTestCases : IPrebuildSetup -{ - public void Setup() - { - // Work around case #1033694, unable to use PrebuildSetup types directly from assemblies that don't have special names. - // Once that's fixed, this class can be deleted and the SetupGraphicsTestCases class in Unity.TestFramework.Graphics.Editor - // can be used directly instead. - UnityEditor.TestTools.Graphics.SetupGraphicsTestCases.Setup(UniversalGraphicsTests.universalPackagePath); - - // Configure project for XR tests - Unity.Testing.XR.Editor.InjectMockHMD.SetupLoader(); - } -} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta deleted file mode 100644 index ac9277c7f8d..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0f6fc80695ba0bc48b4edeb2ce544600 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef deleted file mode 100644 index 85b2624cb2d..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "UniversalEditorTests", - "references": [ - "GUID:e18141520846dcc44b725b2f74e91229", - "GUID:ed05cc0a83a5a40c0a6e72098212c312", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3", - "GUID:925cf1d7b1444c3448cc9b44ce814a9e", - "GUID:c579267770062bf448e75eb160330b7f", - "GUID:15fc0a57446b3144c949da3e2b9737a9" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta deleted file mode 100644 index c6dc88a9b3c..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 55aba1c6f9cf8e949aa77aaeccd46083 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta deleted file mode 100644 index 0ba0e1eee93..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: ddf535d28d764921a6709da5d30ba07f -timeCreated: 1572431758 \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/ArrayDrawer.cs.meta b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/ArrayDrawer.cs.meta deleted file mode 100644 index 6431c94712a..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/ArrayDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a292b138ce99b204790a0a0322fac572 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CameraCallbackTests.cs.meta b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CameraCallbackTests.cs.meta deleted file mode 100644 index 3b932264aa5..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CameraCallbackTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1922bf90be6ebc54da38e96e30f9339a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset deleted file mode 100644 index 3205ff3c52a..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset +++ /dev/null @@ -1,15 +0,0 @@ -%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: 19dda12d58f1fbb4e9ef172721391ff2, type: 3} - m_Name: CustomRenderGraph - m_EditorClassIdentifier: - m_RendererFeatures: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta deleted file mode 100644 index 50e353b4a73..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e46834cadfc4eb241bd46a362765a390 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta deleted file mode 100644 index c8591e6eca1..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 19dda12d58f1fbb4e9ef172721391ff2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs deleted file mode 100644 index c31e61e99a9..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs +++ /dev/null @@ -1,31 +0,0 @@ -using UnityEngine.Rendering.Universal.Internal; - -namespace UnityEngine.Rendering.Universal -{ - public class CustomRenderer : ScriptableRenderer - { - private DrawObjectsPass m_RenderOpaqueForwardPass; - - ForwardLights m_ForwardLights; - - public CustomRenderer(CustomRenderGraphData data) : base(data) - { - m_RenderOpaqueForwardPass = new DrawObjectsPass("Render Opaques", true, RenderPassEvent.BeforeRenderingOpaques + 1, RenderQueueRange.opaque, -1, StencilState.defaultValue, 0); - m_ForwardLights = new ForwardLights(); - } - - public override void Setup(ScriptableRenderContext context, ref RenderingData renderingData) - { - ConfigureCameraTarget(BuiltinRenderTextureType.CameraTarget, BuiltinRenderTextureType.CameraTarget); - - foreach (var feature in rendererFeatures) - feature.AddRenderPasses(this, ref renderingData); - EnqueuePass(m_RenderOpaqueForwardPass); - } - - public override void SetupLights(ScriptableRenderContext context, ref RenderingData renderingData) - { - m_ForwardLights.Setup(context, ref renderingData); - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta deleted file mode 100644 index aabda3faa95..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7e0da365be9e44c3bae8da691ccd8de6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef deleted file mode 100644 index 7e2af3c48dd..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "UniversalGraphicsTests", - "references": [ - "GUID:c081bc530f560634bb5c21d4b323a7f1", - "GUID:15fc0a57446b3144c949da3e2b9737a9", - "GUID:df380645f10b7bc4b97d4f5eb6303d95", - "GUID:1d4ad4ead25f33942b7dcf63e8c0820b", - "GUID:d60799ab2a985554ea1a39cd38695018", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [] -} \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs deleted file mode 100644 index ac5e0e8c3b1..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEngine.TestTools.Graphics; - -public class UniversalGraphicsTestSettings : GraphicsTestSettings -{ - public int WaitFrames = 0; - public bool XRCompatible = true; - - public UniversalGraphicsTestSettings() - { - ImageComparisonSettings.TargetWidth = 512; - ImageComparisonSettings.TargetHeight = 512; - ImageComparisonSettings.AverageCorrectnessThreshold = 0.005f; - ImageComparisonSettings.PerPixelCorrectnessThreshold = 0.001f; - ImageComparisonSettings.UseBackBuffer = false; - } -} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta deleted file mode 100644 index 43adf6dc9f1..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 73231aa468d81ea49bc3d914080de185 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta deleted file mode 100644 index da0cc3dccc9..00000000000 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 52da4b5c062caa34a980de1d467b3a58 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_Foundation/Packages/manifest.json index 5463159813c..f7b99075781 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_Foundation/Packages/manifest.json @@ -10,6 +10,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", + "com.unity.testing.urp": "file:../../../com.unity.testing.urp", "com.unity.test-framework": "1.1.18", "com.unity.test-framework.build": "0.0.1-preview.14", "com.unity.test-framework.utp-reporter": "1.0.2-preview", @@ -52,6 +53,7 @@ "com.unity.render-pipelines.core", "com.unity.render-pipelines.universal", "com.unity.testframework.graphics", - "com.unity.testing.xr" + "com.unity.testing.xr", + "com.unity.testing.urp" ] } diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor.meta deleted file mode 100644 index 08359117fb3..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5e2697a0937eb4d16a14e27b38e871ab -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/CopyImageToReferenceFolders.cs b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/CopyImageToReferenceFolders.cs deleted file mode 100644 index 84871b2daba..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/CopyImageToReferenceFolders.cs +++ /dev/null @@ -1,79 +0,0 @@ -using UnityEngine; -using UnityEditor; -using System.IO; -using System.Collections.Generic; -using System.Text; -using System.Linq; - -public class CopyImageToReferenceFolders -{ - // Add a new menu item that is accessed by right-clicking on an asset in the project view - - [MenuItem("Assets/CopyToReferenceImages", priority = 1)] - private static void CopyImages() - { - string referenceImagesPath = Path.Combine("Assets", "ReferenceImages", "Linear"); - string[] leafFolders = EnumerateLeafFolders(referenceImagesPath).ToArray(); - int numOfLeafFolders = leafFolders.Length; - - Object[] selectedObjects = Selection.objects; - int numOfCopies = numOfLeafFolders * selectedObjects.Length; - - for (int i = 0; i < selectedObjects.Length; i++) - { - Texture2D selected = selectedObjects[i] as Texture2D; - if (selected != null) - { - string pathToOriginalImage = AssetDatabase.GetAssetPath(selected); - string extension = Path.GetExtension(pathToOriginalImage); - string imageName = selected.name + extension; - - StringBuilder sb = new StringBuilder(); - sb.AppendLine("Copied \"" + imageName + "\" to..."); - - for (int j = 0; j < numOfLeafFolders; j++) - { - string leafFolder = leafFolders[j]; - if (EditorUtility.DisplayCancelableProgressBar( - "Copy " + imageName + " to ReferenceImages", - string.Format("({0} of {1}) {2}", j, numOfCopies, leafFolder), - j / numOfLeafFolders) - ) - { - break; - } - - AssetDatabase.CopyAsset(pathToOriginalImage, Path.Combine(leafFolder, imageName)); - sb.AppendLine("-> " + leafFolder); - } - - EditorUtility.ClearProgressBar(); - - Debug.Log(sb); - } - } - } - - private static IEnumerable EnumerateLeafFolders(string root) - { - Stack dir = new Stack(); - dir.Push(root); - - while (dir.Count != 0) - { - bool anySubfolders = false; - root = dir.Pop(); - - foreach (var subfolder in Directory.EnumerateDirectories(root)) - { - dir.Push(subfolder); - anySubfolders = true; - } - - if (!anySubfolders) - { - yield return root; - } - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta deleted file mode 100644 index d47d738e01d..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e412e7020a31eb84b9b2cb1f80ccc7f5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/MultipleViewGCTest.cs b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/MultipleViewGCTest.cs deleted file mode 100644 index 1ef14f9eb02..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/MultipleViewGCTest.cs +++ /dev/null @@ -1,51 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEngine; -using UnityEngine.Profiling; - -[TestFixture] -public class MultipleViewGCTest : MonoBehaviour -{ - Recorder m_gcAllocRecorder; - EditorWindow m_sceneView; - - [OneTimeSetUp] - public void SetUp() - { - //Issue was caused by different nbr of cameras between views - var mainCamera = Camera.main; - for (int i = 0; i < 4; ++i) - { - var newCam = Instantiate(mainCamera); - } - - m_sceneView = EditorWindow.GetWindow(); - - m_gcAllocRecorder = Recorder.Get("GC.Alloc"); - m_gcAllocRecorder.FilterToCurrentThread(); - m_gcAllocRecorder.enabled = false; - - // Render first frame where gc is ok - m_sceneView.Repaint(); - Camera.main.Render(); - } - - [Test] - public void RenderSceneAndGameView() - { - Profiler.BeginSample("GC_Alloc_URP_MultipleViews"); - { - m_gcAllocRecorder.enabled = true; - m_sceneView.Repaint(); - Camera.main.Render(); - m_gcAllocRecorder.enabled = false; - } - int allocationCountOfRenderPipeline = m_gcAllocRecorder.sampleBlockCount; - - if (allocationCountOfRenderPipeline > 0) - { - Debug.LogError($"Memory was allocated {allocationCountOfRenderPipeline} times"); - } - Profiler.EndSample(); - } -} diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/MultipleViewGCTest.cs.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/MultipleViewGCTest.cs.meta deleted file mode 100644 index f7a7c411a69..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/MultipleViewGCTest.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ee6faed4fcdc01e4b91eb8b0b4f2360d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/SetupGraphicsTestCases.cs b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/SetupGraphicsTestCases.cs deleted file mode 100644 index 36c5722bc15..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/SetupGraphicsTestCases.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UnityEngine.TestTools; - -public class SetupGraphicsTestCases : IPrebuildSetup -{ - public void Setup() - { - // Work around case #1033694, unable to use PrebuildSetup types directly from assemblies that don't have special names. - // Once that's fixed, this class can be deleted and the SetupGraphicsTestCases class in Unity.TestFramework.Graphics.Editor - // can be used directly instead. - UnityEditor.TestTools.Graphics.SetupGraphicsTestCases.Setup(UniversalGraphicsTests.universalPackagePath); - - // Configure project for XR tests - Unity.Testing.XR.Editor.InjectMockHMD.SetupLoader(); - } -} diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta deleted file mode 100644 index ac9277c7f8d..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0f6fc80695ba0bc48b4edeb2ce544600 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef deleted file mode 100644 index 85b2624cb2d..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "UniversalEditorTests", - "references": [ - "GUID:e18141520846dcc44b725b2f74e91229", - "GUID:ed05cc0a83a5a40c0a6e72098212c312", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3", - "GUID:925cf1d7b1444c3448cc9b44ce814a9e", - "GUID:c579267770062bf448e75eb160330b7f", - "GUID:15fc0a57446b3144c949da3e2b9737a9" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta deleted file mode 100644 index c6dc88a9b3c..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 55aba1c6f9cf8e949aa77aaeccd46083 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/UniversalProjectEditorTests.cs b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/UniversalProjectEditorTests.cs deleted file mode 100644 index c99b6630d22..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/UniversalProjectEditorTests.cs +++ /dev/null @@ -1,60 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; - -public class UniversalProjectEditorTests -{ - private static UniversalRenderPipelineAsset currentAsset; - - [Test] - public void GetCurrentAsset() - { - GetUniversalAsset(); - } - - [Test] - public void CheckAllLightingSettings() - { - var guids = AssetDatabase.FindAssets("t:LightingSettings"); - foreach (var guid in guids) - { - string path = AssetDatabase.GUIDToAssetPath(guid); - LightingSettings lightingSettings = AssetDatabase.LoadAssetAtPath(path); - if (lightingSettings.bakedGI) - { - Assert.IsTrue(lightingSettings.lightmapper != LightingSettings.Lightmapper.Enlighten, - $"Lighting settings ({path}) uses deprecated lightmapper Enlighten."); - Assert.IsTrue(lightingSettings.filteringMode == LightingSettings.FilterMode.None, - $"Lighting settings ({path}) have baked GI with filter mode enabled. It is recommended to turn of filter mode to reduce halo effect (If you still want to use it please contact URP team first)."); - } - } - } - - //[Test] - public void GetDefaultRenderer() - { - GetUniversalAsset(); - - Assert.IsNotNull(currentAsset.scriptableRenderer, "Current ScriptableRenderer is null."); - } - - //Utilities - void GetUniversalAsset() - { - var renderpipelineAsset = GraphicsSettings.currentRenderPipeline; - - if (renderpipelineAsset == null) - Assert.Fail("No Render Pipeline Asset assigned."); - - if (renderpipelineAsset.GetType() == typeof(UniversalRenderPipelineAsset)) - { - currentAsset = renderpipelineAsset as UniversalRenderPipelineAsset; - } - else - { - Assert.Inconclusive("Project not setup for Universal RP."); - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta deleted file mode 100644 index 0ba0e1eee93..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: ddf535d28d764921a6709da5d30ba07f -timeCreated: 1572431758 \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime.meta deleted file mode 100644 index 024e60453b3..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cf1e832b4cf03425a92b2a6eca5c4400 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/ArrayDrawer.cs b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/ArrayDrawer.cs deleted file mode 100644 index 88fafc26119..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/ArrayDrawer.cs +++ /dev/null @@ -1,50 +0,0 @@ -using UnityEngine; - -[ExecuteInEditMode] -public class ArrayDrawer : MonoBehaviour -{ - [Space] - public int columns = 10; - public float interval = 1; - public float cellSize = 0.1f; - - [Space] - [ColorUsage(false, true)] - public Color color1 = Color.green; - - [ColorUsage(false, true)] - public Color color2 = Color.red; - - public Mesh mesh; - public Material material; - - MaterialPropertyBlock _props; - - void Update() - { - if (_props == null) - _props = new MaterialPropertyBlock(); - - var origin = transform.position + new Vector3( - interval * columns * -0.5f, - interval * columns * -0.5f, 0f - ); - var rotation = transform.rotation; - var scale = Vector3.one * cellSize; - - for (int y = 0; y <= columns; y++) - { - for (int x = 0; x <= columns; x++) - { - var position = origin + new Vector3(x, y, 0f) * interval; - var matrix = Matrix4x4.TRS(position, rotation, scale); - - var c1 = color1 * ((float)x / columns); - var c2 = color2 * ((float)y / columns); - _props.SetColor("_EmissionColor", c1 + c2); - - Graphics.DrawMesh(mesh, matrix, material, 0, null, 0, _props); - } - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/ArrayDrawer.cs.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/ArrayDrawer.cs.meta deleted file mode 100644 index 6431c94712a..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/ArrayDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a292b138ce99b204790a0a0322fac572 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/CameraCallbackTests.cs b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/CameraCallbackTests.cs deleted file mode 100644 index d7b5f1b8d46..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/CameraCallbackTests.cs +++ /dev/null @@ -1,176 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; -using UnityEngine.Rendering.Universal.Internal; - -[CreateAssetMenu] -public class CameraCallbackTests : ScriptableRendererFeature -{ - static RenderTargetHandle beforeAll; - static RenderTargetHandle afterOpaque; - static RenderTargetHandle afterSkybox; - static RenderTargetHandle afterSkybox2; - static RenderTargetHandle afterTransparent; - static RenderTargetHandle afterPost; - static RenderTargetHandle afterAll; - - BlitPass m_BlitRenderPassesToScreen; - Material m_SamplingMaterial; - - public CameraCallbackTests() - { - beforeAll.Init("_BeforeAll"); - afterOpaque.Init("_AfterOpaque"); - afterSkybox.Init("_AfterSkybox"); - afterSkybox2.Init("_AfterSkybox2"); - afterTransparent.Init("_AfterTransparent"); - afterPost.Init("_AfterPostProcessTexture"); - afterAll.Init("_AfterAll"); - } - - public override void Create() - { - UniversalRendererData data = null; - if (UniversalRenderPipeline.asset.m_RendererDataList[0] != null) - data = UniversalRenderPipeline.asset.m_RendererDataList[0] as UniversalRendererData; - - if (data == null) - return; - - if (data.shaders == null) - return; - - if (data.shaders.samplingPS == null) - return; - - if (m_SamplingMaterial == null) - m_SamplingMaterial = CoreUtils.CreateEngineMaterial(data.shaders.samplingPS); - } - - public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) - { - Downsampling downSamplingMethod = UniversalRenderPipeline.asset.opaqueDownsampling; - - var cameraColorTarget = renderer.cameraColorTarget; - var clearRenderPass = new ClearColorPass(RenderPassEvent.BeforeRenderingOpaques, cameraColorTarget); - - var copyBeforeOpaquePass = new CopyColorPass(RenderPassEvent.BeforeRenderingOpaques, m_SamplingMaterial); - copyBeforeOpaquePass.Setup(cameraColorTarget, beforeAll, downSamplingMethod); - - var copyAfterOpaquePass = new CopyColorPass(RenderPassEvent.AfterRenderingOpaques, m_SamplingMaterial); - copyAfterOpaquePass.Setup(cameraColorTarget, afterOpaque, downSamplingMethod); - - var copyAfterSkyboxPass = new CopyColorPass(RenderPassEvent.AfterRenderingSkybox, m_SamplingMaterial); - copyAfterSkyboxPass.Setup(cameraColorTarget, afterSkybox, downSamplingMethod); - - var copyAfterSkyboxPass2 = new CopyColorPass(RenderPassEvent.AfterRenderingSkybox, m_SamplingMaterial); - copyAfterSkyboxPass.Setup(cameraColorTarget, afterSkybox2, downSamplingMethod); - - var copyAfterTransparents = new CopyColorPass(RenderPassEvent.AfterRenderingTransparents, m_SamplingMaterial); - copyAfterTransparents.Setup(cameraColorTarget, afterTransparent, downSamplingMethod); - - var copyAfterEverything = new CopyColorPass(RenderPassEvent.AfterRenderingPostProcessing, m_SamplingMaterial); - copyAfterEverything.Setup(afterPost.id, afterAll, downSamplingMethod); - - if (m_BlitRenderPassesToScreen == null) - m_BlitRenderPassesToScreen = new BlitPass(RenderPassEvent.AfterRendering, cameraColorTarget); - - // Inserts out of order so we also test render passes sort correctly - renderer.EnqueuePass(copyAfterEverything); - renderer.EnqueuePass(m_BlitRenderPassesToScreen); - renderer.EnqueuePass(copyAfterOpaquePass); - renderer.EnqueuePass(copyAfterSkyboxPass); - renderer.EnqueuePass(copyAfterSkyboxPass2); - renderer.EnqueuePass(copyAfterTransparents); - renderer.EnqueuePass(clearRenderPass); - renderer.EnqueuePass(copyBeforeOpaquePass); - } - - protected override void Dispose(bool disposing) - { - CoreUtils.Destroy(m_SamplingMaterial); - m_BlitRenderPassesToScreen?.Cleanup(); - } - - internal class ClearColorPass : ScriptableRenderPass - { - RenderTargetIdentifier m_ColorHandle; - - public ClearColorPass(RenderPassEvent renderPassEvent, RenderTargetIdentifier colorHandle) - { - m_ColorHandle = colorHandle; - this.renderPassEvent = renderPassEvent; - } - - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) - { - var cmd = CommandBufferPool.Get("Clear Color"); - cmd.SetRenderTarget(m_ColorHandle); - cmd.ClearRenderTarget(true, true, Color.yellow); - context.ExecuteCommandBuffer(cmd); - CommandBufferPool.Release(cmd); - } - } - - class BlitPass : ScriptableRenderPass - { - private RenderTargetIdentifier colorHandle; - Material m_BlitMaterial; - - public BlitPass(RenderPassEvent renderPassEvent, RenderTargetIdentifier colorHandle) - { - this.colorHandle = colorHandle; - this.renderPassEvent = renderPassEvent; - m_BlitMaterial = CoreUtils.CreateEngineMaterial(Shader.Find("Hidden/Universal Render Pipeline/Blit")); - } - - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) - { - var mesh = RenderingUtils.fullscreenMesh; - CommandBuffer cmd = CommandBufferPool.Get("Blit Pass"); - cmd.SetRenderTarget(colorHandle); - cmd.SetViewProjectionMatrices(Matrix4x4.identity, Matrix4x4.identity); - - cmd.SetViewport(new Rect(0, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", beforeAll.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterOpaque.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f * 2.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterSkybox.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterSkybox2.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterTransparent.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f * 2.0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterAll.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - context.ExecuteCommandBuffer(cmd); - CommandBufferPool.Release(cmd); - } - - public override void OnCameraCleanup(CommandBuffer cmd) - { - if (cmd == null) - throw new ArgumentNullException("cmd"); - - base.OnCameraCleanup(cmd); - } - - public void Cleanup() - { - CoreUtils.Destroy(m_BlitMaterial); - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/CameraCallbackTests.cs.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/CameraCallbackTests.cs.meta deleted file mode 100644 index 3b932264aa5..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/CameraCallbackTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1922bf90be6ebc54da38e96e30f9339a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef deleted file mode 100644 index 7e2af3c48dd..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "UniversalGraphicsTests", - "references": [ - "GUID:c081bc530f560634bb5c21d4b323a7f1", - "GUID:15fc0a57446b3144c949da3e2b9737a9", - "GUID:df380645f10b7bc4b97d4f5eb6303d95", - "GUID:1d4ad4ead25f33942b7dcf63e8c0820b", - "GUID:d60799ab2a985554ea1a39cd38695018", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [] -} \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta deleted file mode 100644 index 78ef93867e7..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ed05cc0a83a5a40c0a6e72098212c312 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs deleted file mode 100644 index ac5e0e8c3b1..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEngine.TestTools.Graphics; - -public class UniversalGraphicsTestSettings : GraphicsTestSettings -{ - public int WaitFrames = 0; - public bool XRCompatible = true; - - public UniversalGraphicsTestSettings() - { - ImageComparisonSettings.TargetWidth = 512; - ImageComparisonSettings.TargetHeight = 512; - ImageComparisonSettings.AverageCorrectnessThreshold = 0.005f; - ImageComparisonSettings.PerPixelCorrectnessThreshold = 0.001f; - ImageComparisonSettings.UseBackBuffer = false; - } -} diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta deleted file mode 100644 index 43adf6dc9f1..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 73231aa468d81ea49bc3d914080de185 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTests.cs b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTests.cs deleted file mode 100644 index 0eaa1b68264..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTests.cs +++ /dev/null @@ -1,93 +0,0 @@ -using NUnit.Framework; -using System.Collections; -using System.Linq; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.SceneManagement; -using UnityEngine.TestTools; -using UnityEngine.TestTools.Graphics; - -public class UniversalGraphicsTests -{ -#if UNITY_ANDROID - static bool wasFirstSceneRan = false; - const int firstSceneAdditionalFrames = 3; -#endif - - public const string universalPackagePath = "Assets/ReferenceImages"; - - [UnityTest, Category("UniversalRP")] - [PrebuildSetup("SetupGraphicsTestCases")] - [UseGraphicsTestCases(universalPackagePath)] - public IEnumerator Run(GraphicsTestCase testCase) - { - SceneManager.LoadScene(testCase.ScenePath); - - // Always wait one frame for scene load - yield return null; - - var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x => x.GetComponent()); - var settings = Object.FindObjectOfType(); - Assert.IsNotNull(settings, "Invalid test scene, couldn't find UniversalGraphicsTestSettings"); - - int waitFrames = Unity.Testing.XR.Runtime.ConfigureMockHMD.SetupTest(settings.XRCompatible, settings.WaitFrames, settings.ImageComparisonSettings); - - Scene scene = SceneManager.GetActiveScene(); - - yield return null; - - if (settings.ImageComparisonSettings.UseBackBuffer && waitFrames < 1) - waitFrames = 1; - - for (int i = 0; i < waitFrames; i++) - yield return new WaitForEndOfFrame(); - -#if UNITY_ANDROID - // On Android first scene often needs a bit more frames to load all the assets - // otherwise the screenshot is just a black screen - if (!wasFirstSceneRan) - { - for (int i = 0; i < firstSceneAdditionalFrames; i++) - { - yield return new WaitForEndOfFrame(); - } - wasFirstSceneRan = true; - } -#endif - - ImageAssert.AreEqual(testCase.ReferenceImage, cameras.Where(x => x != null), settings.ImageComparisonSettings); - - // Does it allocate memory when it renders what's on the main camera? - bool allocatesMemory = false; - var mainCamera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent(); - - try - { - ImageAssert.AllocatesMemory(mainCamera, settings?.ImageComparisonSettings); - } - catch (AssertionException) - { - allocatesMemory = true; - } - - if (allocatesMemory) - Assert.Fail("Allocated memory when rendering what is on main camera"); - } - -#if UNITY_EDITOR - [TearDown] - public void DumpImagesInEditor() - { - UnityEditor.TestTools.Graphics.ResultsUtility.ExtractImagesFromTestProperties(TestContext.CurrentContext.Test); - } - -#if ENABLE_VR - [TearDown] - public void TearDownXR() - { - XRGraphicsAutomatedTests.running = false; - } - -#endif -#endif -} diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta deleted file mode 100644 index da0cc3dccc9..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 52da4b5c062caa34a980de1d467b3a58 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_Lighting/Packages/manifest.json index 5463159813c..f7b99075781 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_Lighting/Packages/manifest.json @@ -10,6 +10,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", + "com.unity.testing.urp": "file:../../../com.unity.testing.urp", "com.unity.test-framework": "1.1.18", "com.unity.test-framework.build": "0.0.1-preview.14", "com.unity.test-framework.utp-reporter": "1.0.2-preview", @@ -52,6 +53,7 @@ "com.unity.render-pipelines.core", "com.unity.render-pipelines.universal", "com.unity.testframework.graphics", - "com.unity.testing.xr" + "com.unity.testing.xr", + "com.unity.testing.urp" ] } diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor.meta deleted file mode 100644 index c0631e0fc23..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 297bf34f01c5946a1bcf4b39db94aff6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/CopyImageToReferenceFolders.cs b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/CopyImageToReferenceFolders.cs deleted file mode 100644 index 3fa8be97c61..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/CopyImageToReferenceFolders.cs +++ /dev/null @@ -1,79 +0,0 @@ -using UnityEngine; -using UnityEditor; -using System.IO; -using System.Collections.Generic; -using System.Text; -using System.Linq; - -public class CopyImageToReferenceFolders -{ - // Add a new menu item that is accessed by right-clicking on an asset in the project view - - [MenuItem("Assets/CopyToReferenceImages", priority = 1)] - private static void CopyImages() - { - string referenceImagesPath = Path.Combine("Assets", "ReferenceImages", "Linear"); - string[] leafFolders = EnumerateLeafFolders(referenceImagesPath).ToArray(); - int numOfLeafFolders = leafFolders.Length; - - Object[] selectedObjects = Selection.objects; - int numOfCopies = numOfLeafFolders * selectedObjects.Length; - - for (int i = 0; i < selectedObjects.Length; i++) - { - Texture2D selected = selectedObjects[i] as Texture2D; - if (selected != null) - { - string pathToOriginalImage = AssetDatabase.GetAssetPath(selected); - string extension = Path.GetExtension(pathToOriginalImage); - string imageName = selected.name + extension; - - StringBuilder sb = new StringBuilder(); - sb.AppendLine("Copied \"" + imageName + "\" to..."); - - for (int j = 0; j < numOfLeafFolders; j++) - { - string leafFolder = leafFolders[j]; - if (EditorUtility.DisplayCancelableProgressBar( - "Copy " + imageName + " to ReferenceImages", - string.Format("({0} of {1}) {2}", j, numOfCopies, leafFolder), - j / numOfLeafFolders) - ) - { - break; - } - - AssetDatabase.CopyAsset(pathToOriginalImage, Path.Combine(leafFolder, imageName)); - sb.AppendLine("-> " + leafFolder); - } - - EditorUtility.ClearProgressBar(); - - Debug.Log(sb); - } - } - } - - private static IEnumerable EnumerateLeafFolders(string root) - { - Stack dir = new Stack(); - dir.Push(root); - - while (dir.Count != 0) - { - bool anySubfolders = false; - root = dir.Pop(); - - foreach (var subfolder in Directory.EnumerateDirectories(root)) - { - dir.Push(subfolder); - anySubfolders = true; - } - - if (!anySubfolders) - { - yield return root; - } - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta deleted file mode 100644 index d47d738e01d..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e412e7020a31eb84b9b2cb1f80ccc7f5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/MultipleViewGCTest.cs b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/MultipleViewGCTest.cs deleted file mode 100644 index 19dd3c4eb54..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/MultipleViewGCTest.cs +++ /dev/null @@ -1,51 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEngine; -using UnityEngine.Profiling; - -[TestFixture] -public class MultipleViewGCTest : MonoBehaviour -{ - Recorder m_gcAllocRecorder; - EditorWindow m_sceneView; - - [OneTimeSetUp] - public void SetUp() - { - //Issue was caused by different nbr of cameras between views - var mainCamera = Camera.main; - for(int i = 0; i < 4; ++i) - { - var newCam = Instantiate(mainCamera); - } - - m_sceneView = EditorWindow.GetWindow(); - - m_gcAllocRecorder = Recorder.Get("GC.Alloc"); - m_gcAllocRecorder.FilterToCurrentThread(); - m_gcAllocRecorder.enabled = false; - - // Render first frame where gc is ok - m_sceneView.Repaint(); - Camera.main.Render(); - } - - [Test] - public void RenderSceneAndGameView() - { - Profiler.BeginSample("GC_Alloc_URP_MultipleViews"); - { - m_gcAllocRecorder.enabled = true; - m_sceneView.Repaint(); - Camera.main.Render(); - m_gcAllocRecorder.enabled = false; - } - int allocationCountOfRenderPipeline = m_gcAllocRecorder.sampleBlockCount; - - if (allocationCountOfRenderPipeline > 0) - { - Debug.LogError($"Memory was allocated {allocationCountOfRenderPipeline} times"); - } - Profiler.EndSample(); - } -} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/MultipleViewGCTest.cs.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/MultipleViewGCTest.cs.meta deleted file mode 100644 index f7a7c411a69..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/MultipleViewGCTest.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ee6faed4fcdc01e4b91eb8b0b4f2360d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/SetupGraphicsTestCases.cs b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/SetupGraphicsTestCases.cs deleted file mode 100644 index 36c5722bc15..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/SetupGraphicsTestCases.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UnityEngine.TestTools; - -public class SetupGraphicsTestCases : IPrebuildSetup -{ - public void Setup() - { - // Work around case #1033694, unable to use PrebuildSetup types directly from assemblies that don't have special names. - // Once that's fixed, this class can be deleted and the SetupGraphicsTestCases class in Unity.TestFramework.Graphics.Editor - // can be used directly instead. - UnityEditor.TestTools.Graphics.SetupGraphicsTestCases.Setup(UniversalGraphicsTests.universalPackagePath); - - // Configure project for XR tests - Unity.Testing.XR.Editor.InjectMockHMD.SetupLoader(); - } -} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta deleted file mode 100644 index ac9277c7f8d..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0f6fc80695ba0bc48b4edeb2ce544600 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef deleted file mode 100644 index 85b2624cb2d..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "UniversalEditorTests", - "references": [ - "GUID:e18141520846dcc44b725b2f74e91229", - "GUID:ed05cc0a83a5a40c0a6e72098212c312", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3", - "GUID:925cf1d7b1444c3448cc9b44ce814a9e", - "GUID:c579267770062bf448e75eb160330b7f", - "GUID:15fc0a57446b3144c949da3e2b9737a9" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta deleted file mode 100644 index c6dc88a9b3c..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 55aba1c6f9cf8e949aa77aaeccd46083 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/UniversalProjectEditorTests.cs b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/UniversalProjectEditorTests.cs deleted file mode 100644 index 55638f844b2..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/UniversalProjectEditorTests.cs +++ /dev/null @@ -1,60 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; - -public class UniversalProjectEditorTests -{ - private static UniversalRenderPipelineAsset currentAsset; - - [Test] - public void GetCurrentAsset() - { - GetUniversalAsset(); - } - - [Test] - public void CheckAllLightingSettings() - { - var guids = AssetDatabase.FindAssets("t:LightingSettings"); - foreach (var guid in guids) - { - string path = AssetDatabase.GUIDToAssetPath(guid); - LightingSettings lightingSettings = AssetDatabase.LoadAssetAtPath(path); - if (lightingSettings.bakedGI) - { - Assert.IsTrue(lightingSettings.lightmapper != LightingSettings.Lightmapper.Enlighten, - $"Lighting settings ({path}) uses deprecated lightmapper Enlighten."); - Assert.IsTrue(lightingSettings.filteringMode == LightingSettings.FilterMode.None, - $"Lighting settings ({path}) have baked GI with filter mode enabled. It is recommended to turn of filter mode to reduce halo effect (If you still want to use it please contact URP team first)."); - } - } - } - - //[Test] - public void GetDefaultRenderer() - { - GetUniversalAsset(); - - Assert.IsNotNull(currentAsset.scriptableRenderer, "Current ScriptableRenderer is null."); - } - - //Utilities - void GetUniversalAsset() - { - var renderpipelineAsset = GraphicsSettings.currentRenderPipeline; - - if(renderpipelineAsset == null) - Assert.Fail("No Render Pipeline Asset assigned."); - - if (renderpipelineAsset.GetType() == typeof(UniversalRenderPipelineAsset)) - { - currentAsset = renderpipelineAsset as UniversalRenderPipelineAsset; - } - else - { - Assert.Inconclusive("Project not setup for Universal RP."); - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta deleted file mode 100644 index 0ba0e1eee93..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: ddf535d28d764921a6709da5d30ba07f -timeCreated: 1572431758 \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime.meta deleted file mode 100644 index 5ffe0f33c70..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a4efe00a7d5664e51a5e58849a3f1cc1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/ArrayDrawer.cs b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/ArrayDrawer.cs deleted file mode 100644 index 834ae378268..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/ArrayDrawer.cs +++ /dev/null @@ -1,50 +0,0 @@ -using UnityEngine; - -[ExecuteInEditMode] -public class ArrayDrawer : MonoBehaviour -{ - [Space] - public int columns = 10; - public float interval = 1; - public float cellSize = 0.1f; - - [Space] - [ColorUsage(false, true)] - public Color color1 = Color.green; - - [ColorUsage(false, true)] - public Color color2 = Color.red; - - public Mesh mesh; - public Material material; - - MaterialPropertyBlock _props; - - void Update() - { - if (_props == null) - _props = new MaterialPropertyBlock(); - - var origin = transform.position + new Vector3( - interval * columns * -0.5f, - interval * columns * -0.5f, 0f - ); - var rotation = transform.rotation; - var scale = Vector3.one * cellSize; - - for (int y = 0; y <= columns; y++) - { - for (int x = 0; x <= columns; x++) - { - var position = origin + new Vector3(x, y, 0f) * interval; - var matrix = Matrix4x4.TRS(position, rotation, scale); - - var c1 = color1 * ((float)x / columns); - var c2 = color2 * ((float)y / columns); - _props.SetColor("_EmissionColor", c1 + c2); - - Graphics.DrawMesh(mesh, matrix, material, 0, null, 0, _props); - } - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/ArrayDrawer.cs.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/ArrayDrawer.cs.meta deleted file mode 100644 index 6431c94712a..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/ArrayDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a292b138ce99b204790a0a0322fac572 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CameraCallbackTests.cs b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CameraCallbackTests.cs deleted file mode 100644 index b3042bba022..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CameraCallbackTests.cs +++ /dev/null @@ -1,176 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; -using UnityEngine.Rendering.Universal.Internal; - -[CreateAssetMenu] -public class CameraCallbackTests : ScriptableRendererFeature -{ - static RenderTargetHandle beforeAll; - static RenderTargetHandle afterOpaque; - static RenderTargetHandle afterSkybox; - static RenderTargetHandle afterSkybox2; - static RenderTargetHandle afterTransparent; - static RenderTargetHandle afterPost; - static RenderTargetHandle afterAll; - - BlitPass m_BlitRenderPassesToScreen; - Material m_SamplingMaterial; - - public CameraCallbackTests() - { - beforeAll.Init("_BeforeAll"); - afterOpaque.Init("_AfterOpaque"); - afterSkybox.Init("_AfterSkybox"); - afterSkybox2.Init("_AfterSkybox2"); - afterTransparent.Init("_AfterTransparent"); - afterPost.Init("_AfterPostProcessTexture"); - afterAll.Init("_AfterAll"); - } - - public override void Create() - { - UniversalRendererData data = null; - if (UniversalRenderPipeline.asset.m_RendererDataList[0] != null) - data = UniversalRenderPipeline.asset.m_RendererDataList[0] as UniversalRendererData; - - if (data == null) - return; - - if (data.shaders == null) - return; - - if (data.shaders.samplingPS == null) - return; - - if (m_SamplingMaterial == null) - m_SamplingMaterial = CoreUtils.CreateEngineMaterial(data.shaders.samplingPS); - } - - public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) - { - Downsampling downSamplingMethod = UniversalRenderPipeline.asset.opaqueDownsampling; - - var cameraColorTarget = renderer.cameraColorTarget; - var clearRenderPass = new ClearColorPass(RenderPassEvent.BeforeRenderingOpaques, cameraColorTarget); - - var copyBeforeOpaquePass = new CopyColorPass(RenderPassEvent.BeforeRenderingOpaques, m_SamplingMaterial); - copyBeforeOpaquePass.Setup(cameraColorTarget, beforeAll, downSamplingMethod); - - var copyAfterOpaquePass = new CopyColorPass(RenderPassEvent.AfterRenderingOpaques, m_SamplingMaterial); - copyAfterOpaquePass.Setup(cameraColorTarget, afterOpaque, downSamplingMethod); - - var copyAfterSkyboxPass = new CopyColorPass(RenderPassEvent.AfterRenderingSkybox, m_SamplingMaterial); - copyAfterSkyboxPass.Setup(cameraColorTarget, afterSkybox, downSamplingMethod); - - var copyAfterSkyboxPass2 = new CopyColorPass(RenderPassEvent.AfterRenderingSkybox, m_SamplingMaterial); - copyAfterSkyboxPass.Setup(cameraColorTarget, afterSkybox2, downSamplingMethod); - - var copyAfterTransparents = new CopyColorPass(RenderPassEvent.AfterRenderingTransparents, m_SamplingMaterial); - copyAfterTransparents.Setup(cameraColorTarget, afterTransparent, downSamplingMethod); - - var copyAfterEverything = new CopyColorPass(RenderPassEvent.AfterRenderingPostProcessing, m_SamplingMaterial); - copyAfterEverything.Setup(afterPost.id, afterAll, downSamplingMethod); - - if (m_BlitRenderPassesToScreen == null) - m_BlitRenderPassesToScreen = new BlitPass(RenderPassEvent.AfterRendering, cameraColorTarget); - - // Inserts out of order so we also test render passes sort correctly - renderer.EnqueuePass(copyAfterEverything); - renderer.EnqueuePass(m_BlitRenderPassesToScreen); - renderer.EnqueuePass(copyAfterOpaquePass); - renderer.EnqueuePass(copyAfterSkyboxPass); - renderer.EnqueuePass(copyAfterSkyboxPass2); - renderer.EnqueuePass(copyAfterTransparents); - renderer.EnqueuePass(clearRenderPass); - renderer.EnqueuePass(copyBeforeOpaquePass); - } - - protected override void Dispose(bool disposing) - { - CoreUtils.Destroy(m_SamplingMaterial); - m_BlitRenderPassesToScreen?.Cleanup(); - } - - internal class ClearColorPass : ScriptableRenderPass - { - RenderTargetIdentifier m_ColorHandle; - - public ClearColorPass(RenderPassEvent renderPassEvent, RenderTargetIdentifier colorHandle) - { - m_ColorHandle = colorHandle; - this.renderPassEvent = renderPassEvent; - } - - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) - { - var cmd = CommandBufferPool.Get("Clear Color"); - cmd.SetRenderTarget(m_ColorHandle); - cmd.ClearRenderTarget(true, true, Color.yellow); - context.ExecuteCommandBuffer(cmd); - CommandBufferPool.Release(cmd); - } - } - - class BlitPass : ScriptableRenderPass - { - private RenderTargetIdentifier colorHandle; - Material m_BlitMaterial; - - public BlitPass(RenderPassEvent renderPassEvent, RenderTargetIdentifier colorHandle) - { - this.colorHandle = colorHandle; - this.renderPassEvent = renderPassEvent; - m_BlitMaterial = CoreUtils.CreateEngineMaterial(Shader.Find("Hidden/Universal Render Pipeline/Blit")); - } - - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) - { - var mesh = RenderingUtils.fullscreenMesh; - CommandBuffer cmd = CommandBufferPool.Get("Blit Pass"); - cmd.SetRenderTarget(colorHandle); - cmd.SetViewProjectionMatrices(Matrix4x4.identity, Matrix4x4.identity); - - cmd.SetViewport(new Rect(0, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", beforeAll.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterOpaque.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f * 2.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterSkybox.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterSkybox2.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterTransparent.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f * 2.0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterAll.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - context.ExecuteCommandBuffer(cmd); - CommandBufferPool.Release(cmd); - } - - public override void OnCameraCleanup(CommandBuffer cmd) - { - if (cmd == null) - throw new ArgumentNullException("cmd"); - - base.OnCameraCleanup(cmd); - } - - public void Cleanup() - { - CoreUtils.Destroy(m_BlitMaterial); - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CameraCallbackTests.cs.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CameraCallbackTests.cs.meta deleted file mode 100644 index 3b932264aa5..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CameraCallbackTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1922bf90be6ebc54da38e96e30f9339a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline.meta deleted file mode 100644 index a0fbb761307..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8fd802efffe104b0d9015b296df30c64 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset deleted file mode 100644 index 3205ff3c52a..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset +++ /dev/null @@ -1,15 +0,0 @@ -%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: 19dda12d58f1fbb4e9ef172721391ff2, type: 3} - m_Name: CustomRenderGraph - m_EditorClassIdentifier: - m_RendererFeatures: [] diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta deleted file mode 100644 index 50e353b4a73..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e46834cadfc4eb241bd46a362765a390 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs deleted file mode 100644 index 8d6f4132931..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace UnityEngine.Rendering.Universal -{ - //[CreateAssetMenu()] - public class CustomRenderGraphData : ScriptableRendererData - { - protected override ScriptableRenderer Create() - { - return new CustomRenderer(this); - } - } -} - diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta deleted file mode 100644 index c8591e6eca1..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 19dda12d58f1fbb4e9ef172721391ff2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs deleted file mode 100644 index c31e61e99a9..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs +++ /dev/null @@ -1,31 +0,0 @@ -using UnityEngine.Rendering.Universal.Internal; - -namespace UnityEngine.Rendering.Universal -{ - public class CustomRenderer : ScriptableRenderer - { - private DrawObjectsPass m_RenderOpaqueForwardPass; - - ForwardLights m_ForwardLights; - - public CustomRenderer(CustomRenderGraphData data) : base(data) - { - m_RenderOpaqueForwardPass = new DrawObjectsPass("Render Opaques", true, RenderPassEvent.BeforeRenderingOpaques + 1, RenderQueueRange.opaque, -1, StencilState.defaultValue, 0); - m_ForwardLights = new ForwardLights(); - } - - public override void Setup(ScriptableRenderContext context, ref RenderingData renderingData) - { - ConfigureCameraTarget(BuiltinRenderTextureType.CameraTarget, BuiltinRenderTextureType.CameraTarget); - - foreach (var feature in rendererFeatures) - feature.AddRenderPasses(this, ref renderingData); - EnqueuePass(m_RenderOpaqueForwardPass); - } - - public override void SetupLights(ScriptableRenderContext context, ref RenderingData renderingData) - { - m_ForwardLights.Setup(context, ref renderingData); - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta deleted file mode 100644 index aabda3faa95..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7e0da365be9e44c3bae8da691ccd8de6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef deleted file mode 100644 index 7e2af3c48dd..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "UniversalGraphicsTests", - "references": [ - "GUID:c081bc530f560634bb5c21d4b323a7f1", - "GUID:15fc0a57446b3144c949da3e2b9737a9", - "GUID:df380645f10b7bc4b97d4f5eb6303d95", - "GUID:1d4ad4ead25f33942b7dcf63e8c0820b", - "GUID:d60799ab2a985554ea1a39cd38695018", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [] -} \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta deleted file mode 100644 index 78ef93867e7..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ed05cc0a83a5a40c0a6e72098212c312 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs deleted file mode 100644 index ac5e0e8c3b1..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEngine.TestTools.Graphics; - -public class UniversalGraphicsTestSettings : GraphicsTestSettings -{ - public int WaitFrames = 0; - public bool XRCompatible = true; - - public UniversalGraphicsTestSettings() - { - ImageComparisonSettings.TargetWidth = 512; - ImageComparisonSettings.TargetHeight = 512; - ImageComparisonSettings.AverageCorrectnessThreshold = 0.005f; - ImageComparisonSettings.PerPixelCorrectnessThreshold = 0.001f; - ImageComparisonSettings.UseBackBuffer = false; - } -} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta deleted file mode 100644 index 43adf6dc9f1..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 73231aa468d81ea49bc3d914080de185 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTests.cs b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTests.cs deleted file mode 100644 index acd20bbfe09..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTests.cs +++ /dev/null @@ -1,92 +0,0 @@ -using NUnit.Framework; -using System.Collections; -using System.Linq; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.SceneManagement; -using UnityEngine.TestTools; -using UnityEngine.TestTools.Graphics; - -public class UniversalGraphicsTests -{ -#if UNITY_ANDROID - static bool wasFirstSceneRan = false; - const int firstSceneAdditionalFrames = 3; -#endif - - public const string universalPackagePath = "Assets/ReferenceImages"; - - [UnityTest, Category("UniversalRP")] - [PrebuildSetup("SetupGraphicsTestCases")] - [UseGraphicsTestCases(universalPackagePath)] - public IEnumerator Run(GraphicsTestCase testCase) - { - SceneManager.LoadScene(testCase.ScenePath); - - // Always wait one frame for scene load - yield return null; - - var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x=>x.GetComponent()); - var settings = Object.FindObjectOfType(); - Assert.IsNotNull(settings, "Invalid test scene, couldn't find UniversalGraphicsTestSettings"); - - int waitFrames = Unity.Testing.XR.Runtime.ConfigureMockHMD.SetupTest(settings.XRCompatible, settings.WaitFrames, settings.ImageComparisonSettings); - - Scene scene = SceneManager.GetActiveScene(); - - yield return null; - - if (settings.ImageComparisonSettings.UseBackBuffer && waitFrames < 1) - waitFrames = 1; - - for (int i = 0; i < waitFrames; i++) - yield return new WaitForEndOfFrame(); - -#if UNITY_ANDROID - // On Android first scene often needs a bit more frames to load all the assets - // otherwise the screenshot is just a black screen - if (!wasFirstSceneRan) - { - for(int i = 0; i < firstSceneAdditionalFrames; i++) - { - yield return new WaitForEndOfFrame(); - } - wasFirstSceneRan = true; - } -#endif - - ImageAssert.AreEqual(testCase.ReferenceImage, cameras.Where(x => x != null), settings.ImageComparisonSettings); - - // Does it allocate memory when it renders what's on the main camera? - bool allocatesMemory = false; - var mainCamera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent(); - - try - { - ImageAssert.AllocatesMemory(mainCamera, settings?.ImageComparisonSettings); - } - catch (AssertionException) - { - allocatesMemory = true; - } - - if (allocatesMemory) - Assert.Fail("Allocated memory when rendering what is on main camera"); - } - -#if UNITY_EDITOR - [TearDown] - public void DumpImagesInEditor() - { - UnityEditor.TestTools.Graphics.ResultsUtility.ExtractImagesFromTestProperties(TestContext.CurrentContext.Test); - } - -#if ENABLE_VR - [TearDown] - public void TearDownXR() - { - XRGraphicsAutomatedTests.running = false; - } -#endif -#endif -} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta deleted file mode 100644 index da0cc3dccc9..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 52da4b5c062caa34a980de1d467b3a58 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_PostPro/Packages/manifest.json index 5463159813c..f7b99075781 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_PostPro/Packages/manifest.json @@ -10,6 +10,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", + "com.unity.testing.urp": "file:../../../com.unity.testing.urp", "com.unity.test-framework": "1.1.18", "com.unity.test-framework.build": "0.0.1-preview.14", "com.unity.test-framework.utp-reporter": "1.0.2-preview", @@ -52,6 +53,7 @@ "com.unity.render-pipelines.core", "com.unity.render-pipelines.universal", "com.unity.testframework.graphics", - "com.unity.testing.xr" + "com.unity.testing.xr", + "com.unity.testing.urp" ] } diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor.meta deleted file mode 100644 index cdfa1e14c1c..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 03dd6f2ae5e4644bf8c95405a58ef8b0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/CopyImageToReferenceFolders.cs b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/CopyImageToReferenceFolders.cs deleted file mode 100644 index 3fa8be97c61..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/CopyImageToReferenceFolders.cs +++ /dev/null @@ -1,79 +0,0 @@ -using UnityEngine; -using UnityEditor; -using System.IO; -using System.Collections.Generic; -using System.Text; -using System.Linq; - -public class CopyImageToReferenceFolders -{ - // Add a new menu item that is accessed by right-clicking on an asset in the project view - - [MenuItem("Assets/CopyToReferenceImages", priority = 1)] - private static void CopyImages() - { - string referenceImagesPath = Path.Combine("Assets", "ReferenceImages", "Linear"); - string[] leafFolders = EnumerateLeafFolders(referenceImagesPath).ToArray(); - int numOfLeafFolders = leafFolders.Length; - - Object[] selectedObjects = Selection.objects; - int numOfCopies = numOfLeafFolders * selectedObjects.Length; - - for (int i = 0; i < selectedObjects.Length; i++) - { - Texture2D selected = selectedObjects[i] as Texture2D; - if (selected != null) - { - string pathToOriginalImage = AssetDatabase.GetAssetPath(selected); - string extension = Path.GetExtension(pathToOriginalImage); - string imageName = selected.name + extension; - - StringBuilder sb = new StringBuilder(); - sb.AppendLine("Copied \"" + imageName + "\" to..."); - - for (int j = 0; j < numOfLeafFolders; j++) - { - string leafFolder = leafFolders[j]; - if (EditorUtility.DisplayCancelableProgressBar( - "Copy " + imageName + " to ReferenceImages", - string.Format("({0} of {1}) {2}", j, numOfCopies, leafFolder), - j / numOfLeafFolders) - ) - { - break; - } - - AssetDatabase.CopyAsset(pathToOriginalImage, Path.Combine(leafFolder, imageName)); - sb.AppendLine("-> " + leafFolder); - } - - EditorUtility.ClearProgressBar(); - - Debug.Log(sb); - } - } - } - - private static IEnumerable EnumerateLeafFolders(string root) - { - Stack dir = new Stack(); - dir.Push(root); - - while (dir.Count != 0) - { - bool anySubfolders = false; - root = dir.Pop(); - - foreach (var subfolder in Directory.EnumerateDirectories(root)) - { - dir.Push(subfolder); - anySubfolders = true; - } - - if (!anySubfolders) - { - yield return root; - } - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta deleted file mode 100644 index d47d738e01d..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e412e7020a31eb84b9b2cb1f80ccc7f5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/MultipleViewGCTest.cs b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/MultipleViewGCTest.cs deleted file mode 100644 index 19dd3c4eb54..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/MultipleViewGCTest.cs +++ /dev/null @@ -1,51 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEngine; -using UnityEngine.Profiling; - -[TestFixture] -public class MultipleViewGCTest : MonoBehaviour -{ - Recorder m_gcAllocRecorder; - EditorWindow m_sceneView; - - [OneTimeSetUp] - public void SetUp() - { - //Issue was caused by different nbr of cameras between views - var mainCamera = Camera.main; - for(int i = 0; i < 4; ++i) - { - var newCam = Instantiate(mainCamera); - } - - m_sceneView = EditorWindow.GetWindow(); - - m_gcAllocRecorder = Recorder.Get("GC.Alloc"); - m_gcAllocRecorder.FilterToCurrentThread(); - m_gcAllocRecorder.enabled = false; - - // Render first frame where gc is ok - m_sceneView.Repaint(); - Camera.main.Render(); - } - - [Test] - public void RenderSceneAndGameView() - { - Profiler.BeginSample("GC_Alloc_URP_MultipleViews"); - { - m_gcAllocRecorder.enabled = true; - m_sceneView.Repaint(); - Camera.main.Render(); - m_gcAllocRecorder.enabled = false; - } - int allocationCountOfRenderPipeline = m_gcAllocRecorder.sampleBlockCount; - - if (allocationCountOfRenderPipeline > 0) - { - Debug.LogError($"Memory was allocated {allocationCountOfRenderPipeline} times"); - } - Profiler.EndSample(); - } -} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/MultipleViewGCTest.cs.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/MultipleViewGCTest.cs.meta deleted file mode 100644 index f7a7c411a69..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/MultipleViewGCTest.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ee6faed4fcdc01e4b91eb8b0b4f2360d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/SetupGraphicsTestCases.cs b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/SetupGraphicsTestCases.cs deleted file mode 100644 index 36c5722bc15..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/SetupGraphicsTestCases.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UnityEngine.TestTools; - -public class SetupGraphicsTestCases : IPrebuildSetup -{ - public void Setup() - { - // Work around case #1033694, unable to use PrebuildSetup types directly from assemblies that don't have special names. - // Once that's fixed, this class can be deleted and the SetupGraphicsTestCases class in Unity.TestFramework.Graphics.Editor - // can be used directly instead. - UnityEditor.TestTools.Graphics.SetupGraphicsTestCases.Setup(UniversalGraphicsTests.universalPackagePath); - - // Configure project for XR tests - Unity.Testing.XR.Editor.InjectMockHMD.SetupLoader(); - } -} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta deleted file mode 100644 index ac9277c7f8d..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0f6fc80695ba0bc48b4edeb2ce544600 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef deleted file mode 100644 index 85b2624cb2d..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "UniversalEditorTests", - "references": [ - "GUID:e18141520846dcc44b725b2f74e91229", - "GUID:ed05cc0a83a5a40c0a6e72098212c312", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3", - "GUID:925cf1d7b1444c3448cc9b44ce814a9e", - "GUID:c579267770062bf448e75eb160330b7f", - "GUID:15fc0a57446b3144c949da3e2b9737a9" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta deleted file mode 100644 index c6dc88a9b3c..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 55aba1c6f9cf8e949aa77aaeccd46083 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/UniversalProjectEditorTests.cs b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/UniversalProjectEditorTests.cs deleted file mode 100644 index 55638f844b2..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/UniversalProjectEditorTests.cs +++ /dev/null @@ -1,60 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; - -public class UniversalProjectEditorTests -{ - private static UniversalRenderPipelineAsset currentAsset; - - [Test] - public void GetCurrentAsset() - { - GetUniversalAsset(); - } - - [Test] - public void CheckAllLightingSettings() - { - var guids = AssetDatabase.FindAssets("t:LightingSettings"); - foreach (var guid in guids) - { - string path = AssetDatabase.GUIDToAssetPath(guid); - LightingSettings lightingSettings = AssetDatabase.LoadAssetAtPath(path); - if (lightingSettings.bakedGI) - { - Assert.IsTrue(lightingSettings.lightmapper != LightingSettings.Lightmapper.Enlighten, - $"Lighting settings ({path}) uses deprecated lightmapper Enlighten."); - Assert.IsTrue(lightingSettings.filteringMode == LightingSettings.FilterMode.None, - $"Lighting settings ({path}) have baked GI with filter mode enabled. It is recommended to turn of filter mode to reduce halo effect (If you still want to use it please contact URP team first)."); - } - } - } - - //[Test] - public void GetDefaultRenderer() - { - GetUniversalAsset(); - - Assert.IsNotNull(currentAsset.scriptableRenderer, "Current ScriptableRenderer is null."); - } - - //Utilities - void GetUniversalAsset() - { - var renderpipelineAsset = GraphicsSettings.currentRenderPipeline; - - if(renderpipelineAsset == null) - Assert.Fail("No Render Pipeline Asset assigned."); - - if (renderpipelineAsset.GetType() == typeof(UniversalRenderPipelineAsset)) - { - currentAsset = renderpipelineAsset as UniversalRenderPipelineAsset; - } - else - { - Assert.Inconclusive("Project not setup for Universal RP."); - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta deleted file mode 100644 index 0ba0e1eee93..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: ddf535d28d764921a6709da5d30ba07f -timeCreated: 1572431758 \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime.meta deleted file mode 100644 index 3df5855bdab..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4c6e609fbec664109b3485236b477dea -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/ArrayDrawer.cs b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/ArrayDrawer.cs deleted file mode 100644 index 834ae378268..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/ArrayDrawer.cs +++ /dev/null @@ -1,50 +0,0 @@ -using UnityEngine; - -[ExecuteInEditMode] -public class ArrayDrawer : MonoBehaviour -{ - [Space] - public int columns = 10; - public float interval = 1; - public float cellSize = 0.1f; - - [Space] - [ColorUsage(false, true)] - public Color color1 = Color.green; - - [ColorUsage(false, true)] - public Color color2 = Color.red; - - public Mesh mesh; - public Material material; - - MaterialPropertyBlock _props; - - void Update() - { - if (_props == null) - _props = new MaterialPropertyBlock(); - - var origin = transform.position + new Vector3( - interval * columns * -0.5f, - interval * columns * -0.5f, 0f - ); - var rotation = transform.rotation; - var scale = Vector3.one * cellSize; - - for (int y = 0; y <= columns; y++) - { - for (int x = 0; x <= columns; x++) - { - var position = origin + new Vector3(x, y, 0f) * interval; - var matrix = Matrix4x4.TRS(position, rotation, scale); - - var c1 = color1 * ((float)x / columns); - var c2 = color2 * ((float)y / columns); - _props.SetColor("_EmissionColor", c1 + c2); - - Graphics.DrawMesh(mesh, matrix, material, 0, null, 0, _props); - } - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/ArrayDrawer.cs.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/ArrayDrawer.cs.meta deleted file mode 100644 index 6431c94712a..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/ArrayDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a292b138ce99b204790a0a0322fac572 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CameraCallbackTests.cs b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CameraCallbackTests.cs deleted file mode 100644 index b3042bba022..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CameraCallbackTests.cs +++ /dev/null @@ -1,176 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; -using UnityEngine.Rendering.Universal.Internal; - -[CreateAssetMenu] -public class CameraCallbackTests : ScriptableRendererFeature -{ - static RenderTargetHandle beforeAll; - static RenderTargetHandle afterOpaque; - static RenderTargetHandle afterSkybox; - static RenderTargetHandle afterSkybox2; - static RenderTargetHandle afterTransparent; - static RenderTargetHandle afterPost; - static RenderTargetHandle afterAll; - - BlitPass m_BlitRenderPassesToScreen; - Material m_SamplingMaterial; - - public CameraCallbackTests() - { - beforeAll.Init("_BeforeAll"); - afterOpaque.Init("_AfterOpaque"); - afterSkybox.Init("_AfterSkybox"); - afterSkybox2.Init("_AfterSkybox2"); - afterTransparent.Init("_AfterTransparent"); - afterPost.Init("_AfterPostProcessTexture"); - afterAll.Init("_AfterAll"); - } - - public override void Create() - { - UniversalRendererData data = null; - if (UniversalRenderPipeline.asset.m_RendererDataList[0] != null) - data = UniversalRenderPipeline.asset.m_RendererDataList[0] as UniversalRendererData; - - if (data == null) - return; - - if (data.shaders == null) - return; - - if (data.shaders.samplingPS == null) - return; - - if (m_SamplingMaterial == null) - m_SamplingMaterial = CoreUtils.CreateEngineMaterial(data.shaders.samplingPS); - } - - public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) - { - Downsampling downSamplingMethod = UniversalRenderPipeline.asset.opaqueDownsampling; - - var cameraColorTarget = renderer.cameraColorTarget; - var clearRenderPass = new ClearColorPass(RenderPassEvent.BeforeRenderingOpaques, cameraColorTarget); - - var copyBeforeOpaquePass = new CopyColorPass(RenderPassEvent.BeforeRenderingOpaques, m_SamplingMaterial); - copyBeforeOpaquePass.Setup(cameraColorTarget, beforeAll, downSamplingMethod); - - var copyAfterOpaquePass = new CopyColorPass(RenderPassEvent.AfterRenderingOpaques, m_SamplingMaterial); - copyAfterOpaquePass.Setup(cameraColorTarget, afterOpaque, downSamplingMethod); - - var copyAfterSkyboxPass = new CopyColorPass(RenderPassEvent.AfterRenderingSkybox, m_SamplingMaterial); - copyAfterSkyboxPass.Setup(cameraColorTarget, afterSkybox, downSamplingMethod); - - var copyAfterSkyboxPass2 = new CopyColorPass(RenderPassEvent.AfterRenderingSkybox, m_SamplingMaterial); - copyAfterSkyboxPass.Setup(cameraColorTarget, afterSkybox2, downSamplingMethod); - - var copyAfterTransparents = new CopyColorPass(RenderPassEvent.AfterRenderingTransparents, m_SamplingMaterial); - copyAfterTransparents.Setup(cameraColorTarget, afterTransparent, downSamplingMethod); - - var copyAfterEverything = new CopyColorPass(RenderPassEvent.AfterRenderingPostProcessing, m_SamplingMaterial); - copyAfterEverything.Setup(afterPost.id, afterAll, downSamplingMethod); - - if (m_BlitRenderPassesToScreen == null) - m_BlitRenderPassesToScreen = new BlitPass(RenderPassEvent.AfterRendering, cameraColorTarget); - - // Inserts out of order so we also test render passes sort correctly - renderer.EnqueuePass(copyAfterEverything); - renderer.EnqueuePass(m_BlitRenderPassesToScreen); - renderer.EnqueuePass(copyAfterOpaquePass); - renderer.EnqueuePass(copyAfterSkyboxPass); - renderer.EnqueuePass(copyAfterSkyboxPass2); - renderer.EnqueuePass(copyAfterTransparents); - renderer.EnqueuePass(clearRenderPass); - renderer.EnqueuePass(copyBeforeOpaquePass); - } - - protected override void Dispose(bool disposing) - { - CoreUtils.Destroy(m_SamplingMaterial); - m_BlitRenderPassesToScreen?.Cleanup(); - } - - internal class ClearColorPass : ScriptableRenderPass - { - RenderTargetIdentifier m_ColorHandle; - - public ClearColorPass(RenderPassEvent renderPassEvent, RenderTargetIdentifier colorHandle) - { - m_ColorHandle = colorHandle; - this.renderPassEvent = renderPassEvent; - } - - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) - { - var cmd = CommandBufferPool.Get("Clear Color"); - cmd.SetRenderTarget(m_ColorHandle); - cmd.ClearRenderTarget(true, true, Color.yellow); - context.ExecuteCommandBuffer(cmd); - CommandBufferPool.Release(cmd); - } - } - - class BlitPass : ScriptableRenderPass - { - private RenderTargetIdentifier colorHandle; - Material m_BlitMaterial; - - public BlitPass(RenderPassEvent renderPassEvent, RenderTargetIdentifier colorHandle) - { - this.colorHandle = colorHandle; - this.renderPassEvent = renderPassEvent; - m_BlitMaterial = CoreUtils.CreateEngineMaterial(Shader.Find("Hidden/Universal Render Pipeline/Blit")); - } - - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) - { - var mesh = RenderingUtils.fullscreenMesh; - CommandBuffer cmd = CommandBufferPool.Get("Blit Pass"); - cmd.SetRenderTarget(colorHandle); - cmd.SetViewProjectionMatrices(Matrix4x4.identity, Matrix4x4.identity); - - cmd.SetViewport(new Rect(0, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", beforeAll.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterOpaque.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f * 2.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterSkybox.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterSkybox2.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterTransparent.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f * 2.0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); - cmd.SetGlobalTexture("_BlitTex", afterAll.Identifier()); - cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); - - context.ExecuteCommandBuffer(cmd); - CommandBufferPool.Release(cmd); - } - - public override void OnCameraCleanup(CommandBuffer cmd) - { - if (cmd == null) - throw new ArgumentNullException("cmd"); - - base.OnCameraCleanup(cmd); - } - - public void Cleanup() - { - CoreUtils.Destroy(m_BlitMaterial); - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CameraCallbackTests.cs.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CameraCallbackTests.cs.meta deleted file mode 100644 index 3b932264aa5..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CameraCallbackTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1922bf90be6ebc54da38e96e30f9339a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline.meta deleted file mode 100644 index 4892392caa9..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bf68177d7dbbf478a94240f10a5490d3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset deleted file mode 100644 index 3205ff3c52a..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset +++ /dev/null @@ -1,15 +0,0 @@ -%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: 19dda12d58f1fbb4e9ef172721391ff2, type: 3} - m_Name: CustomRenderGraph - m_EditorClassIdentifier: - m_RendererFeatures: [] diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta deleted file mode 100644 index 50e353b4a73..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e46834cadfc4eb241bd46a362765a390 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs deleted file mode 100644 index 8d6f4132931..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace UnityEngine.Rendering.Universal -{ - //[CreateAssetMenu()] - public class CustomRenderGraphData : ScriptableRendererData - { - protected override ScriptableRenderer Create() - { - return new CustomRenderer(this); - } - } -} - diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta deleted file mode 100644 index c8591e6eca1..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 19dda12d58f1fbb4e9ef172721391ff2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs deleted file mode 100644 index c31e61e99a9..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs +++ /dev/null @@ -1,31 +0,0 @@ -using UnityEngine.Rendering.Universal.Internal; - -namespace UnityEngine.Rendering.Universal -{ - public class CustomRenderer : ScriptableRenderer - { - private DrawObjectsPass m_RenderOpaqueForwardPass; - - ForwardLights m_ForwardLights; - - public CustomRenderer(CustomRenderGraphData data) : base(data) - { - m_RenderOpaqueForwardPass = new DrawObjectsPass("Render Opaques", true, RenderPassEvent.BeforeRenderingOpaques + 1, RenderQueueRange.opaque, -1, StencilState.defaultValue, 0); - m_ForwardLights = new ForwardLights(); - } - - public override void Setup(ScriptableRenderContext context, ref RenderingData renderingData) - { - ConfigureCameraTarget(BuiltinRenderTextureType.CameraTarget, BuiltinRenderTextureType.CameraTarget); - - foreach (var feature in rendererFeatures) - feature.AddRenderPasses(this, ref renderingData); - EnqueuePass(m_RenderOpaqueForwardPass); - } - - public override void SetupLights(ScriptableRenderContext context, ref RenderingData renderingData) - { - m_ForwardLights.Setup(context, ref renderingData); - } - } -} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta deleted file mode 100644 index aabda3faa95..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7e0da365be9e44c3bae8da691ccd8de6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef deleted file mode 100644 index 7e2af3c48dd..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "UniversalGraphicsTests", - "references": [ - "GUID:c081bc530f560634bb5c21d4b323a7f1", - "GUID:15fc0a57446b3144c949da3e2b9737a9", - "GUID:df380645f10b7bc4b97d4f5eb6303d95", - "GUID:1d4ad4ead25f33942b7dcf63e8c0820b", - "GUID:d60799ab2a985554ea1a39cd38695018", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [] -} \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta deleted file mode 100644 index 78ef93867e7..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ed05cc0a83a5a40c0a6e72098212c312 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs deleted file mode 100644 index ac5e0e8c3b1..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEngine.TestTools.Graphics; - -public class UniversalGraphicsTestSettings : GraphicsTestSettings -{ - public int WaitFrames = 0; - public bool XRCompatible = true; - - public UniversalGraphicsTestSettings() - { - ImageComparisonSettings.TargetWidth = 512; - ImageComparisonSettings.TargetHeight = 512; - ImageComparisonSettings.AverageCorrectnessThreshold = 0.005f; - ImageComparisonSettings.PerPixelCorrectnessThreshold = 0.001f; - ImageComparisonSettings.UseBackBuffer = false; - } -} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta deleted file mode 100644 index 43adf6dc9f1..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 73231aa468d81ea49bc3d914080de185 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTests.cs b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTests.cs deleted file mode 100644 index acd20bbfe09..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTests.cs +++ /dev/null @@ -1,92 +0,0 @@ -using NUnit.Framework; -using System.Collections; -using System.Linq; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.SceneManagement; -using UnityEngine.TestTools; -using UnityEngine.TestTools.Graphics; - -public class UniversalGraphicsTests -{ -#if UNITY_ANDROID - static bool wasFirstSceneRan = false; - const int firstSceneAdditionalFrames = 3; -#endif - - public const string universalPackagePath = "Assets/ReferenceImages"; - - [UnityTest, Category("UniversalRP")] - [PrebuildSetup("SetupGraphicsTestCases")] - [UseGraphicsTestCases(universalPackagePath)] - public IEnumerator Run(GraphicsTestCase testCase) - { - SceneManager.LoadScene(testCase.ScenePath); - - // Always wait one frame for scene load - yield return null; - - var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x=>x.GetComponent()); - var settings = Object.FindObjectOfType(); - Assert.IsNotNull(settings, "Invalid test scene, couldn't find UniversalGraphicsTestSettings"); - - int waitFrames = Unity.Testing.XR.Runtime.ConfigureMockHMD.SetupTest(settings.XRCompatible, settings.WaitFrames, settings.ImageComparisonSettings); - - Scene scene = SceneManager.GetActiveScene(); - - yield return null; - - if (settings.ImageComparisonSettings.UseBackBuffer && waitFrames < 1) - waitFrames = 1; - - for (int i = 0; i < waitFrames; i++) - yield return new WaitForEndOfFrame(); - -#if UNITY_ANDROID - // On Android first scene often needs a bit more frames to load all the assets - // otherwise the screenshot is just a black screen - if (!wasFirstSceneRan) - { - for(int i = 0; i < firstSceneAdditionalFrames; i++) - { - yield return new WaitForEndOfFrame(); - } - wasFirstSceneRan = true; - } -#endif - - ImageAssert.AreEqual(testCase.ReferenceImage, cameras.Where(x => x != null), settings.ImageComparisonSettings); - - // Does it allocate memory when it renders what's on the main camera? - bool allocatesMemory = false; - var mainCamera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent(); - - try - { - ImageAssert.AllocatesMemory(mainCamera, settings?.ImageComparisonSettings); - } - catch (AssertionException) - { - allocatesMemory = true; - } - - if (allocatesMemory) - Assert.Fail("Allocated memory when rendering what is on main camera"); - } - -#if UNITY_EDITOR - [TearDown] - public void DumpImagesInEditor() - { - UnityEditor.TestTools.Graphics.ResultsUtility.ExtractImagesFromTestProperties(TestContext.CurrentContext.Test); - } - -#if ENABLE_VR - [TearDown] - public void TearDownXR() - { - XRGraphicsAutomatedTests.running = false; - } -#endif -#endif -} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta deleted file mode 100644 index da0cc3dccc9..00000000000 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 52da4b5c062caa34a980de1d467b3a58 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json index 5463159813c..f7b99075781 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json @@ -10,6 +10,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", + "com.unity.testing.urp": "file:../../../com.unity.testing.urp", "com.unity.test-framework": "1.1.18", "com.unity.test-framework.build": "0.0.1-preview.14", "com.unity.test-framework.utp-reporter": "1.0.2-preview", @@ -52,6 +53,7 @@ "com.unity.render-pipelines.core", "com.unity.render-pipelines.universal", "com.unity.testframework.graphics", - "com.unity.testing.xr" + "com.unity.testing.xr", + "com.unity.testing.urp" ] } diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor.meta b/com.unity.testing.urp/CommonAssets.meta similarity index 77% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor.meta rename to com.unity.testing.urp/CommonAssets.meta index cdb56a648de..9aff93e3b34 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor.meta +++ b/com.unity.testing.urp/CommonAssets.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5d9748aa25ac6490dafc0329cae5ea73 +guid: a29f0aba5682545a18626e923027f6a6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime.meta b/com.unity.testing.urp/Scripts.meta similarity index 77% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime.meta rename to com.unity.testing.urp/Scripts.meta index db26eab0f3f..6c1fabb2276 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime.meta +++ b/com.unity.testing.urp/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cc36a08cc82154ffea114c7bba34b323 +guid: 65be98b8e2e484ee8b165bf5d7898ddb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor.meta b/com.unity.testing.urp/Scripts/Editor.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor.meta rename to com.unity.testing.urp/Scripts/Editor.meta diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/CopyImageToReferenceFolders.cs b/com.unity.testing.urp/Scripts/Editor/CopyImageToReferenceFolders.cs similarity index 100% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/CopyImageToReferenceFolders.cs rename to com.unity.testing.urp/Scripts/Editor/CopyImageToReferenceFolders.cs diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta b/com.unity.testing.urp/Scripts/Editor/CopyImageToReferenceFolders.cs.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta rename to com.unity.testing.urp/Scripts/Editor/CopyImageToReferenceFolders.cs.meta diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/MultipleViewGCTest.cs b/com.unity.testing.urp/Scripts/Editor/MultipleViewGCTest.cs similarity index 100% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/MultipleViewGCTest.cs rename to com.unity.testing.urp/Scripts/Editor/MultipleViewGCTest.cs diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs.meta b/com.unity.testing.urp/Scripts/Editor/MultipleViewGCTest.cs.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs.meta rename to com.unity.testing.urp/Scripts/Editor/MultipleViewGCTest.cs.meta diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs b/com.unity.testing.urp/Scripts/Editor/SetupGraphicsTestCases.cs similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs rename to com.unity.testing.urp/Scripts/Editor/SetupGraphicsTestCases.cs diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta b/com.unity.testing.urp/Scripts/Editor/SetupGraphicsTestCases.cs.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta rename to com.unity.testing.urp/Scripts/Editor/SetupGraphicsTestCases.cs.meta diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef b/com.unity.testing.urp/Scripts/Editor/Unity.Testing.SRP.Universal.Editor.asmdef similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef rename to com.unity.testing.urp/Scripts/Editor/Unity.Testing.SRP.Universal.Editor.asmdef diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta b/com.unity.testing.urp/Scripts/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta rename to com.unity.testing.urp/Scripts/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/UniversalProjectEditorTests.cs b/com.unity.testing.urp/Scripts/Editor/UniversalProjectEditorTests.cs similarity index 100% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/UniversalProjectEditorTests.cs rename to com.unity.testing.urp/Scripts/Editor/UniversalProjectEditorTests.cs diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta b/com.unity.testing.urp/Scripts/Editor/UniversalProjectEditorTests.cs.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta rename to com.unity.testing.urp/Scripts/Editor/UniversalProjectEditorTests.cs.meta diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime.meta b/com.unity.testing.urp/Scripts/Runtime.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime.meta rename to com.unity.testing.urp/Scripts/Runtime.meta diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/ArrayDrawer.cs b/com.unity.testing.urp/Scripts/Runtime/ArrayDrawer.cs similarity index 100% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/ArrayDrawer.cs rename to com.unity.testing.urp/Scripts/Runtime/ArrayDrawer.cs diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs.meta b/com.unity.testing.urp/Scripts/Runtime/ArrayDrawer.cs.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs.meta rename to com.unity.testing.urp/Scripts/Runtime/ArrayDrawer.cs.meta diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CameraCallbackTests.cs b/com.unity.testing.urp/Scripts/Runtime/CameraCallbackTests.cs similarity index 100% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CameraCallbackTests.cs rename to com.unity.testing.urp/Scripts/Runtime/CameraCallbackTests.cs diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs.meta b/com.unity.testing.urp/Scripts/Runtime/CameraCallbackTests.cs.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs.meta rename to com.unity.testing.urp/Scripts/Runtime/CameraCallbackTests.cs.meta diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline.meta b/com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline.meta rename to com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline.meta diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset b/com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderGraph.asset similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset rename to com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderGraph.asset diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta b/com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta rename to com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs b/com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs similarity index 100% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs rename to com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta b/com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta rename to com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs b/com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderer.cs similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs rename to com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderer.cs diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta b/com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta rename to com.unity.testing.urp/Scripts/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta diff --git a/com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs b/com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs new file mode 100644 index 00000000000..d45689aa24c --- /dev/null +++ b/com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs @@ -0,0 +1,43 @@ +using UnityEngine; + +public class SetQualityLevelOnAwake : MonoBehaviour +{ + public int qualityLevelIndex; + + private int prevQualityLevelIndex; + private string[] qualityLevelNames; + + void Awake() + { + qualityLevelNames = QualitySettings.names; + prevQualityLevelIndex = QualitySettings.GetQualityLevel(); + + if (qualityLevelIndex >= qualityLevelNames.Length) + { + Debug.LogError("SetQualityLevelOnAwake: Quality Level Index " + qualityLevelIndex + " is not available!"); + return; + } + + int curIndex = prevQualityLevelIndex; + int nextIndex = qualityLevelIndex; + string cur = qualityLevelNames[prevQualityLevelIndex]; + string next = qualityLevelNames[qualityLevelIndex]; + //Debug.Log("SetQualityLevelOnAwake.Awake():\nSwitching from " + cur + "(" + curIndex + ") to " + next + "(" + nextIndex + ")"); + QualitySettings.SetQualityLevel(qualityLevelIndex, true); + } + + void OnDisable() + { + if (qualityLevelIndex >= qualityLevelNames.Length) + { + return; + } + + int curIndex = QualitySettings.GetQualityLevel(); + int nextIndex = prevQualityLevelIndex; + string cur = qualityLevelNames[curIndex]; + string next = qualityLevelNames[nextIndex]; + //Debug.Log("SetQualityLevelOnAwake.OnDisable():\nSwitching from " + cur + "(" + curIndex + ") to " + next + "(" + nextIndex + ")"); + QualitySettings.SetQualityLevel(prevQualityLevelIndex, true); + } +} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta b/com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs.meta similarity index 83% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta rename to com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs.meta index d47d738e01d..ee64d0b7a59 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta +++ b/com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e412e7020a31eb84b9b2cb1f80ccc7f5 +guid: af9754faaee77444fbc6b66ffc7ef6b9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef b/com.unity.testing.urp/Scripts/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef rename to com.unity.testing.urp/Scripts/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta b/com.unity.testing.urp/Scripts/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta rename to com.unity.testing.urp/Scripts/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs b/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTestSettings.cs similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs rename to com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTestSettings.cs diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta b/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTestSettings.cs.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta rename to com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTestSettings.cs.meta diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTests.cs b/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTests.cs similarity index 100% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/UniversalGraphicsTests.cs rename to com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTests.cs diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta b/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTests.cs.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta rename to com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTests.cs.meta diff --git a/com.unity.testing.urp/package.json b/com.unity.testing.urp/package.json new file mode 100644 index 00000000000..1a362c346ad --- /dev/null +++ b/com.unity.testing.urp/package.json @@ -0,0 +1,13 @@ +{ + "name": "com.unity.testing.urp", + "displayName":"URP Graphic Tests Library", + "version": "1.0.0", + "unity": "2019.3", + "unityRelease": "0b4", + "description": "Common assets library for URP test projects.", + "keywords": ["qa", "test", "testing", "tests", "graphics", "HDRP"], + "dependencies": { + "com.unity.testframework.graphics": "7.8.7-preview", + "com.unity.render-pipelines.universal": "file:./com.unity.render-pipelines.universal" + } +} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta b/com.unity.testing.urp/package.json.meta similarity index 59% rename from TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta rename to com.unity.testing.urp/package.json.meta index 78ef93867e7..6e097b838d9 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta +++ b/com.unity.testing.urp/package.json.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: ed05cc0a83a5a40c0a6e72098212c312 -AssemblyDefinitionImporter: +guid: 99a6afcd736e71c49acaeef7396ed6b3 +PackageManifestImporter: externalObjects: {} userData: assetBundleName: From 24fd171b5406fde54427fdd5cf1389a3da20d880 Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Wed, 14 Apr 2021 17:59:10 +0200 Subject: [PATCH 2/7] Updated Project files --- .../Assets/CommonAssets/ForwardRenderer.asset | 4 +++ .../CommonAssets/UniversalRPAsset.asset | 10 +++--- .../CallbackTestRenderer.asset | 4 +++ .../Materials/BakedLit.mat | 17 +++++++-- .../Materials/DefaultLit.mat | 36 +++++++++++++++++-- .../Materials/DefaultSimple.mat | 16 +++++++-- .../Materials/DefaultUnlit.mat | 5 +-- .../Materials/ParticlesLit.mat | 4 +-- .../Materials/ParticlesSimple.mat | 4 +-- .../Materials/ParticlesUnlit.mat | 4 +-- ...ssingRenderUICustomRenderer_Renderer.asset | 4 +++ .../Test_126_Renderer.asset | 4 +++ .../Renderers/SSAO_DeferredRenderer.asset | 4 +++ .../Renderers/SSAO_DepthNormalRenderer.asset | 4 +++ .../Renderers/SSAO_DepthRenderer.asset | 4 +++ .../ProjectSettings/URPProjectSettings.asset | 2 +- .../CommonAssets/DeferredRenderer.asset | 4 +++ .../DeferredRenderer_AccurateGBuffer.asset | 4 +++ .../Assets/CommonAssets/ForwardRenderer.asset | 4 +++ .../CommonAssets/UniversalRPAsset.asset | 10 +++--- .../UniversalRPAssetBackBuffer.asset | 10 +++--- .../CommonAssets/DeferredRenderer.asset | 4 +++ .../Assets/CommonAssets/ForwardRenderer.asset | 4 +++ .../CommonAssets/UniversalRPAsset.asset | 16 ++++----- .../UniversalRPAssetRenderScaleLow.asset | 14 ++++---- .../CallbackTestRenderer.asset | 4 +++ ...ssingRenderUICustomRenderer_Renderer.asset | 4 +++ .../CommonAssets/DeferredRenderer.asset | 4 +++ .../Assets/CommonAssets/ForwardRenderer.asset | 4 +++ .../CommonAssets/UniversalRPAsset.asset | 10 +++--- .../UniversalRPAssetBackBuffer.asset | 10 +++--- .../Renderers/DepthNormalsRenderer.asset | 4 +++ .../200_Assets/Renderers/DepthRenderer.asset | 4 +++ .../Renderers/SSAO_DeferredRenderer.asset | 4 +++ .../Renderers/SSAO_DepthNormalRenderer.asset | 4 +++ .../Renderers/SSAO_DepthRenderer.asset | 3 ++ com.unity.testing.urp/CommonAssets.meta | 8 ----- com.unity.testing.urp/Scripts.meta | 2 +- 38 files changed, 197 insertions(+), 64 deletions(-) delete mode 100644 com.unity.testing.urp/CommonAssets.meta diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/ForwardRenderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/ForwardRenderer.asset index e330fd64e32..e80abfa977a 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/ForwardRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/ForwardRenderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAsset.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAsset.asset index 3f3d053e4b0..7d488e58443 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAsset.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRPAsset m_EditorClassIdentifier: - k_AssetVersion: 8 - k_AssetPreviousVersion: 8 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -44,9 +44,9 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 56 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset index 84488a5ad0b..816de0c5f16 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 5740704530427184019} m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -26,6 +27,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/BakedLit.mat b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/BakedLit.mat index b6c0cbc06a2..9c67c12de3d 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/BakedLit.mat +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/BakedLit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: BakedLit m_Shader: {fileID: 4800000, guid: 0ca6dca7396eb48e5849247ffd444914, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -62,10 +62,23 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultLit.mat b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultLit.mat index c2d692fd454..f76e4ff0ddc 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultLit.mat +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultLit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DefaultLit m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -46,6 +46,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -62,10 +74,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 0 @@ -73,8 +101,11 @@ Material: - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 - _DstBlend: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 0 @@ -82,6 +113,7 @@ Material: - _GlossyReflections: 0 - _Metallic: 0 - _OcclusionStrength: 1 + - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultSimple.mat b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultSimple.mat index d1829dc8b4b..5d13dd2c2d1 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultSimple.mat +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultSimple.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DefaultSimple m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} - m_ShaderKeywords: _ALPHATEST_ON + m_ShaderKeywords: _ALPHATEST_ON _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -62,6 +62,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _AlphaClip: 1 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultUnlit.mat b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultUnlit.mat index 4a7316631ce..b6c3f38c7ac 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultUnlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DefaultUnlit m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +66,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat index ffbe176ec1e..2cba82e1ba4 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ParticlesLit m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} - m_ShaderKeywords: _RECEIVE_SHADOWS_OFF + m_ShaderKeywords: _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -108,4 +108,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat index 58ba352f13d..599a798bd25 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ParticlesSimple m_Shader: {fileID: 4800000, guid: 8516d7a69675844a7a0b7095af7c46af, type: 3} - m_ShaderKeywords: _RECEIVE_SHADOWS_OFF + m_ShaderKeywords: _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -109,4 +109,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat index 05701205237..721b45162af 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ParticlesUnlit m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} - m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _RECEIVE_SHADOWS_OFF + m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -108,4 +108,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset index c2b7e6c6f08..c331bc9db1f 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 4450485241359397263} m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -26,6 +27,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/126_RendererFeatureActive/Test_126_Renderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/126_RendererFeatureActive/Test_126_Renderer.asset index f47cf048d7c..6acffa82b29 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/126_RendererFeatureActive/Test_126_Renderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/126_RendererFeatureActive/Test_126_Renderer.asset @@ -94,6 +94,7 @@ MonoBehaviour: - {fileID: -3705402749499409826} - {fileID: -9019738032293091088} m_RendererFeatureMap: 5efa54d6d4c393ccf0e8165a0c74d382 + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -105,6 +106,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DeferredRenderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DeferredRenderer.asset index 9157c4a90eb..4a5ad8a73a0 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DeferredRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DeferredRenderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 3778245575090843755} m_RendererFeatureMap: 6b307b2155066f34 + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -26,6 +27,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthNormalRenderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthNormalRenderer.asset index 8772c870cf3..08a748cd0f1 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthNormalRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthNormalRenderer.asset @@ -38,6 +38,7 @@ MonoBehaviour: m_RendererFeatures: - {fileID: -1872376063803869872} m_RendererFeatureMap: 50b506e7e3fb03e6 + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -49,6 +50,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthRenderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthRenderer.asset index b535f3bd6ac..e52d01430a7 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthRenderer.asset @@ -16,6 +16,7 @@ MonoBehaviour: - {fileID: 339116797255187971} - {fileID: 5458192165673701163} m_RendererFeatureMap: 037ec32deec8b4042b0fcd1edb64bf4b + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -27,6 +28,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/ProjectSettings/URPProjectSettings.asset b/TestProjects/UniversalGraphicsTest_2D/ProjectSettings/URPProjectSettings.asset index 3077404f36b..c1f118ad3f6 100644 --- a/TestProjects/UniversalGraphicsTest_2D/ProjectSettings/URPProjectSettings.asset +++ b/TestProjects/UniversalGraphicsTest_2D/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 4 + m_LastMaterialVersion: 5 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/DeferredRenderer.asset b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/DeferredRenderer.asset index 08fb04380cf..7fe041ee3a2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/DeferredRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/DeferredRenderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/DeferredRenderer_AccurateGBuffer.asset b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/DeferredRenderer_AccurateGBuffer.asset index eb9d4b46f28..81a134dd8a5 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/DeferredRenderer_AccurateGBuffer.asset +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/DeferredRenderer_AccurateGBuffer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/ForwardRenderer.asset b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/ForwardRenderer.asset index 39960752a24..bd82fa01769 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/ForwardRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/ForwardRenderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 0} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/UniversalRPAsset.asset b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/UniversalRPAsset.asset index 7ed4deba9f8..73ba55664b4 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/UniversalRPAsset.asset +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/UniversalRPAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRPAsset m_EditorClassIdentifier: - k_AssetVersion: 8 - k_AssetPreviousVersion: 8 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -44,9 +44,9 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 56 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset index 8e600779cca..685913038e1 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRPAssetBackBuffer m_EditorClassIdentifier: - k_AssetVersion: 8 - k_AssetPreviousVersion: 8 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -44,9 +44,9 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 50 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/DeferredRenderer.asset b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/DeferredRenderer.asset index 08fb04380cf..7fe041ee3a2 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/DeferredRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/DeferredRenderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/ForwardRenderer.asset b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/ForwardRenderer.asset index e330fd64e32..e80abfa977a 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/ForwardRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/ForwardRenderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/UniversalRPAsset.asset b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/UniversalRPAsset.asset index 1bd592ce875..c40f3fa5c9e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/UniversalRPAsset.asset +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/UniversalRPAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRPAsset m_EditorClassIdentifier: - k_AssetVersion: 8 - k_AssetPreviousVersion: 8 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -22,9 +22,9 @@ MonoBehaviour: - {fileID: 11400000, guid: e46834cadfc4eb241bd46a362765a390, type: 2} - {fileID: 11400000, guid: 00d10fe6866821340b490e3b5b5c19f6, type: 2} - {fileID: 11400000, guid: 25dd23104304c1c44af89227207beefb, type: 2} - - {fileID: 11400000, guid: 49c4dd4fd60354b50bf12ea3c22e233e, type: 2} - - {fileID: 11400000, guid: a1279a4e92c2a4dd3b60baa458c01606, type: 2} - - {fileID: 11400000, guid: 01247c41aba2d4bc0ad94a11af8bdb11, type: 2} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} - {fileID: 11400000, guid: b523d3860846cdc4ea49a3ed7350a089, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 1 @@ -41,9 +41,9 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 56 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/UniversalRPAssetRenderScaleLow.asset b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/UniversalRPAssetRenderScaleLow.asset index 74e0c5e58e9..0dfe50342bc 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/UniversalRPAssetRenderScaleLow.asset +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/UniversalRPAssetRenderScaleLow.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRPAssetRenderScaleLow m_EditorClassIdentifier: - k_AssetVersion: 8 - k_AssetPreviousVersion: 8 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -22,8 +22,8 @@ MonoBehaviour: - {fileID: 11400000, guid: e46834cadfc4eb241bd46a362765a390, type: 2} - {fileID: 11400000, guid: 00d10fe6866821340b490e3b5b5c19f6, type: 2} - {fileID: 11400000, guid: 25dd23104304c1c44af89227207beefb, type: 2} - - {fileID: 11400000, guid: 49c4dd4fd60354b50bf12ea3c22e233e, type: 2} - - {fileID: 11400000, guid: a1279a4e92c2a4dd3b60baa458c01606, type: 2} + - {fileID: 0} + - {fileID: 0} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 0 m_RequireOpaqueTexture: 0 @@ -39,9 +39,9 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 50 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset index 84488a5ad0b..816de0c5f16 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 5740704530427184019} m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -26,6 +27,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset index c2b7e6c6f08..c331bc9db1f 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 4450485241359397263} m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -26,6 +27,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/DeferredRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/DeferredRenderer.asset index 08fb04380cf..7fe041ee3a2 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/DeferredRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/DeferredRenderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ForwardRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ForwardRenderer.asset index 39960752a24..bd82fa01769 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ForwardRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ForwardRenderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 0} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAsset.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAsset.asset index c784afd66b0..d0e3ef4c3ed 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAsset.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRPAsset m_EditorClassIdentifier: - k_AssetVersion: 8 - k_AssetPreviousVersion: 8 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -40,9 +40,9 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 56 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset index b7d49767ccf..4635df4d7ff 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRPAssetBackBuffer m_EditorClassIdentifier: - k_AssetVersion: 8 - k_AssetPreviousVersion: 8 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -40,9 +40,9 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 50 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset index afb4af9b6f8..b7431fa9a8d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 7456660863052077093} m_RendererFeatureMap: 25d8c6408c617b67 + m_UseNativeRenderPass: 0 postProcessData: {fileID: 0} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset index e66f79ee194..a45a42461c6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 1912622647174990926} m_RendererFeatureMap: 4e8c3b022a008b1a + m_UseNativeRenderPass: 0 postProcessData: {fileID: 0} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset index 920c26b3751..c80c20a9c0d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset @@ -33,6 +33,7 @@ MonoBehaviour: - {fileID: 3778245575090843755} - {fileID: -638104044694843295} m_RendererFeatureMap: 6b307b2155066f346150398ec0ff24f7 + m_UseNativeRenderPass: 0 postProcessData: {fileID: 0} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -44,6 +45,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset index 5131ce16f3d..36bb5451db5 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset @@ -39,6 +39,7 @@ MonoBehaviour: - {fileID: -1872376063803869872} - {fileID: 5568179863035868408} m_RendererFeatureMap: 50b506e7e3fb03e6f874bc7d1526464d + m_UseNativeRenderPass: 0 postProcessData: {fileID: 0} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -50,6 +51,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 2147483647 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset index ce0bb8617f6..d30d946dddd 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset @@ -45,6 +45,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/com.unity.testing.urp/CommonAssets.meta b/com.unity.testing.urp/CommonAssets.meta deleted file mode 100644 index 9aff93e3b34..00000000000 --- a/com.unity.testing.urp/CommonAssets.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a29f0aba5682545a18626e923027f6a6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.testing.urp/Scripts.meta b/com.unity.testing.urp/Scripts.meta index 6c1fabb2276..340d53d4b0a 100644 --- a/com.unity.testing.urp/Scripts.meta +++ b/com.unity.testing.urp/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 65be98b8e2e484ee8b165bf5d7898ddb +guid: 0fdbc8ca40421d64a89976aa68a73b61 folderAsset: yes DefaultImporter: externalObjects: {} From 3e1197fc9ef9cab51b6c57dc99270b8073371873 Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Wed, 14 Apr 2021 18:02:01 +0200 Subject: [PATCH 3/7] Moved SetQualityLevelOnAwake script to package. --- .../Assets/CommonAssets/Scripts.meta | 8 ---- .../Scripts/SetQualityLevelOnAwake.cs | 43 ------------------- .../Scripts/SetQualityLevelOnAwake.cs.meta | 11 ----- .../Runtime/SetQualityLevelOnAwake.cs.meta | 2 +- 4 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts.meta delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts/SetQualityLevelOnAwake.cs delete mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts/SetQualityLevelOnAwake.cs.meta diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts.meta deleted file mode 100644 index e6411a2695a..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 71bb79128c3c84974af6eb51ba4f2128 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts/SetQualityLevelOnAwake.cs b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts/SetQualityLevelOnAwake.cs deleted file mode 100644 index d45689aa24c..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts/SetQualityLevelOnAwake.cs +++ /dev/null @@ -1,43 +0,0 @@ -using UnityEngine; - -public class SetQualityLevelOnAwake : MonoBehaviour -{ - public int qualityLevelIndex; - - private int prevQualityLevelIndex; - private string[] qualityLevelNames; - - void Awake() - { - qualityLevelNames = QualitySettings.names; - prevQualityLevelIndex = QualitySettings.GetQualityLevel(); - - if (qualityLevelIndex >= qualityLevelNames.Length) - { - Debug.LogError("SetQualityLevelOnAwake: Quality Level Index " + qualityLevelIndex + " is not available!"); - return; - } - - int curIndex = prevQualityLevelIndex; - int nextIndex = qualityLevelIndex; - string cur = qualityLevelNames[prevQualityLevelIndex]; - string next = qualityLevelNames[qualityLevelIndex]; - //Debug.Log("SetQualityLevelOnAwake.Awake():\nSwitching from " + cur + "(" + curIndex + ") to " + next + "(" + nextIndex + ")"); - QualitySettings.SetQualityLevel(qualityLevelIndex, true); - } - - void OnDisable() - { - if (qualityLevelIndex >= qualityLevelNames.Length) - { - return; - } - - int curIndex = QualitySettings.GetQualityLevel(); - int nextIndex = prevQualityLevelIndex; - string cur = qualityLevelNames[curIndex]; - string next = qualityLevelNames[nextIndex]; - //Debug.Log("SetQualityLevelOnAwake.OnDisable():\nSwitching from " + cur + "(" + curIndex + ") to " + next + "(" + nextIndex + ")"); - QualitySettings.SetQualityLevel(prevQualityLevelIndex, true); - } -} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts/SetQualityLevelOnAwake.cs.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts/SetQualityLevelOnAwake.cs.meta deleted file mode 100644 index ee64d0b7a59..00000000000 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Scripts/SetQualityLevelOnAwake.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: af9754faaee77444fbc6b66ffc7ef6b9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs.meta b/com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs.meta index ee64d0b7a59..3b532423023 100644 --- a/com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs.meta +++ b/com.unity.testing.urp/Scripts/Runtime/SetQualityLevelOnAwake.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: af9754faaee77444fbc6b66ffc7ef6b9 +guid: 4f1decc188d2f3146ab93291a5c743e9 MonoImporter: externalObjects: {} serializedVersion: 2 From 936cc13549af9c8812d56f435f4f73a1dc3a8dbc Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Thu, 15 Apr 2021 14:33:02 +0200 Subject: [PATCH 4/7] Addressed feedback --- TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json | 4 ++-- .../UniversalGraphicsTest_Foundation/Packages/manifest.json | 4 ++-- .../UniversalGraphicsTest_Lighting/Packages/manifest.json | 4 ++-- .../UniversalGraphicsTest_PostPro/Packages/manifest.json | 4 ++-- .../UniversalGraphicsTest_Terrain/Packages/manifest.json | 4 ++-- com.unity.testing.urp/package.json | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json index bd57ab5c511..dc15a27b7bc 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.testing.urp": "file:../../../com.unity.testing.urp", + "com.unity.testing.urp": "file:../../../com.unity.testing.urp", "com.unity.test-framework": "1.1.18", "com.unity.test-framework.build": "0.0.1-preview.14", "com.unity.test-framework.utp-reporter": "1.0.2-preview", @@ -54,6 +54,6 @@ "com.unity.render-pipelines.universal", "com.unity.testframework.graphics", "com.unity.testing.xr", - "com.unity.testing.urp" + "com.unity.testing.urp" ] } diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_Foundation/Packages/manifest.json index f7b99075781..c0ff8279187 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_Foundation/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.testing.urp": "file:../../../com.unity.testing.urp", + "com.unity.testing.urp": "file:../../../com.unity.testing.urp", "com.unity.test-framework": "1.1.18", "com.unity.test-framework.build": "0.0.1-preview.14", "com.unity.test-framework.utp-reporter": "1.0.2-preview", @@ -54,6 +54,6 @@ "com.unity.render-pipelines.universal", "com.unity.testframework.graphics", "com.unity.testing.xr", - "com.unity.testing.urp" + "com.unity.testing.urp" ] } diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_Lighting/Packages/manifest.json index f7b99075781..c0ff8279187 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_Lighting/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.testing.urp": "file:../../../com.unity.testing.urp", + "com.unity.testing.urp": "file:../../../com.unity.testing.urp", "com.unity.test-framework": "1.1.18", "com.unity.test-framework.build": "0.0.1-preview.14", "com.unity.test-framework.utp-reporter": "1.0.2-preview", @@ -54,6 +54,6 @@ "com.unity.render-pipelines.universal", "com.unity.testframework.graphics", "com.unity.testing.xr", - "com.unity.testing.urp" + "com.unity.testing.urp" ] } diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_PostPro/Packages/manifest.json index f7b99075781..c0ff8279187 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_PostPro/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.testing.urp": "file:../../../com.unity.testing.urp", + "com.unity.testing.urp": "file:../../../com.unity.testing.urp", "com.unity.test-framework": "1.1.18", "com.unity.test-framework.build": "0.0.1-preview.14", "com.unity.test-framework.utp-reporter": "1.0.2-preview", @@ -54,6 +54,6 @@ "com.unity.render-pipelines.universal", "com.unity.testframework.graphics", "com.unity.testing.xr", - "com.unity.testing.urp" + "com.unity.testing.urp" ] } diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json index f7b99075781..c0ff8279187 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.testing.urp": "file:../../../com.unity.testing.urp", + "com.unity.testing.urp": "file:../../../com.unity.testing.urp", "com.unity.test-framework": "1.1.18", "com.unity.test-framework.build": "0.0.1-preview.14", "com.unity.test-framework.utp-reporter": "1.0.2-preview", @@ -54,6 +54,6 @@ "com.unity.render-pipelines.universal", "com.unity.testframework.graphics", "com.unity.testing.xr", - "com.unity.testing.urp" + "com.unity.testing.urp" ] } diff --git a/com.unity.testing.urp/package.json b/com.unity.testing.urp/package.json index 1a362c346ad..4129d47efa7 100644 --- a/com.unity.testing.urp/package.json +++ b/com.unity.testing.urp/package.json @@ -7,7 +7,7 @@ "description": "Common assets library for URP test projects.", "keywords": ["qa", "test", "testing", "tests", "graphics", "HDRP"], "dependencies": { - "com.unity.testframework.graphics": "7.8.7-preview", + "com.unity.testframework.graphics": "7.8.8-preview", "com.unity.render-pipelines.universal": "file:./com.unity.render-pipelines.universal" } } From cf006b17ada947de12e91ff11a0b7459fe3be681 Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Fri, 16 Apr 2021 09:50:50 +0200 Subject: [PATCH 5/7] Readded 2D test file that was removed by mistake. --- .../Assets/Test/Runtime.meta | 8 ++ .../Assets/Test/Runtime/Renderer2DTests.cs | 121 ++++++++++++++++++ .../Test/Runtime/Renderer2DTests.cs.meta | 11 ++ 3 files changed, 140 insertions(+) create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs.meta diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime.meta new file mode 100644 index 00000000000..db26eab0f3f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc36a08cc82154ffea114c7bba34b323 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs new file mode 100644 index 00000000000..21b14e6f223 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs @@ -0,0 +1,121 @@ +using NUnit.Framework; +using UnityEngine; +using UnityEngine.Rendering.Universal; +using UnityEngine.Rendering.Universal; + +[TestFixture] +class Renderer2DTests +{ + GameObject m_BaseObj; + GameObject m_OverlayObj; + Camera m_BaseCamera; + Camera m_OverlayCamera; + UniversalAdditionalCameraData m_BaseCameraData; + UniversalAdditionalCameraData m_OverlayCameraData; + + [SetUp] + public void Setup() + { + m_BaseObj = new GameObject(); + m_BaseCamera = m_BaseObj.AddComponent(); + m_BaseCameraData = m_BaseObj.AddComponent(); + + m_BaseCamera.allowHDR = false; + m_BaseCameraData.SetRenderer(3); // 2D Renderer. See the list of Renderers in CommonAssets/UniversalRPAsset. + m_BaseCameraData.renderType = CameraRenderType.Base; + m_BaseCameraData.renderPostProcessing = false; + + m_OverlayObj = new GameObject(); + m_OverlayCamera = m_OverlayObj.AddComponent(); + m_OverlayCameraData = m_OverlayObj.AddComponent(); + + m_OverlayCamera.allowHDR = false; + m_OverlayCameraData.SetRenderer(3); // 2D Renderer. See the list of Renderers in CommonAssets/UniversalRPAsset. + m_OverlayCameraData.renderType = CameraRenderType.Overlay; + m_OverlayCameraData.renderPostProcessing = false; + } + + [TearDown] + public void Cleanup() + { + Object.DestroyImmediate(m_OverlayObj); + Object.DestroyImmediate(m_BaseObj); + } + + [Test] + public void BaseRendererDoesNotCreateRenderTexturesIfStackIsEmpty() + { + m_BaseCamera.Render(); + + Renderer2D baseRenderer = m_BaseCameraData.scriptableRenderer as Renderer2D; + + // XRTODO: investigate why baseRenderer.createColorTexture (due to sRGB) is true when XR is enabled + if (UnityEngine.Rendering.XRGraphicsAutomatedTests.enabled) + return; + + Assert.IsFalse(baseRenderer.createColorTexture); + Assert.AreEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget); + + Assert.IsFalse(baseRenderer.createDepthTexture); + Assert.AreEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraDepthTarget); + } + + [Test] + public void BaseRendererCreatesRenderTexturesIfStackIsNotEmpty() + { + m_BaseCameraData.cameraStack.Add(m_OverlayCamera); + + m_BaseCamera.Render(); + + Renderer2D baseRenderer = m_BaseCameraData.scriptableRenderer as Renderer2D; + + Assert.IsTrue(baseRenderer.createColorTexture); + Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget); + + Assert.IsTrue(baseRenderer.createDepthTexture); + Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraDepthTarget); + } + + [Test] + public void BaseRendererUsesDepthAttachmentOfColorTextureIfNoDepthTextureCreated() + { + m_BaseCameraData.renderPostProcessing = true; // This will make the renderer create color texture. + + m_BaseCamera.Render(); + + Renderer2D baseRenderer = m_BaseCameraData.scriptableRenderer as Renderer2D; + + Assert.IsTrue(baseRenderer.createColorTexture); + Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget); + + Assert.IsFalse(baseRenderer.createDepthTexture); + Assert.AreEqual(baseRenderer.cameraColorTarget, baseRenderer.cameraDepthTarget); + } + + [Test] + public void OverlayRendererUsesRenderTexturesFromBase() + { + m_BaseCameraData.cameraStack.Add(m_OverlayCamera); + + m_BaseCamera.Render(); + + Renderer2D baseRenderer = m_BaseCameraData.scriptableRenderer as Renderer2D; + Renderer2D overlayRenderer = m_OverlayCameraData.scriptableRenderer as Renderer2D; + + Assert.AreEqual(baseRenderer.cameraColorTarget, overlayRenderer.cameraColorTarget); + Assert.AreEqual(baseRenderer.cameraDepthTarget, overlayRenderer.cameraDepthTarget); + } + + [Test] + public void OverlayRendererSetsTheCreateTextureFlags() + { + m_BaseCameraData.cameraStack.Add(m_OverlayCamera); + + m_BaseCamera.Render(); + + Renderer2D overlayRenderer = m_OverlayCameraData.scriptableRenderer as Renderer2D; + + Assert.IsTrue(overlayRenderer.createColorTexture); + Assert.IsTrue(overlayRenderer.createDepthTexture); + } +} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs.meta new file mode 100644 index 00000000000..c12a75a66a8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 81dcce77bc315694c8a725ccd840629e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From d3ad87e2c349ecbd034fdf3389eaa8f8001ee6b7 Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Fri, 16 Apr 2021 16:29:18 +0200 Subject: [PATCH 6/7] Reverted changes to 2D project. --- .../Assets/CommonAssets/ForwardRenderer.asset | 4 - .../UniversalRPAssetBackBuffer.asset | 10 +- .../UniversalRPAssetRenderScaleLow.asset | 10 +- .../CallbackTestRenderer.asset | 4 - ...ssingRenderUICustomRenderer_Renderer.asset | 4 - .../Test_126_Renderer.asset | 4 - .../Renderers/SSAO_DeferredRenderer.asset | 4 - .../Renderers/SSAO_DepthNormalRenderer.asset | 4 - .../Renderers/SSAO_DepthRenderer.asset | 4 - .../Assets/Test/Editor.meta | 8 + .../Editor/CopyImageToReferenceFolders.cs | 79 ++++++++ .../CopyImageToReferenceFolders.cs.meta | 11 ++ .../Assets/Test/Editor/MultipleViewGCTest.cs | 51 +++++ .../Test/Editor/MultipleViewGCTest.cs.meta | 11 ++ .../Test/Editor/SetupGraphicsTestCases.cs | 15 ++ .../Editor/SetupGraphicsTestCases.cs.meta | 11 ++ .../Unity.Testing.SRP.Universal.Editor.asmdef | 27 +++ ...y.Testing.SRP.Universal.Editor.asmdef.meta | 7 + .../Editor/UniversalProjectEditorTests.cs | 60 ++++++ .../UniversalProjectEditorTests.cs.meta | 3 + .../Assets/Test/Runtime/ArrayDrawer.cs | 50 +++++ .../Assets/Test/Runtime/ArrayDrawer.cs.meta | 11 ++ .../Test/Runtime/CameraCallbackTests.cs | 176 ++++++++++++++++++ .../Test/Runtime/CameraCallbackTests.cs.meta | 11 ++ .../Test/Runtime/CustomRenderPipeline.meta | 8 + .../CustomRenderGraph.asset | 15 ++ .../CustomRenderGraph.asset.meta | 8 + .../CustomRenderGraphData.cs | 12 ++ .../CustomRenderGraphData.cs.meta | 11 ++ .../CustomRenderPipeline/CustomRenderer.cs | 31 +++ .../CustomRenderer.cs.meta | 11 ++ ...Unity.Testing.SRP.Universal.Runtime.asmdef | 24 +++ ....Testing.SRP.Universal.Runtime.asmdef.meta | 7 + .../Runtime/UniversalGraphicsTestSettings.cs | 16 ++ .../UniversalGraphicsTestSettings.cs.meta | 11 ++ .../Test/Runtime/UniversalGraphicsTests.cs | 92 +++++++++ .../Runtime/UniversalGraphicsTests.cs.meta | 11 ++ .../Packages/manifest.json | 4 +- 38 files changed, 799 insertions(+), 41 deletions(-) create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/ForwardRenderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/ForwardRenderer.asset index e80abfa977a..e330fd64e32 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/ForwardRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/ForwardRenderer.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: - m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -26,9 +25,6 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, - type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset index ee7545e7397..7993f67ab6a 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRPAssetBackBuffer m_EditorClassIdentifier: - k_AssetVersion: 8 - k_AssetPreviousVersion: 8 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -42,9 +42,9 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 50 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAssetRenderScaleLow.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAssetRenderScaleLow.asset index a7b369d328c..9ac7c59e3fc 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAssetRenderScaleLow.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAssetRenderScaleLow.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRPAssetRenderScaleLow m_EditorClassIdentifier: - k_AssetVersion: 8 - k_AssetPreviousVersion: 8 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -42,9 +42,9 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 50 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset index 816de0c5f16..84488a5ad0b 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset @@ -15,7 +15,6 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 5740704530427184019} m_RendererFeatureMap: - m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -27,9 +26,6 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, - type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset index c331bc9db1f..c2b7e6c6f08 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/120_PostProcessingRenderUICustomRenderer/120_PostProcessingRenderUICustomRenderer_Renderer.asset @@ -15,7 +15,6 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 4450485241359397263} m_RendererFeatureMap: - m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -27,9 +26,6 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, - type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/126_RendererFeatureActive/Test_126_Renderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/126_RendererFeatureActive/Test_126_Renderer.asset index 6acffa82b29..f47cf048d7c 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/126_RendererFeatureActive/Test_126_Renderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/126_RendererFeatureActive/Test_126_Renderer.asset @@ -94,7 +94,6 @@ MonoBehaviour: - {fileID: -3705402749499409826} - {fileID: -9019738032293091088} m_RendererFeatureMap: 5efa54d6d4c393ccf0e8165a0c74d382 - m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -106,9 +105,6 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, - type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DeferredRenderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DeferredRenderer.asset index 4a5ad8a73a0..9157c4a90eb 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DeferredRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DeferredRenderer.asset @@ -15,7 +15,6 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 3778245575090843755} m_RendererFeatureMap: 6b307b2155066f34 - m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -27,9 +26,6 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, - type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthNormalRenderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthNormalRenderer.asset index 08a748cd0f1..8772c870cf3 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthNormalRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthNormalRenderer.asset @@ -38,7 +38,6 @@ MonoBehaviour: m_RendererFeatures: - {fileID: -1872376063803869872} m_RendererFeatureMap: 50b506e7e3fb03e6 - m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -50,9 +49,6 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, - type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthRenderer.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthRenderer.asset index e52d01430a7..b535f3bd6ac 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/140_SSAO/Renderers/SSAO_DepthRenderer.asset @@ -16,7 +16,6 @@ MonoBehaviour: - {fileID: 339116797255187971} - {fileID: 5458192165673701163} m_RendererFeatureMap: 037ec32deec8b4042b0fcd1edb64bf4b - m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -28,9 +27,6 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, - type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor.meta new file mode 100644 index 00000000000..cdb56a648de --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d9748aa25ac6490dafc0329cae5ea73 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs new file mode 100644 index 00000000000..3fa8be97c61 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs @@ -0,0 +1,79 @@ +using UnityEngine; +using UnityEditor; +using System.IO; +using System.Collections.Generic; +using System.Text; +using System.Linq; + +public class CopyImageToReferenceFolders +{ + // Add a new menu item that is accessed by right-clicking on an asset in the project view + + [MenuItem("Assets/CopyToReferenceImages", priority = 1)] + private static void CopyImages() + { + string referenceImagesPath = Path.Combine("Assets", "ReferenceImages", "Linear"); + string[] leafFolders = EnumerateLeafFolders(referenceImagesPath).ToArray(); + int numOfLeafFolders = leafFolders.Length; + + Object[] selectedObjects = Selection.objects; + int numOfCopies = numOfLeafFolders * selectedObjects.Length; + + for (int i = 0; i < selectedObjects.Length; i++) + { + Texture2D selected = selectedObjects[i] as Texture2D; + if (selected != null) + { + string pathToOriginalImage = AssetDatabase.GetAssetPath(selected); + string extension = Path.GetExtension(pathToOriginalImage); + string imageName = selected.name + extension; + + StringBuilder sb = new StringBuilder(); + sb.AppendLine("Copied \"" + imageName + "\" to..."); + + for (int j = 0; j < numOfLeafFolders; j++) + { + string leafFolder = leafFolders[j]; + if (EditorUtility.DisplayCancelableProgressBar( + "Copy " + imageName + " to ReferenceImages", + string.Format("({0} of {1}) {2}", j, numOfCopies, leafFolder), + j / numOfLeafFolders) + ) + { + break; + } + + AssetDatabase.CopyAsset(pathToOriginalImage, Path.Combine(leafFolder, imageName)); + sb.AppendLine("-> " + leafFolder); + } + + EditorUtility.ClearProgressBar(); + + Debug.Log(sb); + } + } + } + + private static IEnumerable EnumerateLeafFolders(string root) + { + Stack dir = new Stack(); + dir.Push(root); + + while (dir.Count != 0) + { + bool anySubfolders = false; + root = dir.Pop(); + + foreach (var subfolder in Directory.EnumerateDirectories(root)) + { + dir.Push(subfolder); + anySubfolders = true; + } + + if (!anySubfolders) + { + yield return root; + } + } + } +} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta new file mode 100644 index 00000000000..d47d738e01d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/CopyImageToReferenceFolders.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e412e7020a31eb84b9b2cb1f80ccc7f5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs new file mode 100644 index 00000000000..19dd3c4eb54 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs @@ -0,0 +1,51 @@ +using NUnit.Framework; +using UnityEditor; +using UnityEngine; +using UnityEngine.Profiling; + +[TestFixture] +public class MultipleViewGCTest : MonoBehaviour +{ + Recorder m_gcAllocRecorder; + EditorWindow m_sceneView; + + [OneTimeSetUp] + public void SetUp() + { + //Issue was caused by different nbr of cameras between views + var mainCamera = Camera.main; + for(int i = 0; i < 4; ++i) + { + var newCam = Instantiate(mainCamera); + } + + m_sceneView = EditorWindow.GetWindow(); + + m_gcAllocRecorder = Recorder.Get("GC.Alloc"); + m_gcAllocRecorder.FilterToCurrentThread(); + m_gcAllocRecorder.enabled = false; + + // Render first frame where gc is ok + m_sceneView.Repaint(); + Camera.main.Render(); + } + + [Test] + public void RenderSceneAndGameView() + { + Profiler.BeginSample("GC_Alloc_URP_MultipleViews"); + { + m_gcAllocRecorder.enabled = true; + m_sceneView.Repaint(); + Camera.main.Render(); + m_gcAllocRecorder.enabled = false; + } + int allocationCountOfRenderPipeline = m_gcAllocRecorder.sampleBlockCount; + + if (allocationCountOfRenderPipeline > 0) + { + Debug.LogError($"Memory was allocated {allocationCountOfRenderPipeline} times"); + } + Profiler.EndSample(); + } +} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs.meta new file mode 100644 index 00000000000..f7a7c411a69 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/MultipleViewGCTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ee6faed4fcdc01e4b91eb8b0b4f2360d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs new file mode 100644 index 00000000000..36c5722bc15 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs @@ -0,0 +1,15 @@ +using UnityEngine.TestTools; + +public class SetupGraphicsTestCases : IPrebuildSetup +{ + public void Setup() + { + // Work around case #1033694, unable to use PrebuildSetup types directly from assemblies that don't have special names. + // Once that's fixed, this class can be deleted and the SetupGraphicsTestCases class in Unity.TestFramework.Graphics.Editor + // can be used directly instead. + UnityEditor.TestTools.Graphics.SetupGraphicsTestCases.Setup(UniversalGraphicsTests.universalPackagePath); + + // Configure project for XR tests + Unity.Testing.XR.Editor.InjectMockHMD.SetupLoader(); + } +} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta new file mode 100644 index 00000000000..ac9277c7f8d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/SetupGraphicsTestCases.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0f6fc80695ba0bc48b4edeb2ce544600 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef new file mode 100644 index 00000000000..85b2624cb2d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef @@ -0,0 +1,27 @@ +{ + "name": "UniversalEditorTests", + "references": [ + "GUID:e18141520846dcc44b725b2f74e91229", + "GUID:ed05cc0a83a5a40c0a6e72098212c312", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3", + "GUID:925cf1d7b1444c3448cc9b44ce814a9e", + "GUID:c579267770062bf448e75eb160330b7f", + "GUID:15fc0a57446b3144c949da3e2b9737a9" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": false, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta new file mode 100644 index 00000000000..c6dc88a9b3c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/Unity.Testing.SRP.Universal.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 55aba1c6f9cf8e949aa77aaeccd46083 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs new file mode 100644 index 00000000000..55638f844b2 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs @@ -0,0 +1,60 @@ +using NUnit.Framework; +using UnityEditor; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +public class UniversalProjectEditorTests +{ + private static UniversalRenderPipelineAsset currentAsset; + + [Test] + public void GetCurrentAsset() + { + GetUniversalAsset(); + } + + [Test] + public void CheckAllLightingSettings() + { + var guids = AssetDatabase.FindAssets("t:LightingSettings"); + foreach (var guid in guids) + { + string path = AssetDatabase.GUIDToAssetPath(guid); + LightingSettings lightingSettings = AssetDatabase.LoadAssetAtPath(path); + if (lightingSettings.bakedGI) + { + Assert.IsTrue(lightingSettings.lightmapper != LightingSettings.Lightmapper.Enlighten, + $"Lighting settings ({path}) uses deprecated lightmapper Enlighten."); + Assert.IsTrue(lightingSettings.filteringMode == LightingSettings.FilterMode.None, + $"Lighting settings ({path}) have baked GI with filter mode enabled. It is recommended to turn of filter mode to reduce halo effect (If you still want to use it please contact URP team first)."); + } + } + } + + //[Test] + public void GetDefaultRenderer() + { + GetUniversalAsset(); + + Assert.IsNotNull(currentAsset.scriptableRenderer, "Current ScriptableRenderer is null."); + } + + //Utilities + void GetUniversalAsset() + { + var renderpipelineAsset = GraphicsSettings.currentRenderPipeline; + + if(renderpipelineAsset == null) + Assert.Fail("No Render Pipeline Asset assigned."); + + if (renderpipelineAsset.GetType() == typeof(UniversalRenderPipelineAsset)) + { + currentAsset = renderpipelineAsset as UniversalRenderPipelineAsset; + } + else + { + Assert.Inconclusive("Project not setup for Universal RP."); + } + } +} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta new file mode 100644 index 00000000000..0ba0e1eee93 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Editor/UniversalProjectEditorTests.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ddf535d28d764921a6709da5d30ba07f +timeCreated: 1572431758 \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs new file mode 100644 index 00000000000..834ae378268 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs @@ -0,0 +1,50 @@ +using UnityEngine; + +[ExecuteInEditMode] +public class ArrayDrawer : MonoBehaviour +{ + [Space] + public int columns = 10; + public float interval = 1; + public float cellSize = 0.1f; + + [Space] + [ColorUsage(false, true)] + public Color color1 = Color.green; + + [ColorUsage(false, true)] + public Color color2 = Color.red; + + public Mesh mesh; + public Material material; + + MaterialPropertyBlock _props; + + void Update() + { + if (_props == null) + _props = new MaterialPropertyBlock(); + + var origin = transform.position + new Vector3( + interval * columns * -0.5f, + interval * columns * -0.5f, 0f + ); + var rotation = transform.rotation; + var scale = Vector3.one * cellSize; + + for (int y = 0; y <= columns; y++) + { + for (int x = 0; x <= columns; x++) + { + var position = origin + new Vector3(x, y, 0f) * interval; + var matrix = Matrix4x4.TRS(position, rotation, scale); + + var c1 = color1 * ((float)x / columns); + var c2 = color2 * ((float)y / columns); + _props.SetColor("_EmissionColor", c1 + c2); + + Graphics.DrawMesh(mesh, matrix, material, 0, null, 0, _props); + } + } + } +} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs.meta new file mode 100644 index 00000000000..6431c94712a --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/ArrayDrawer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a292b138ce99b204790a0a0322fac572 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs new file mode 100644 index 00000000000..b3042bba022 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs @@ -0,0 +1,176 @@ +using System; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; +using UnityEngine.Rendering.Universal.Internal; + +[CreateAssetMenu] +public class CameraCallbackTests : ScriptableRendererFeature +{ + static RenderTargetHandle beforeAll; + static RenderTargetHandle afterOpaque; + static RenderTargetHandle afterSkybox; + static RenderTargetHandle afterSkybox2; + static RenderTargetHandle afterTransparent; + static RenderTargetHandle afterPost; + static RenderTargetHandle afterAll; + + BlitPass m_BlitRenderPassesToScreen; + Material m_SamplingMaterial; + + public CameraCallbackTests() + { + beforeAll.Init("_BeforeAll"); + afterOpaque.Init("_AfterOpaque"); + afterSkybox.Init("_AfterSkybox"); + afterSkybox2.Init("_AfterSkybox2"); + afterTransparent.Init("_AfterTransparent"); + afterPost.Init("_AfterPostProcessTexture"); + afterAll.Init("_AfterAll"); + } + + public override void Create() + { + UniversalRendererData data = null; + if (UniversalRenderPipeline.asset.m_RendererDataList[0] != null) + data = UniversalRenderPipeline.asset.m_RendererDataList[0] as UniversalRendererData; + + if (data == null) + return; + + if (data.shaders == null) + return; + + if (data.shaders.samplingPS == null) + return; + + if (m_SamplingMaterial == null) + m_SamplingMaterial = CoreUtils.CreateEngineMaterial(data.shaders.samplingPS); + } + + public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) + { + Downsampling downSamplingMethod = UniversalRenderPipeline.asset.opaqueDownsampling; + + var cameraColorTarget = renderer.cameraColorTarget; + var clearRenderPass = new ClearColorPass(RenderPassEvent.BeforeRenderingOpaques, cameraColorTarget); + + var copyBeforeOpaquePass = new CopyColorPass(RenderPassEvent.BeforeRenderingOpaques, m_SamplingMaterial); + copyBeforeOpaquePass.Setup(cameraColorTarget, beforeAll, downSamplingMethod); + + var copyAfterOpaquePass = new CopyColorPass(RenderPassEvent.AfterRenderingOpaques, m_SamplingMaterial); + copyAfterOpaquePass.Setup(cameraColorTarget, afterOpaque, downSamplingMethod); + + var copyAfterSkyboxPass = new CopyColorPass(RenderPassEvent.AfterRenderingSkybox, m_SamplingMaterial); + copyAfterSkyboxPass.Setup(cameraColorTarget, afterSkybox, downSamplingMethod); + + var copyAfterSkyboxPass2 = new CopyColorPass(RenderPassEvent.AfterRenderingSkybox, m_SamplingMaterial); + copyAfterSkyboxPass.Setup(cameraColorTarget, afterSkybox2, downSamplingMethod); + + var copyAfterTransparents = new CopyColorPass(RenderPassEvent.AfterRenderingTransparents, m_SamplingMaterial); + copyAfterTransparents.Setup(cameraColorTarget, afterTransparent, downSamplingMethod); + + var copyAfterEverything = new CopyColorPass(RenderPassEvent.AfterRenderingPostProcessing, m_SamplingMaterial); + copyAfterEverything.Setup(afterPost.id, afterAll, downSamplingMethod); + + if (m_BlitRenderPassesToScreen == null) + m_BlitRenderPassesToScreen = new BlitPass(RenderPassEvent.AfterRendering, cameraColorTarget); + + // Inserts out of order so we also test render passes sort correctly + renderer.EnqueuePass(copyAfterEverything); + renderer.EnqueuePass(m_BlitRenderPassesToScreen); + renderer.EnqueuePass(copyAfterOpaquePass); + renderer.EnqueuePass(copyAfterSkyboxPass); + renderer.EnqueuePass(copyAfterSkyboxPass2); + renderer.EnqueuePass(copyAfterTransparents); + renderer.EnqueuePass(clearRenderPass); + renderer.EnqueuePass(copyBeforeOpaquePass); + } + + protected override void Dispose(bool disposing) + { + CoreUtils.Destroy(m_SamplingMaterial); + m_BlitRenderPassesToScreen?.Cleanup(); + } + + internal class ClearColorPass : ScriptableRenderPass + { + RenderTargetIdentifier m_ColorHandle; + + public ClearColorPass(RenderPassEvent renderPassEvent, RenderTargetIdentifier colorHandle) + { + m_ColorHandle = colorHandle; + this.renderPassEvent = renderPassEvent; + } + + public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) + { + var cmd = CommandBufferPool.Get("Clear Color"); + cmd.SetRenderTarget(m_ColorHandle); + cmd.ClearRenderTarget(true, true, Color.yellow); + context.ExecuteCommandBuffer(cmd); + CommandBufferPool.Release(cmd); + } + } + + class BlitPass : ScriptableRenderPass + { + private RenderTargetIdentifier colorHandle; + Material m_BlitMaterial; + + public BlitPass(RenderPassEvent renderPassEvent, RenderTargetIdentifier colorHandle) + { + this.colorHandle = colorHandle; + this.renderPassEvent = renderPassEvent; + m_BlitMaterial = CoreUtils.CreateEngineMaterial(Shader.Find("Hidden/Universal Render Pipeline/Blit")); + } + + public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) + { + var mesh = RenderingUtils.fullscreenMesh; + CommandBuffer cmd = CommandBufferPool.Get("Blit Pass"); + cmd.SetRenderTarget(colorHandle); + cmd.SetViewProjectionMatrices(Matrix4x4.identity, Matrix4x4.identity); + + cmd.SetViewport(new Rect(0, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); + cmd.SetGlobalTexture("_BlitTex", beforeAll.Identifier()); + cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); + + cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); + cmd.SetGlobalTexture("_BlitTex", afterOpaque.Identifier()); + cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); + + cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f * 2.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); + cmd.SetGlobalTexture("_BlitTex", afterSkybox.Identifier()); + cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); + + cmd.SetViewport(new Rect(0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); + cmd.SetGlobalTexture("_BlitTex", afterSkybox2.Identifier()); + cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); + + cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); + cmd.SetGlobalTexture("_BlitTex", afterTransparent.Identifier()); + cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); + + cmd.SetViewport(new Rect(renderingData.cameraData.camera.pixelRect.width / 3.0f * 2.0f, 0f, renderingData.cameraData.camera.pixelRect.width / 3.0f, renderingData.cameraData.camera.pixelRect.height / 2.0f)); + cmd.SetGlobalTexture("_BlitTex", afterAll.Identifier()); + cmd.DrawMesh(mesh, Matrix4x4.identity, m_BlitMaterial); + + context.ExecuteCommandBuffer(cmd); + CommandBufferPool.Release(cmd); + } + + public override void OnCameraCleanup(CommandBuffer cmd) + { + if (cmd == null) + throw new ArgumentNullException("cmd"); + + base.OnCameraCleanup(cmd); + } + + public void Cleanup() + { + CoreUtils.Destroy(m_BlitMaterial); + } + } +} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs.meta new file mode 100644 index 00000000000..3b932264aa5 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CameraCallbackTests.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1922bf90be6ebc54da38e96e30f9339a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline.meta new file mode 100644 index 00000000000..38c1199c220 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 86b1b397ac56d494a8506bcada4b13eb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset new file mode 100644 index 00000000000..3205ff3c52a --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset @@ -0,0 +1,15 @@ +%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: 19dda12d58f1fbb4e9ef172721391ff2, type: 3} + m_Name: CustomRenderGraph + m_EditorClassIdentifier: + m_RendererFeatures: [] diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta new file mode 100644 index 00000000000..50e353b4a73 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e46834cadfc4eb241bd46a362765a390 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs new file mode 100644 index 00000000000..8d6f4132931 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs @@ -0,0 +1,12 @@ +namespace UnityEngine.Rendering.Universal +{ + //[CreateAssetMenu()] + public class CustomRenderGraphData : ScriptableRendererData + { + protected override ScriptableRenderer Create() + { + return new CustomRenderer(this); + } + } +} + diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta new file mode 100644 index 00000000000..c8591e6eca1 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 19dda12d58f1fbb4e9ef172721391ff2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs new file mode 100644 index 00000000000..c31e61e99a9 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs @@ -0,0 +1,31 @@ +using UnityEngine.Rendering.Universal.Internal; + +namespace UnityEngine.Rendering.Universal +{ + public class CustomRenderer : ScriptableRenderer + { + private DrawObjectsPass m_RenderOpaqueForwardPass; + + ForwardLights m_ForwardLights; + + public CustomRenderer(CustomRenderGraphData data) : base(data) + { + m_RenderOpaqueForwardPass = new DrawObjectsPass("Render Opaques", true, RenderPassEvent.BeforeRenderingOpaques + 1, RenderQueueRange.opaque, -1, StencilState.defaultValue, 0); + m_ForwardLights = new ForwardLights(); + } + + public override void Setup(ScriptableRenderContext context, ref RenderingData renderingData) + { + ConfigureCameraTarget(BuiltinRenderTextureType.CameraTarget, BuiltinRenderTextureType.CameraTarget); + + foreach (var feature in rendererFeatures) + feature.AddRenderPasses(this, ref renderingData); + EnqueuePass(m_RenderOpaqueForwardPass); + } + + public override void SetupLights(ScriptableRenderContext context, ref RenderingData renderingData) + { + m_ForwardLights.Setup(context, ref renderingData); + } + } +} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta new file mode 100644 index 00000000000..aabda3faa95 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7e0da365be9e44c3bae8da691ccd8de6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef new file mode 100644 index 00000000000..7e2af3c48dd --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef @@ -0,0 +1,24 @@ +{ + "name": "UniversalGraphicsTests", + "references": [ + "GUID:c081bc530f560634bb5c21d4b323a7f1", + "GUID:15fc0a57446b3144c949da3e2b9737a9", + "GUID:df380645f10b7bc4b97d4f5eb6303d95", + "GUID:1d4ad4ead25f33942b7dcf63e8c0820b", + "GUID:d60799ab2a985554ea1a39cd38695018", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": false, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [] +} \ No newline at end of file diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta new file mode 100644 index 00000000000..78ef93867e7 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed05cc0a83a5a40c0a6e72098212c312 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs new file mode 100644 index 00000000000..ac5e0e8c3b1 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs @@ -0,0 +1,16 @@ +using UnityEngine.TestTools.Graphics; + +public class UniversalGraphicsTestSettings : GraphicsTestSettings +{ + public int WaitFrames = 0; + public bool XRCompatible = true; + + public UniversalGraphicsTestSettings() + { + ImageComparisonSettings.TargetWidth = 512; + ImageComparisonSettings.TargetHeight = 512; + ImageComparisonSettings.AverageCorrectnessThreshold = 0.005f; + ImageComparisonSettings.PerPixelCorrectnessThreshold = 0.001f; + ImageComparisonSettings.UseBackBuffer = false; + } +} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta new file mode 100644 index 00000000000..43adf6dc9f1 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 73231aa468d81ea49bc3d914080de185 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs new file mode 100644 index 00000000000..acd20bbfe09 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs @@ -0,0 +1,92 @@ +using NUnit.Framework; +using System.Collections; +using System.Linq; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.SceneManagement; +using UnityEngine.TestTools; +using UnityEngine.TestTools.Graphics; + +public class UniversalGraphicsTests +{ +#if UNITY_ANDROID + static bool wasFirstSceneRan = false; + const int firstSceneAdditionalFrames = 3; +#endif + + public const string universalPackagePath = "Assets/ReferenceImages"; + + [UnityTest, Category("UniversalRP")] + [PrebuildSetup("SetupGraphicsTestCases")] + [UseGraphicsTestCases(universalPackagePath)] + public IEnumerator Run(GraphicsTestCase testCase) + { + SceneManager.LoadScene(testCase.ScenePath); + + // Always wait one frame for scene load + yield return null; + + var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x=>x.GetComponent()); + var settings = Object.FindObjectOfType(); + Assert.IsNotNull(settings, "Invalid test scene, couldn't find UniversalGraphicsTestSettings"); + + int waitFrames = Unity.Testing.XR.Runtime.ConfigureMockHMD.SetupTest(settings.XRCompatible, settings.WaitFrames, settings.ImageComparisonSettings); + + Scene scene = SceneManager.GetActiveScene(); + + yield return null; + + if (settings.ImageComparisonSettings.UseBackBuffer && waitFrames < 1) + waitFrames = 1; + + for (int i = 0; i < waitFrames; i++) + yield return new WaitForEndOfFrame(); + +#if UNITY_ANDROID + // On Android first scene often needs a bit more frames to load all the assets + // otherwise the screenshot is just a black screen + if (!wasFirstSceneRan) + { + for(int i = 0; i < firstSceneAdditionalFrames; i++) + { + yield return new WaitForEndOfFrame(); + } + wasFirstSceneRan = true; + } +#endif + + ImageAssert.AreEqual(testCase.ReferenceImage, cameras.Where(x => x != null), settings.ImageComparisonSettings); + + // Does it allocate memory when it renders what's on the main camera? + bool allocatesMemory = false; + var mainCamera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent(); + + try + { + ImageAssert.AllocatesMemory(mainCamera, settings?.ImageComparisonSettings); + } + catch (AssertionException) + { + allocatesMemory = true; + } + + if (allocatesMemory) + Assert.Fail("Allocated memory when rendering what is on main camera"); + } + +#if UNITY_EDITOR + [TearDown] + public void DumpImagesInEditor() + { + UnityEditor.TestTools.Graphics.ResultsUtility.ExtractImagesFromTestProperties(TestContext.CurrentContext.Test); + } + +#if ENABLE_VR + [TearDown] + public void TearDownXR() + { + XRGraphicsAutomatedTests.running = false; + } +#endif +#endif +} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta new file mode 100644 index 00000000000..da0cc3dccc9 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UniversalGraphicsTests.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 52da4b5c062caa34a980de1d467b3a58 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json index dc15a27b7bc..070d86001b0 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_2D/Packages/manifest.json @@ -10,7 +10,6 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.testing.urp": "file:../../../com.unity.testing.urp", "com.unity.test-framework": "1.1.18", "com.unity.test-framework.build": "0.0.1-preview.14", "com.unity.test-framework.utp-reporter": "1.0.2-preview", @@ -53,7 +52,6 @@ "com.unity.render-pipelines.core", "com.unity.render-pipelines.universal", "com.unity.testframework.graphics", - "com.unity.testing.xr", - "com.unity.testing.urp" + "com.unity.testing.xr" ] } From 7457193dbfa052034cdf532e6b676e7a75bd06bf Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Fri, 16 Apr 2021 16:44:43 +0200 Subject: [PATCH 7/7] Updated Lighting Test --- .../CommonAssets/DeferredRenderer.asset | 3 +++ .../Assets/CommonAssets/ForwardRenderer.asset | 4 +++ .../CommonAssets/UniversalRPAsset.asset | 10 ++++---- .../UniversalRPAssetBackBuffer.asset | 10 ++++---- .../Renderers/DepthNormalsRenderer.asset | 4 +++ .../200_Assets/Renderers/DepthRenderer.asset | 4 +++ .../Renderers/SSAO_DeferredRenderer.asset | 3 +++ .../Renderers/SSAO_DepthNormalRenderer.asset | 3 +++ .../Renderers/SSAO_DepthRenderer.asset | 3 +++ ...Unity.Testing.SRP.Universal.Runtime.asmdef | 25 ------------------- 10 files changed, 34 insertions(+), 35 deletions(-) delete mode 100644 TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/DeferredRenderer.asset b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/DeferredRenderer.asset index dd50b46df3c..75c7609ee0a 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/DeferredRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/DeferredRenderer.asset @@ -26,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/ForwardRenderer.asset b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/ForwardRenderer.asset index 39960752a24..95264ed7424 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/ForwardRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/ForwardRenderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 0} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/UniversalRPAsset.asset b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/UniversalRPAsset.asset index 27a6e74883a..06593147732 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/UniversalRPAsset.asset +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/UniversalRPAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRPAsset m_EditorClassIdentifier: - k_AssetVersion: 8 - k_AssetPreviousVersion: 8 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -39,9 +39,9 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 56 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset index 3ebb5974f7e..9bfd8cb6998 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/UniversalRPAssetBackBuffer.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRPAssetBackBuffer m_EditorClassIdentifier: - k_AssetVersion: 8 - k_AssetPreviousVersion: 8 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -39,9 +39,9 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 256 - m_AdditionalLightsShadowResolutionTierMedium: 512 - m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 50 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset index afb4af9b6f8..625dcdf4319 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 7456660863052077093} m_RendererFeatureMap: 25d8c6408c617b67 + m_UseNativeRenderPass: 0 postProcessData: {fileID: 0} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset index e66f79ee194..fef571a3489 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 1912622647174990926} m_RendererFeatureMap: 4e8c3b022a008b1a + m_UseNativeRenderPass: 0 postProcessData: {fileID: 0} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -25,6 +26,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset index 4ccd04d12f7..e94194ec102 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset @@ -45,6 +45,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset index 7f46da2a7c3..cdcf0c627e4 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset @@ -51,6 +51,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 2147483647 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset index ce0bb8617f6..7394e9ca8a0 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset @@ -45,6 +45,9 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef deleted file mode 100644 index 7c70554f380..00000000000 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Test/Runtime/Unity.Testing.SRP.Universal.Runtime.asmdef +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "UniversalGraphicsTests", - "rootNamespace": "", - "references": [ - "GUID:c081bc530f560634bb5c21d4b323a7f1", - "GUID:15fc0a57446b3144c949da3e2b9737a9", - "GUID:df380645f10b7bc4b97d4f5eb6303d95", - "GUID:1d4ad4ead25f33942b7dcf63e8c0820b", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file