From e97c5580986cc7c695e361203f67227349cf70b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20=C3=96rn=20Unn=C3=BE=C3=B3rsson?= Date: Thu, 23 Jan 2020 22:57:18 +0100 Subject: [PATCH 01/28] Bugfix 168283: URP shaders output incorrect alpha values (#5526) * Adding an Alpha() function to Core.hlsl and making URP shaders use it to calculate the final output Alpha This fixes issues where rendering to a render texture outputs incorrect alpha values (case #168283) * Added a test scene and created materials that have assigned textures to them * Renamed Alpha() function to OutputAlpha() and changed the relevant shaders calling it * Updated the test scene to contain unlit particles as well * Making the SpeedTree shaders use OutputAlpha # Conflicts: # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset # com.unity.render-pipelines.universal/CHANGELOG.md # com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl --- .../LW_DiffuseParticlesWithTexture.mat | 128 ++ .../LW_DiffuseParticlesWithTexture.mat.meta | 8 + ...DiffuseTransparentParticlesWithTexture.mat | 129 ++ ...seTransparentParticlesWithTexture.mat.meta | 8 + .../LW_DiffuseTransparentWithTexture.mat | 102 + .../LW_DiffuseTransparentWithTexture.mat.meta | 8 + .../Materials/LW_DiffuseUnlitParticles.mat | 132 ++ .../LW_DiffuseUnlitParticles.mat.meta | 8 + .../LW_DiffuseUnlitParticlesTransparent.mat | 133 ++ ..._DiffuseUnlitParticlesTransparent.mat.meta | 8 + ...seUnlitParticlesTransparentWithTexture.mat | 133 ++ ...itParticlesTransparentWithTexture.mat.meta | 8 + .../LW_DiffuseUnlitParticlesWithTexture.mat | 132 ++ ..._DiffuseUnlitParticlesWithTexture.mat.meta | 8 + .../Materials/LW_DiffuseUnlitTransparent.mat | 115 ++ .../LW_DiffuseUnlitTransparent.mat.meta | 8 + .../LW_DiffuseUnlitTransparentWithTexture.mat | 115 ++ ...iffuseUnlitTransparentWithTexture.mat.meta | 8 + .../Materials/LW_DiffuseUnlitWithTexture.mat | 114 ++ .../LW_DiffuseUnlitWithTexture.mat.meta | 8 + .../Materials/LW_DiffuseWithTexture.mat | 101 + .../Materials/LW_DiffuseWithTexture.mat.meta | 8 + .../LW_MaterialParticlesWithTexture.mat | 127 ++ .../LW_MaterialParticlesWithTexture.mat.meta | 8 + ...aterialTransparentParticlesWithTexture.mat | 128 ++ ...alTransparentParticlesWithTexture.mat.meta | 8 + .../LW_MaterialTransparentWithTexture.mat | 110 + ...LW_MaterialTransparentWithTexture.mat.meta | 8 + .../Materials/LW_MaterialWithTexture.mat | 109 + .../Materials/LW_MaterialWithTexture.mat.meta | 8 + .../Android/OpenGLES3/108_MoveCamera.png.meta | 7 + .../OpenGLES3/109_URPShadersAlphaOutput.png | 3 + .../109_URPShadersAlphaOutput.png.meta | 91 + .../OpenGLCore/108_MoveCamera.png.meta | 7 + .../OpenGLCore/109_URPShadersAlphaOutput.png | 3 + .../109_URPShadersAlphaOutput.png.meta | 91 + .../Vulkan/108_MoveCamera.png.meta | 7 + .../Vulkan/109_URPShadersAlphaOutput.png | 3 + .../Vulkan/109_URPShadersAlphaOutput.png.meta | 91 + .../OSXEditor/Metal/108_MoveCamera.png.meta | 25 + .../Metal/109_URPShadersAlphaOutput.png | 3 + .../Metal/109_URPShadersAlphaOutput.png.meta | 91 + .../OpenGLCore/108_MoveCamera.png.meta | 7 + .../OpenGLCore/109_URPShadersAlphaOutput.png | 3 + .../109_URPShadersAlphaOutput.png.meta | 91 + .../OSXPlayer/Metal/108_MoveCamera.png.meta | 7 + .../Metal/109_URPShadersAlphaOutput.png | 3 + .../Metal/109_URPShadersAlphaOutput.png.meta | 91 + .../OpenGLCore/108_MoveCamera.png.meta | 7 + .../OpenGLCore/109_URPShadersAlphaOutput.png | 3 + .../109_URPShadersAlphaOutput.png.meta | 91 + .../Direct3D11/108_MoveCamera.png.meta | 7 + .../Direct3D11/109_URPShadersAlphaOutput.png | 3 + .../109_URPShadersAlphaOutput.png.meta | 91 + .../Vulkan/108_MoveCamera.png.meta | 7 + .../Vulkan/109_URPShadersAlphaOutput.png | 3 + .../Vulkan/109_URPShadersAlphaOutput.png.meta | 91 + .../Direct3D11/108_MoveCamera.png.meta | 7 + .../Direct3D11/109_URPShadersAlphaOutput.png | 3 + .../109_URPShadersAlphaOutput.png.meta | 91 + .../Vulkan/108_MoveCamera.png.meta | 7 + .../Vulkan/109_URPShadersAlphaOutput.png | 3 + .../Vulkan/109_URPShadersAlphaOutput.png.meta | 91 + .../Scenes/109_URPShadersAlphaOutput.meta | 8 + .../Scenes/109_URPShadersAlphaOutput.unity | 1795 +++++++++++++++++ .../109_URPShadersAlphaOutput.unity.meta | 7 + .../109_CameraTargetTexture.mat | 132 ++ .../109_CameraTargetTexture.mat.meta | 9 + ...dersAlphaOutputRenderTexture.renderTexture | 37 + ...lphaOutputRenderTexture.renderTexture.meta | 8 + .../ProjectSettings/EditorBuildSettings.asset | 3 + .../CHANGELOG.md | 1 + .../Runtime/Passes/DrawObjectsPass.cs | 7 + .../ShaderLibrary/Core.hlsl | 5 + .../ShaderLibrary/Input.hlsl | 6 + .../Shaders/BakedLit.shader | 3 +- .../Shaders/LitForwardPass.hlsl | 4 +- .../Nature/SpeedTree7CommonPasses.hlsl | 1 + .../Shaders/Nature/SpeedTree8Passes.hlsl | 2 + .../Particles/ParticlesLitForwardPass.hlsl | 2 + .../ParticlesSimpleLitForwardPass.hlsl | 2 + .../Particles/ParticlesUnlitForwardPass.hlsl | 4 +- .../Shaders/SimpleLitForwardPass.hlsl | 2 + .../Shaders/Unlit.shader | 3 +- 84 files changed, 5094 insertions(+), 4 deletions(-) create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat new file mode 100644 index 00000000000..bb1f259a4f0 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseParticlesWithTexture + m_Shader: {fileID: 4800000, guid: 8516d7a69675844a7a0b7095af7c46af, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _BaseColorAddSubDiff: {r: -1, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.45641106, g: 0.45641106, b: 0.45641106, a: 1} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat.meta new file mode 100644 index 00000000000..c1fd9611deb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 27f4cb45080ed2445851bba0c20b55e5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat new file mode 100644 index 00000000000..f84b511964a --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseTransparentParticlesWithTexture + m_Shader: {fileID: 4800000, guid: 8516d7a69675844a7a0b7095af7c46af, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat.meta new file mode 100644 index 00000000000..847d3f788df --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 221ebea45009ce347a01528f8fe6fbe8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat new file mode 100644 index 00000000000..46fd7115056 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseTransparentWithTexture + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ShaderKeywords: _SPECULAR_COLOR + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat.meta new file mode 100644 index 00000000000..de4d187f6f0 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a6b4f77725e5984c9df0e7a93a6f780 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat new file mode 100644 index 00000000000..f9b91326f7f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat @@ -0,0 +1,132 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitParticles + m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat.meta new file mode 100644 index 00000000000..4f443643c08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: babb1d1fa23d919448bc937a8c7e09c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat new file mode 100644 index 00000000000..0503f98f240 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitParticlesTransparent + m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat.meta new file mode 100644 index 00000000000..015c52aac02 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3db8257d40ec1f645a466af67844deb7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat new file mode 100644 index 00000000000..c5db13b53f5 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitParticlesTransparentWithTexture + m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat.meta new file mode 100644 index 00000000000..407d4a30b8a --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 753e3d836e53e5749a43b9cb3bba372f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat new file mode 100644 index 00000000000..963ce394b27 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat @@ -0,0 +1,132 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitParticlesWithTexture + m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat.meta new file mode 100644 index 00000000000..1fc4ab29c86 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fca13614753b1684fbf32090d233ac0a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat new file mode 100644 index 00000000000..152e26447c5 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat @@ -0,0 +1,115 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitTransparent + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat.meta new file mode 100644 index 00000000000..77ec01c8ac4 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de43acf2028025a4ab6647ceb80b67e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat new file mode 100644 index 00000000000..242aab80523 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat @@ -0,0 +1,115 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitTransparentWithTexture + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat.meta new file mode 100644 index 00000000000..b6d13835c48 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb1115deb18d6854590d9674aecfe7a9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat new file mode 100644 index 00000000000..6b4edaaa7c7 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat @@ -0,0 +1,114 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitWithTexture + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat.meta new file mode 100644 index 00000000000..bea12939b3c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90c53f0ca2ad9bc418ad948acf6ad972 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat new file mode 100644 index 00000000000..86b55614654 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseWithTexture + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat.meta new file mode 100644 index 00000000000..efe3aff7370 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e83d54e4530e874d94c10c55171fc45 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat new file mode 100644 index 00000000000..42560360146 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_MaterialParticlesWithTexture + m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat.meta new file mode 100644 index 00000000000..e33c9ab43a9 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90af245dc1ff5df40bc9eb6dc7008dd7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat new file mode 100644 index 00000000000..1c3f48551c4 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_MaterialTransparentParticlesWithTexture + m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat.meta new file mode 100644 index 00000000000..9cb427c2b4a --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6b79eb193157de48a9f280be6b21a2f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat new file mode 100644 index 00000000000..5150d43942c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat @@ -0,0 +1,110 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_MaterialTransparentWithTexture + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _SPECULARHIGHLIGHTS_OFF + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat.meta new file mode 100644 index 00000000000..05a09b604bf --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 12143dc7f86fad6439238d429a42ad6a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat new file mode 100644 index 00000000000..b5f87aef6d9 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat @@ -0,0 +1,109 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_MaterialWithTexture + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat.meta new file mode 100644 index 00000000000..292d120236f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d560b316630b47d43ad9dd8de7c13314 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/108_MoveCamera.png.meta index d319f838e56..6afa5f72851 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: eb5315a0cb7d5e4458013c47954802b1 +======= +guid: 1a7f8e14882d4a74885a57b7b5843a30 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..754c6b8eada --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 02e9224ec20390246b12f6de52d98885 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/108_MoveCamera.png.meta index 5ceeb58df4a..dd98c582aa1 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 13bf74666e304c54d8b3916ee9e06662 +======= +guid: a7a34602e83dc8f4b8a7c2195973f10f +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..5726fed8f16 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 0329a59cef021d641b86989dfbafc39e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/108_MoveCamera.png.meta index 6ad9e38620a..dafc34cef18 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 8be9e7474d2ab284e9c12cbe7016087b +======= +guid: 2a9acc3eb0e393948b9f56bb9d2591ba +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..ce0398ade5f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 963d6152bd5211b44b6df319b36aff13 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/108_MoveCamera.png.meta index 57f1ba5f421..917ccaadabc 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/108_MoveCamera.png.meta @@ -1,12 +1,20 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: f9cbcb9d488de214ca50f96d0d393306 +======= +guid: d3960a634887a65448295035f82642fe +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 10 mipmaps: mipMapMode: 0 +<<<<<<< HEAD enableMipMap: 0 +======= + enableMipMap: 1 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,10 +28,16 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 +<<<<<<< HEAD isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 +======= + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -38,7 +52,11 @@ TextureImporter: wrapU: -1 wrapV: -1 wrapW: -1 +<<<<<<< HEAD nPOTScale: 0 +======= + nPOTScale: 1 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -58,14 +76,21 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 +<<<<<<< HEAD textureCompression: 0 +======= + textureCompression: 1 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..98b12d685e6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 88b9b1c01a1815d4d9f8650d1d88c15c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/108_MoveCamera.png.meta index f820fdf6e6b..570faddfce6 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: f94a91886ade92b42ac1700c7cd11a52 +======= +guid: 5a8b999e0a6b4bd43a65e4b32a8c6f38 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..d9ed9ad3557 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 266a12c04cd32d24c96d9d04e24f6a7c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/108_MoveCamera.png.meta index 02312daebd5..91bce3b4652 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e814060db4b45414c9894a0e777d0950 +======= +guid: 8662b048ef4ff6840997a61931a91eb5 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..2042ff807d1 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 1f7d3e8d25d7c8a439fcce6fadb4811c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/108_MoveCamera.png.meta index 499f8edf5c2..c7f2032b59d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 03033da20369c0d4788770712a2c8b7f +======= +guid: 8b70a025b73b2814bbe3be388fcdd1df +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..33464be73c5 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 07b9b034bbe5d5f42ae881fa62a15237 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/108_MoveCamera.png.meta index e1b4e93eabc..97d2e5690cb 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 75db332c07db1fc408faf076f68ab933 +======= +guid: ffd5ac3485633e34e9012cc7507628a7 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..e525e09b1ca --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 4264f4bb52b9e8046a83fcffc9f758e3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/108_MoveCamera.png.meta index 26ae25683a0..222c3fe8c33 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: c9586be7b9307994690002f6c12ab26a +======= +guid: 2045afaac492d0641b327b2f072a6b25 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..010c5f0fc7a --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: dce921b29c6ed374386c451517d2f86e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/108_MoveCamera.png.meta index 06d4648bdf5..6354602424c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 5d56ea6588bdbee42a55a8293a4aba79 +======= +guid: 216a48a8fa8584c4b865b194e9eeb437 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..4603ec79b11 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: fb786d7a297974142a773592106d9556 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/108_MoveCamera.png.meta index 0f7abdfdf04..d1bfeee24b6 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: b82e48c5eeac38a4d8b781f7717eb78c +======= +guid: 4a5c2ebc1f56fb24a806feefa58fed94 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..2699ad08bc6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 5175703891a9a2d449f8d03a05e662cd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.meta new file mode 100644 index 00000000000..b3245dad2c2 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db06ef4aa71943c4ba059b51c1d723f5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity new file mode 100644 index 00000000000..4a6485eb337 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity @@ -0,0 +1,1795 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 0 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &165573366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 165573367} + - component: {fileID: 165573370} + - component: {fileID: 165573369} + - component: {fileID: 165573368} + m_Layer: 5 + m_Name: RenderTexturePlane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &165573367 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 165573366} + m_LocalRotation: {x: -0.03084362, y: -0.7064338, z: 0.7064338, w: 0.03084362} + m_LocalPosition: {x: 0, y: 0, z: 43.96} + m_LocalScale: {x: 1, y: 1, z: 0.5} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 95, y: 90, z: 270} +--- !u!64 &165573368 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 165573366} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &165573369 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 165573366} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 284cb6459f58c464083648fcf20ddeec, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &165573370 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 165573366} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &440291764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 440291767} + - component: {fileID: 440291766} + - component: {fileID: 440291765} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &440291765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440291764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &440291766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440291764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &440291767 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440291764} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &464618202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 464618206} + - component: {fileID: 464618205} + - component: {fileID: 464618204} + - component: {fileID: 464618203} + m_Layer: 0 + m_Name: ParticlesSimpleLit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &464618203 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464618202} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &464618204 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464618202} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 221ebea45009ce347a01528f8fe6fbe8, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &464618205 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464618202} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &464618206 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464618202} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 15, y: -10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &517307315 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 517307319} + - component: {fileID: 517307318} + - component: {fileID: 517307317} + - component: {fileID: 517307316} + m_Layer: 0 + m_Name: Lit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &517307316 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517307315} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &517307317 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517307315} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 12143dc7f86fad6439238d429a42ad6a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &517307318 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517307315} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &517307319 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517307315} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &565277321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 565277325} + - component: {fileID: 565277324} + - component: {fileID: 565277323} + - component: {fileID: 565277322} + m_Layer: 0 + m_Name: Lit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &565277322 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565277321} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &565277323 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565277321} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d560b316630b47d43ad9dd8de7c13314, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &565277324 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565277321} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &565277325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565277321} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -15, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &570913713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 570913715} + - component: {fileID: 570913714} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &570913714 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570913713} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 2 + m_Range: 35.3 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 0 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &570913715 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570913713} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &571769776 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 571769777} + - component: {fileID: 571769780} + - component: {fileID: 571769779} + - component: {fileID: 571769778} + m_Layer: 0 + m_Name: ParticlesUnlit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &571769777 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571769776} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 5, y: 10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!64 &571769778 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571769776} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &571769779 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571769776} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fca13614753b1684fbf32090d233ac0a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &571769780 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571769776} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &580896800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 580896804} + - component: {fileID: 580896803} + - component: {fileID: 580896802} + - component: {fileID: 580896801} + m_Layer: 0 + m_Name: SimpleLit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &580896801 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580896800} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &580896802 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580896800} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7e83d54e4530e874d94c10c55171fc45, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &580896803 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580896800} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &580896804 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580896800} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &689935916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 689935920} + - component: {fileID: 689935919} + - component: {fileID: 689935918} + - component: {fileID: 689935917} + m_Layer: 0 + m_Name: ParticlesSimpleLit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &689935917 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689935916} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &689935918 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689935916} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 27f4cb45080ed2445851bba0c20b55e5, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &689935919 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689935916} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &689935920 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689935916} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 5, y: -10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &767940025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 767940029} + - component: {fileID: 767940028} + - component: {fileID: 767940027} + - component: {fileID: 767940026} + m_Layer: 0 + m_Name: SimpleLit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &767940026 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767940025} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &767940027 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767940025} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 8a6b4f77725e5984c9df0e7a93a6f780, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &767940028 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767940025} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &767940029 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767940025} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 15, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &981139002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 981139006} + - component: {fileID: 981139005} + - component: {fileID: 981139004} + - component: {fileID: 981139003} + m_Layer: 0 + m_Name: CameraToRenderTexture + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &981139003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981139002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &981139004 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981139002} + m_Enabled: 1 +--- !u!20 &981139005 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981139002} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 1, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 15 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 1 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: f9e2386cd01180c4a8f1727769227300, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &981139006 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981139002} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1035718256 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1035718260} + - component: {fileID: 1035718259} + - component: {fileID: 1035718258} + - component: {fileID: 1035718257} + m_Layer: 0 + m_Name: ParticlesLit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1035718257 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035718256} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1035718258 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035718256} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 90af245dc1ff5df40bc9eb6dc7008dd7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1035718259 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035718256} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1035718260 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035718256} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -15, y: -10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &1142655687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1142655690} + - component: {fileID: 1142655689} + - component: {fileID: 1142655688} + - component: {fileID: 1142655691} + - component: {fileID: 1142655692} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1142655688 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142655687} + m_Enabled: 1 +--- !u!20 &1142655689 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142655687} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.5 + far clip plane: 12000 + field of view: 15 + orthographic: 1 + orthographic size: 3.1 + m_Depth: 1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 32 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1142655690 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142655687} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1142655691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142655687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!114 &1142655692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142655687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} + m_Name: + m_EditorClassIdentifier: + ImageComparisonSettings: + TargetWidth: 640 + TargetHeight: 360 + PerPixelCorrectnessThreshold: 0.001 + AverageCorrectnessThreshold: 0.005 + UseHDR: 0 + WaitFrames: 5 +--- !u!1 &1216562597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1216562598} + - component: {fileID: 1216562601} + - component: {fileID: 1216562600} + - component: {fileID: 1216562599} + m_Layer: 0 + m_Name: Unlit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1216562598 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216562597} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -5, y: 10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!64 &1216562599 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216562597} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1216562600 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216562597} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fb1115deb18d6854590d9674aecfe7a9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1216562601 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216562597} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1544163734 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1544163735} + - component: {fileID: 1544163738} + - component: {fileID: 1544163737} + - component: {fileID: 1544163736} + m_Layer: 0 + m_Name: Unlit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1544163735 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544163734} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -15, y: 10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!64 &1544163736 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544163734} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1544163737 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544163734} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 90c53f0ca2ad9bc418ad948acf6ad972, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1544163738 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544163734} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1710776198 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1710776202} + - component: {fileID: 1710776201} + - component: {fileID: 1710776200} + - component: {fileID: 1710776199} + m_Layer: 0 + m_Name: ParticlesLit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1710776199 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710776198} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1710776200 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710776198} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d6b79eb193157de48a9f280be6b21a2f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1710776201 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710776198} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1710776202 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710776198} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -5, y: -10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &1751120201 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1751120202} + m_Layer: 0 + m_Name: ObjectPlanes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1751120202 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751120201} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1544163735} + - {fileID: 1216562598} + - {fileID: 571769777} + - {fileID: 2050878688} + - {fileID: 565277325} + - {fileID: 517307319} + - {fileID: 580896804} + - {fileID: 767940029} + - {fileID: 1035718260} + - {fileID: 1710776202} + - {fileID: 689935920} + - {fileID: 464618206} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2050878687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2050878688} + - component: {fileID: 2050878691} + - component: {fileID: 2050878690} + - component: {fileID: 2050878689} + m_Layer: 0 + m_Name: ParticlesUnlit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2050878688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050878687} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 15, y: 10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!64 &2050878689 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050878687} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2050878690 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050878687} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 753e3d836e53e5749a43b9cb3bba372f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &2050878691 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050878687} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity.meta new file mode 100644 index 00000000000..e751c850cb4 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0a89803a0d2352245a452c202f9a67d1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat new file mode 100644 index 00000000000..051063a94c0 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat @@ -0,0 +1,132 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2837999492683578002 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 109_CameraTargetTexture + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 8400000, guid: f9e2386cd01180c4a8f1727769227300, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + 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: 8400000, guid: f9e2386cd01180c4a8f1727769227300, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 8400000, guid: f9e2386cd01180c4a8f1727769227300, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.199 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 1 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _ReflectionSource: 0 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} +--- !u!114 &6474889523495581265 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat.meta new file mode 100644 index 00000000000..4038b3d513d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 284cb6459f58c464083648fcf20ddeec +timeCreated: 1493306832 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture new file mode 100644 index 00000000000..fec455cf2fa --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 109_URPShadersAlphaOutputRenderTexture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 1280 + m_Height: 720 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture.meta new file mode 100644 index 00000000000..40376944a18 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f9e2386cd01180c4a8f1727769227300 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset b/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset index 97b68a9ef53..21cb2849aeb 100644 --- a/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset @@ -239,4 +239,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/126_RendererFeatureActive.unity guid: 92276052d376244eb94e9548db46b27f + - enabled: 1 + path: Assets/Scenes/109_URPShadersAlphaOutput.unity + guid: 0a89803a0d2352245a452c202f9a67d1 m_configObjects: {} diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 0ca02bde6a4..7da4b1d7379 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -174,6 +174,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue where Prefab previews were incorrectly lit when you used the 2D Renderer. - Fixed an issue where the Light didn't update correctly when you deleted a Sprite that a Sprite 2D Light uses. - Fixed an issue where Cinemachine v2.4 couldn't be used together with Universal RP due to a circular dependency between the two packages. +- Fixed an issue where opaque objects were outputting incorrect alpha values [case 1168283](https://issuetracker.unity3d.com/issues/lwrp-alpha-clipping-material-makes-other-materials-look-like-alpha-clipping-when-gameobject-is-shown-in-render-texture) ## [7.1.2] - 2019-09-19 ### Added diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/DrawObjectsPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/DrawObjectsPass.cs index b764feb858c..d8d4aaefc67 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/DrawObjectsPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/DrawObjectsPass.cs @@ -17,6 +17,8 @@ public class DrawObjectsPass : ScriptableRenderPass ProfilingSampler m_ProfilingSampler; bool m_IsOpaque; + static readonly int s_DrawObjectPassDataPropID = Shader.PropertyToID("_DrawObjectPassData"); + public DrawObjectsPass(string profilerTag, bool opaque, RenderPassEvent evt, RenderQueueRange renderQueueRange, LayerMask layerMask, StencilState stencilState, int stencilReference) { m_ProfilerTag = profilerTag; @@ -43,6 +45,11 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData CommandBuffer cmd = CommandBufferPool.Get(m_ProfilerTag); using (new ProfilingScope(cmd, m_ProfilingSampler)) { + // Global render pass data containing various settings. + // x,y,z are currently unused + // w is used for knowing whether the object is opaque(1) or alpha blended(0) + Vector4 drawObjectPassData = new Vector4(0.0f, 0.0f, 0.0f, (m_IsOpaque) ? 1.0f : 0.0f); + cmd.SetGlobalVector(s_DrawObjectPassDataPropID, drawObjectPassData); context.ExecuteCommandBuffer(cmd); cmd.Clear(); diff --git a/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl b/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl index 43a03b06e83..6c5f328c58b 100644 --- a/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl +++ b/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl @@ -117,6 +117,11 @@ void AlphaDiscard(real alpha, real cutoff, real offset = 0.0h) #endif } +half OutputAlpha(half outputAlpha) +{ + return saturate(outputAlpha + _DrawObjectPassData.a); +} + // A word on normalization of normals: // For better quality normals should be normalized before and after // interpolation. diff --git a/com.unity.render-pipelines.universal/ShaderLibrary/Input.hlsl b/com.unity.render-pipelines.universal/ShaderLibrary/Input.hlsl index 13ac64a5227..b70f6376659 100644 --- a/com.unity.render-pipelines.universal/ShaderLibrary/Input.hlsl +++ b/com.unity.render-pipelines.universal/ShaderLibrary/Input.hlsl @@ -37,6 +37,12 @@ float4 _ScaledScreenParams; float4 _MainLightPosition; half4 _MainLightColor; +// Global object render pass data containing various settings. +// x,y,z are currently unused +// w is used for knowing whether the object is opaque(1) or alpha blended(0) +half4 _DrawObjectPassData; + + half4 _AdditionalLightsCount; #if USE_STRUCTURED_BUFFER_FOR_LIGHT_DATA StructuredBuffer _AdditionalLightsBuffer; diff --git a/com.unity.render-pipelines.universal/Shaders/BakedLit.shader b/com.unity.render-pipelines.universal/Shaders/BakedLit.shader index 0c3d74fe7c4..526609693f2 100644 --- a/com.unity.render-pipelines.universal/Shaders/BakedLit.shader +++ b/com.unity.render-pipelines.universal/Shaders/BakedLit.shader @@ -130,7 +130,8 @@ Shader "Universal Render Pipeline/Baked Lit" normalWS = NormalizeNormalPerPixel(normalWS); color *= SAMPLE_GI(input.lightmapUV, input.vertexSH, normalWS); color = MixFog(color, input.uv0AndFogCoord.z); - + alpha = OutputAlpha(alpha); + return half4(color, alpha); } ENDHLSL diff --git a/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl index bafeb67b829..66ad8220999 100644 --- a/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl @@ -137,8 +137,10 @@ half4 LitPassFragment(Varyings input) : SV_Target InitializeInputData(input, surfaceData.normalTS, inputData); half4 color = UniversalFragmentPBR(inputData, surfaceData.albedo, surfaceData.metallic, surfaceData.specular, surfaceData.smoothness, surfaceData.occlusion, surfaceData.emission, surfaceData.alpha); - + color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); + return color; } diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl index 2965f6143e7..2dabe8c8045 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl @@ -145,6 +145,7 @@ half4 SpeedTree7Frag(SpeedTreeVertexOutput input) : SV_Target half4 color = UniversalFragmentBlinnPhong(inputData, diffuseColor.rgb, half4(0, 0, 0, 0), 0, 0, diffuse.a); color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); return color; } diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl index 7281bf24e52..9c17d4b183e 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl @@ -375,6 +375,8 @@ half4 SpeedTree8Frag(SpeedTreeFragmentInput input) : SV_Target half4 color = UniversalFragmentPBR(inputData, albedo, metallic, specular, smoothness, occlusion, emission, alpha); color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); + return color; } diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLitForwardPass.hlsl index 4d3d4f38893..fb8d61886be 100644 --- a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLitForwardPass.hlsl @@ -168,6 +168,8 @@ half4 ParticlesLitFragment(VaryingsParticle input) : SV_Target surfaceData.metallic, half3(0, 0, 0), surfaceData.smoothness, surfaceData.occlusion, surfaceData.emission, surfaceData.alpha); color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); + return color; } diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLitForwardPass.hlsl index 7a89ac71082..ecb19c76ee6 100644 --- a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLitForwardPass.hlsl @@ -178,6 +178,8 @@ half4 ParticlesLitFragment(VaryingsParticle input) : SV_Target half4 color = UniversalFragmentBlinnPhong(inputData, diffuse, specularGloss, shininess, emission, alpha); color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); + return color; } diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl index d9f84e0eddd..92db9900a99 100644 --- a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl @@ -155,7 +155,9 @@ half4 fragParticleUnlit(VaryingsParticle input) : SV_Target half3 result = albedo.rgb + emission; half fogFactor = input.positionWS.w; result = MixFogColor(result, half3(0, 0, 0), fogFactor); - return half4(result, albedo.a); + alpha = OutputAlpha(alpha); + + return half4(result, alpha); } #endif // UNIVERSAL_PARTICLES_UNLIT_FORWARD_PASS_INCLUDED diff --git a/com.unity.render-pipelines.universal/Shaders/SimpleLitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/SimpleLitForwardPass.hlsl index 7c723b514a2..ee475243c6a 100644 --- a/com.unity.render-pipelines.universal/Shaders/SimpleLitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/SimpleLitForwardPass.hlsl @@ -141,6 +141,8 @@ half4 LitPassFragmentSimple(Varyings input) : SV_Target half4 color = UniversalFragmentBlinnPhong(inputData, diffuse, specular, smoothness, emission, alpha); color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); + return color; }; diff --git a/com.unity.render-pipelines.universal/Shaders/Unlit.shader b/com.unity.render-pipelines.universal/Shaders/Unlit.shader index 192ef5efbf6..3ab3ed864d4 100644 --- a/com.unity.render-pipelines.universal/Shaders/Unlit.shader +++ b/com.unity.render-pipelines.universal/Shaders/Unlit.shader @@ -101,7 +101,8 @@ Shader "Universal Render Pipeline/Unlit" #endif color = MixFog(color, input.fogCoord); - + alpha = OutputAlpha(alpha); + return half4(color, alpha); } ENDHLSL From dba157064fae82ca8d5e4e5d2b7458103aad6260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20=C3=96rn=20Unn=C3=BE=C3=B3rsson?= Date: Thu, 13 Feb 2020 12:53:10 +0100 Subject: [PATCH 02/28] Remove Preset support on Universal RenderPipeline assets (#5864) * Added a [ExcludeFromPreset] to UniversalRenderPipelineAsset as it will longer support presets * Changelog update [Skip CI] # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md # com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs --- com.unity.render-pipelines.universal/CHANGELOG.md | 1 + .../Runtime/Data/UniversalRenderPipelineAsset.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 7da4b1d7379..9023eca1651 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - The number of maximum visible lights is now set to 32 if the platform is mobile or if the graphics API is OpenGLCore, otherwise it is set to 256. +- UniversalRenderPipelineAsset no longer supports presets [case 1197020](https://issuetracker.unity3d.com/issues/urp-reset-functionality-does-not-work-on-preset-of-universalrenderpipelineassets) ### Fixed - Fixed an issue with shadows not appearing on terrains when no cascades were selected [case 1226530](https://issuetracker.unity3d.com/issues/urp-no-shadows-on-terrain-when-cascades-is-set-to-no-cascades-in-render-pipeline-asset-settings) diff --git a/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs b/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs index 9bc6e9aa16f..f20a1125189 100644 --- a/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs @@ -133,6 +133,7 @@ public enum PostProcessingFeatureSet PostProcessingV2 } + [ExcludeFromPreset] public class UniversalRenderPipelineAsset : RenderPipelineAsset, ISerializationCallbackReceiver { Shader m_DefaultShader; From b4c99b6650cf3191e124f8bd30777b851439c1c7 Mon Sep 17 00:00:00 2001 From: olko-unity-work <60658376+olko-unity-work@users.noreply.github.com> Date: Thu, 13 Feb 2020 23:14:14 +0100 Subject: [PATCH 03/28] DOC-1538 Fixed missing links and one broken link in post-processing effects list in URP docs (#5886) --- .../Documentation~/EffectList.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/com.unity.render-pipelines.universal/Documentation~/EffectList.md b/com.unity.render-pipelines.universal/Documentation~/EffectList.md index 4b0416a0b50..0a9edf35324 100644 --- a/com.unity.render-pipelines.universal/Documentation~/EffectList.md +++ b/com.unity.render-pipelines.universal/Documentation~/EffectList.md @@ -4,17 +4,17 @@ These are the post-processing effects that are available in the Universal Render -* Bloom +* [Bloom](post-processing-bloom.md) * [Channel Mixed](Post-Processing-Channel-Mixer.md) -* Chromatic Aberration +* [Chromatic Aberration](post-processing-chromatic-aberration.md) * [Color Adjustments](Post-Processing-Color-Adjustments.md) * [Color Curves](Post-Processing-Color-Curves.md) -* Depth of Field +* [Depth of Field](post-processing-depth-of-field.md) * [Film Grain](Post-Processing-Film-Grain.md) @@ -28,11 +28,11 @@ These are the post-processing effects that are available in the Universal Render * [Shadows Midtones Highlights](Post-Processing-Shadows-Midtones-Highlights.md) -* [Split Tones](Post-Processing-Split-Tones.md) +* [Split Toning](Post-Processing-Split-Toning.md) -* Tonemapping +* [Tonemapping](post-processing-tonemapping.md) -* Vignette +* [Vignette](post-processing-vignette.md) * [White Balance](Post-Processing-White-Balance.md) From 77c4fd7bfa6bbb2aae0d050f1e60cc565af4fa2a Mon Sep 17 00:00:00 2001 From: olko-unity-work <60658376+olko-unity-work@users.noreply.github.com> Date: Mon, 24 Feb 2020 13:28:01 +0100 Subject: [PATCH 04/28] DOC-1275 URP: Edited the description of Smoothness in the lit shader. (#5951) DOC-1550 Fixed two typos in SRP Core docs # Conflicts: # com.unity.render-pipelines.core/Documentation~/index.md --- .../Documentation~/index.md | 34 +++++++++++++++---- .../Documentation~/lit-shader.md | 2 +- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/com.unity.render-pipelines.core/Documentation~/index.md b/com.unity.render-pipelines.core/Documentation~/index.md index 1c0aeb9d377..438e9862be0 100644 --- a/com.unity.render-pipelines.core/Documentation~/index.md +++ b/com.unity.render-pipelines.core/Documentation~/index.md @@ -1,11 +1,33 @@ -# SRP Core - +# Scriptable Render Pipeline ![](https://blogs.unity3d.com/wp-content/uploads/2018/01/image5_rs.png) +## What is the Scriptable Render Pipeline + +The Scriptable Render Pipeline (SRP) is a feature that gives you full control over Unity's render pipeline and provides the tools you need to create modern, high-fidelity graphics in Unity. + +SRP allows you to write C# scripts to control the way Unity renders each frame. Exposing the render pipeline to you in C# makes Unity less of a “black box” when it comes to rendering. Unlike the original built-in render pipeline, SRP allows you to see and control exactly what happens during the rendering process. + +Unity provides you with two prebuilt Scriptable Render Pipelines which you can use in your Project as a base for your own custom SRP: +* The Universal Render Pipeline (URP) offers graphics that scale from mobile platforms to higher-end consoles and PCs. +* The High Definition Render Pipeline (HDRP) utilizes physically-based lighting techniques to offer high-fidelity graphics to target modern, Compute Shader compatible, platforms. + +Rather than developing your own SRP from scratch, you can use either of these prebuilt SRPs as a base to modify and adapt to your own requirements. + +## What is SRP Core + +SRP Core is a collection of API's that exposes many of the rendering internals and configuration to you. This allows you to configure exactly how you want rendering to work in your project. + +The SRP API offers a new interface to many familiar Unity constructs which include: + +- Lights +- Materials +- Cameras +- Command Buffers + +The thing that SRP changes is the *way* that you interact with Unity. For performance reasons, when you write a custom SRP, you work with groups of renderers, not individual items. + + + -The Scriptable Render Pipeline (SRP) is a Unity feature that allows you to write C# scripts to control the way Unity renders each frame. SRP Core is a package that makes it easier to create or customize an SRP. -SRP Core contains reusable code, including boilerplate code for working with platform-specific graphics APIs, utility functions for common rendering operations, and the shader libraries used in the High Definition Render Pipeline (HDRP) and Universal Render Pipeline (URP). -If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time. -For more information on SRP, including a guide to getting started with a custom SRP, see the [SRP documentation](https://docs.unity3d.com/Manual/ScriptableRenderPipeline.html). For more information on Unity's prebuilt SRPs, see the [Universal Render Pipeline (URP) documentation](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@latest), or the [High Definition Render Pipeline (HDRP) documentation](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest). \ No newline at end of file diff --git a/com.unity.render-pipelines.universal/Documentation~/lit-shader.md b/com.unity.render-pipelines.universal/Documentation~/lit-shader.md index 738b56a57c0..9acc2cf712e 100644 --- a/com.unity.render-pipelines.universal/Documentation~/lit-shader.md +++ b/com.unity.render-pipelines.universal/Documentation~/lit-shader.md @@ -47,7 +47,7 @@ The __Surface Inputs__ describe the surface itself. For example, you can use the | Property | Description | | --------------------------- | ------------------------------------------------------------ | | __Base Map__ | Adds color to the surface, also known as the diffuse map. To assign a Texture to the __Base Map__ setting, click the object picker next to it. This opens the Asset Browser, where you can select from the Textures in your Project. Alternatively, you can use the [color picker](https://docs.unity3d.com/Manual/EditingValueProperties.html). The color next to the setting shows the tint on top of your assigned Texture. To assign another tint, you can click this color swatch. If you select __Transparent__ or __Alpha Clipping__ under __Surface Options__, your Material uses the Texture’s alpha channel or color. | -| __Metallic / Specular Map__ | Shows a map input for your chosen __Workflow Mode__ in the __Surface Options__.
For the [__Metallic Map__](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterMetallic.html) workflow, the map gets the color from the __Base Map__ assigned above. Use the slider to control how metallic the surface appears. 1 is fully metallic, like silver or copper, and 0 is fully dielectric, like plastic or wood. You can generally use values in between 0 and 1 for dirty or corroded metals.
For the [__Specular Map__](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterSpecular.html) setting, you can assign a texture to it by clicking the object picker next to it. This opens the Asset Browser, where you can select from the Textures in your Project. Alternatively, you can use the [color picker](https://docs.unity3d.com/Manual/EditingValueProperties.html).
For both workflows, you can use the __Smoothness__ slider to control the spread of highlights on the surface. 0 gives a wide, rough highlight. 1 gives a small, sharp highlight like glass. Values in between produce semi-glossy looks. For example, 0.5 produces a plastic-like glossiness.
Under __Source__, you can control where to sample a smoothness map from.y default, both the metallic and specular workflow uses the Alpha channel of its map for the source. You can also set it to the Base Map Alpha channel. | +| __Metallic / Specular Map__ | Shows a map input for your chosen __Workflow Mode__ in the __Surface Options__.
For the [__Metallic Map__](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterMetallic.html) workflow, the map gets the color from the __Base Map__ assigned above. Use the slider to control how metallic the surface appears. 1 is fully metallic, like silver or copper, and 0 is fully dielectric, like plastic or wood. You can generally use values in between 0 and 1 for dirty or corroded metals.
For the [__Specular Map__](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterSpecular.html) setting, you can assign a texture to it by clicking the object picker next to it. This opens the Asset Browser, where you can select from the Textures in your Project. Alternatively, you can use the [color picker](https://docs.unity3d.com/Manual/EditingValueProperties.html).
For both workflows, you can use the __Smoothness__ slider to control the spread of highlights on the surface. 0 gives a wide, rough highlight. 1 gives a small, sharp highlight like glass. Values in between produce semi-glossy looks. For example, 0.5 produces a plastic-like glossiness.
Use the __Source__ drop-down menu to select where the shader samples a smoothness map from. Options are: __Metallic Alpha__ (alpha channel from the metallic map), and __Albedo Alpha__ (alpha channel from the base map). The default value is __Metallic Alpha__.
If the selected source has the alpha channel, the shader samples the channel and multiplies each sample by the __Smoothness__ value. | | __Normal Map__ | Adds a normal map to the surface. With a [normal map](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterNormalMap.html?), you can add surface details like bumps, scratches and grooves. To add the map, click the object picker next to it. The normal map picks up ambient lighting in the environment.
The float value next to the setting is a multiplier for the effect of the __Normal Map__. Low values decrease the effect of the normal map. High values create stronger effects. | | __Occlusion Map__ | Select an [occlusion map](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterOcclusionMap.html). This simulates shadows from ambient light and reflection, which makes lighting look more realistic as less light reaches corners and crevices of objects. To select the occlusion map, click the object picker next to it. | | __Emission__ | Makes the surface look like it emits lights. When enabled, the __Emission Map__ and __Emission Color__ settings appear.
To assign an __Emission Map__, click the object picture next to it. This opens the Asset Browser, where you can select from the textures in your Project.
For __Emission Color__, you can choose the color picker](https://docs.unity3d.com/Manual/EditingValueProperties.html) to assign a tint on top of the color. This can be more than 100% white, which is useful for effects like lava, that shines brighter than white while still being another color.
If you have not assigned an __Emission Map__, the __Emission__ setting only uses the tint you’ve assigned in __Emission Color__.
If you do not enable __Emission__, URP sets the emission to black and does not calculate emission. | From eb1fd45e03eee59ec379cfb8e61516e865fe1a4e Mon Sep 17 00:00:00 2001 From: Nzollner Date: Wed, 11 Mar 2020 15:18:15 +0100 Subject: [PATCH 05/28] Universal/bugfix/1157420 (#5972) * Fixed "SRP switching doesn't work even with manually adding ShaderVariants per scene" * Changed the changelog * Removed reimport * Tried to fix the NullReferenceExecption form ShaderPreprocessor.cs which occurred on Yamato Co-authored-by: Nzollner Co-authored-by: Felipe Lira # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md --- .../CHANGELOG.md | 2 + .../Editor/ShaderPreprocessor.cs | 71 ++++++++++++++----- 2 files changed, 57 insertions(+), 16 deletions(-) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 9023eca1651..73b1122b126 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -108,6 +108,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed incorrect light attenuation on Nintendo Switch. - Fixed XR SDK single-pass incorrectly switching to multipass issue. Add query for XR SDK single-pass availability using XR SDK renderpass descriptors. - Fixed a performance issue in Hololens when using renderer with custom render passes. +- Fixed an issue with URP switching such that every avaiable URP makes a total set of supported features such that all URPs are taken into consideration. [case 1157420](https://issuetracker.unity3d.com/issues/lwrp-srp-switching-doesnt-work-even-with-manually-adding-shadervariants-per-scene) ## [7.1.8] - 2020-01-20 @@ -188,6 +189,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue where the Bokeh Depth of Field shader would fail to compile on PS4. - Improved overall memory bandwidth usage. - Added SceneSelection pass for TerrainLit shader. +- Fixed an issue with URP switching such that every avaiable URP makes a total set of supported features such that all URPs are taken into consideration. [case 1157420](https://issuetracker.unity3d.com/issues/lwrp-srp-switching-doesnt-work-even-with-manually-adding-shadervariants-per-scene) ## [7.1.1] - 2019-09-05 ### Upgrade Guide diff --git a/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs b/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs index fd16969d971..7080d6472a3 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs @@ -2,26 +2,27 @@ using System.Collections.Generic; using UnityEditor; using UnityEditor.Build; +using UnityEditor.Build.Reporting; using UnityEngine; using UnityEngine.Rendering.Universal; using UnityEngine.Rendering; namespace UnityEditor.Rendering.Universal { + [Flags] + enum ShaderFeatures + { + MainLight = (1 << 0), + MainLightShadows = (1 << 1), + AdditionalLights = (1 << 2), + AdditionalLightShadows = (1 << 3), + VertexLighting = (1 << 4), + SoftShadows = (1 << 5), + MixedLighting = (1 << 6), + TerrainHoles = (1 << 7) + } internal class ShaderPreprocessor : IPreprocessShaders { - [Flags] - enum ShaderFeatures - { - MainLight = (1 << 0), - MainLightShadows = (1 << 1), - AdditionalLights = (1 << 2), - AdditionalLightShadows = (1 << 3), - VertexLighting = (1 << 4), - SoftShadows = (1 << 5), - MixedLighting = (1 << 6), - TerrainHoles = (1 << 7) - } ShaderKeyword m_MainLightShadows = new ShaderKeyword(ShaderKeywordStrings.MainLightShadows); ShaderKeyword m_AdditionalLightsVertex = new ShaderKeyword(ShaderKeywordStrings.AdditionalLightsVertex); @@ -210,13 +211,11 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippetData, IList< if (urpAsset == null || compilerDataList == null || compilerDataList.Count == 0) return; - ShaderFeatures features = GetSupportedShaderFeatures(urpAsset); - int prevVariantCount = compilerDataList.Count; for (int i = 0; i < compilerDataList.Count; ++i) { - if (StripUnused(features, shader, snippetData, compilerDataList[i])) + if (StripUnused(ShaderBuildPreprocessor.supportedFeatures, shader, snippetData, compilerDataList[i])) { compilerDataList.RemoveAt(i); --i; @@ -231,7 +230,47 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippetData, IList< } } - ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipelineAsset pipelineAsset) + + } + class ShaderBuildPreprocessor : IPreprocessBuildWithReport + { + public static ShaderFeatures supportedFeatures + { + get { + if (_supportedFeatures <= 0) + { + FetchAllSupportedFeatures(); + } + return _supportedFeatures; + } + } + + private static ShaderFeatures _supportedFeatures = 0; + public int callbackOrder { get { return 0; } } + + public void OnPreprocessBuild(BuildReport report) + { + FetchAllSupportedFeatures(); + } + + private static void FetchAllSupportedFeatures() + { + List urps = new List(); + urps.Add(GraphicsSettings.defaultRenderPipeline as UniversalRenderPipelineAsset); + for(int i = 0; i < QualitySettings.names.Length; i++) + { + urps.Add(QualitySettings.GetRenderPipelineAssetAt(i) as UniversalRenderPipelineAsset); + } + foreach (UniversalRenderPipelineAsset urp in urps) + { + if (urp != null) + { + _supportedFeatures |= GetSupportedShaderFeatures(urp); + } + } + } + + private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipelineAsset pipelineAsset) { ShaderFeatures shaderFeatures; shaderFeatures = ShaderFeatures.MainLight; From 9610d3e809404d628789e3ad728ea90738a56fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20=C3=96rn=20Unn=C3=BE=C3=B3rsson?= Date: Wed, 4 Mar 2020 12:42:13 +0100 Subject: [PATCH 06/28] Fixing an issue with the allowed amount of additional lights & OpenGLCore (#6062) # Conflicts: # com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs --- .../Runtime/UniversalRenderPipeline.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs index 6c2da3ab223..5fb34c64258 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs @@ -82,8 +82,8 @@ public static int maxVisibleAdditionalLights { get { - return (Application.isMobilePlatform || SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLCore) - ? k_MaxVisibleAdditionalLightsMobile : k_MaxVisibleAdditionalLightsNonMobile; + return (Application.isMobilePlatform || SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLCore) + ? k_MaxVisibleAdditionalLightsMobile : k_MaxVisibleAdditionalLightsNonMobile; } } From 56bd025c6836a4f5dffbec26293a7e348d88a440 Mon Sep 17 00:00:00 2001 From: Andre McGrail Date: Fri, 3 Apr 2020 10:54:47 +0200 Subject: [PATCH 07/28] Fix changelog merges --- com.unity.render-pipelines.universal/CHANGELOG.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 73b1122b126..e519e172561 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed issue that caused the QualitySettings anti-aliasing changing without user interaction. [case 1195272](https://issuetracker.unity3d.com/issues/lwrp-the-anti-alias-quality-settings-value-is-changing-without-user-interaction) - Fixed a shader issue that caused the Color in Sprite Shape to work improperly. - Fixed shader compilation errors when using multiple lights in DX10 level GPU. [case 1222302](https://issuetracker.unity3d.com/issues/urp-no-materials-apart-from-ui-are-rendered-when-using-direct3d11-graphics-api-on-a-dx10-gpu) +- Fixed an issue where opaque objects were outputting incorrect alpha values [case 1168283](https://issuetracker.unity3d.com/issues/lwrp-alpha-clipping-material-makes-other-materials-look-like-alpha-clipping-when-gameobject-is-shown-in-render-texture) +- Fixed an issue with URP switching such that every avaiable URP makes a total set of supported features such that all URPs are taken into consideration. [case 1157420](https://issuetracker.unity3d.com/issues/lwrp-srp-switching-doesnt-work-even-with-manually-adding-shadervariants-per-scene) ## [7.3.0] - 2020-03-11 @@ -108,8 +110,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed incorrect light attenuation on Nintendo Switch. - Fixed XR SDK single-pass incorrectly switching to multipass issue. Add query for XR SDK single-pass availability using XR SDK renderpass descriptors. - Fixed a performance issue in Hololens when using renderer with custom render passes. -- Fixed an issue with URP switching such that every avaiable URP makes a total set of supported features such that all URPs are taken into consideration. [case 1157420](https://issuetracker.unity3d.com/issues/lwrp-srp-switching-doesnt-work-even-with-manually-adding-shadervariants-per-scene) - +- ## [7.1.8] - 2020-01-20 ### Fixed @@ -176,7 +177,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue where Prefab previews were incorrectly lit when you used the 2D Renderer. - Fixed an issue where the Light didn't update correctly when you deleted a Sprite that a Sprite 2D Light uses. - Fixed an issue where Cinemachine v2.4 couldn't be used together with Universal RP due to a circular dependency between the two packages. -- Fixed an issue where opaque objects were outputting incorrect alpha values [case 1168283](https://issuetracker.unity3d.com/issues/lwrp-alpha-clipping-material-makes-other-materials-look-like-alpha-clipping-when-gameobject-is-shown-in-render-texture) ## [7.1.2] - 2019-09-19 ### Added @@ -189,7 +189,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue where the Bokeh Depth of Field shader would fail to compile on PS4. - Improved overall memory bandwidth usage. - Added SceneSelection pass for TerrainLit shader. -- Fixed an issue with URP switching such that every avaiable URP makes a total set of supported features such that all URPs are taken into consideration. [case 1157420](https://issuetracker.unity3d.com/issues/lwrp-srp-switching-doesnt-work-even-with-manually-adding-shadervariants-per-scene) ## [7.1.1] - 2019-09-05 ### Upgrade Guide From bea0b9a70e38038f133c550b059d26ca89692aed Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Tue, 24 Mar 2020 08:22:58 +0100 Subject: [PATCH 08/28] Universal Bugfixes (#6109) * Fixed shader pass name issue (case 1201696) * Fixed typo in encodedIrradiance. * Fixed viewport rect not working with render textures. * Added changelog * Enabled Allocations tests when rendering. * Forward Renderer is not sealed anymore. Now developers can subclass it. * Added Test Scene * Excluded post-processing tests from build. * Enabled playmode tests for all assemblies * Removed unnecessary new shader. UnlitTexture is used instead. * Updated reference images. * Updated scene to fix tests. # Conflicts: # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png.meta # TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset # com.unity.render-pipelines.universal/CHANGELOG.md --- .../OpenGLES3/127_ClearRenderTexture.png | 3 + .../OpenGLES3/127_ClearRenderTexture.png.meta | 93 +++ .../Linear/Android/OpenGLES3/None.meta | 8 + .../Vulkan/None/127_ClearRenderTexture.png | 3 + .../None/127_ClearRenderTexture.png.meta | 93 +++ .../Linear/LinuxEditor/OpenGLCore/None.meta | 8 + .../None/127_ClearRenderTexture.png | 3 + .../None/127_ClearRenderTexture.png.meta | 93 +++ .../Linear/LinuxEditor/Vulkan/None.meta | 8 + .../Vulkan/None/127_ClearRenderTexture.png | 3 + .../None/127_ClearRenderTexture.png.meta | 93 +++ .../Metal/127_ClearRenderTexture.png | 3 + .../Metal/127_ClearRenderTexture.png.meta | 93 +++ .../Linear/OSXEditor/Metal/None.meta | 8 + .../OpenGLCore/127_ClearRenderTexture.png | 3 + .../127_ClearRenderTexture.png.meta | 93 +++ .../Linear/OSXEditor/OpenGLCore/None.meta | 8 + .../Metal/127_ClearRenderTexture.png | 3 + .../Metal/127_ClearRenderTexture.png.meta | 93 +++ .../Linear/OSXPlayer/Metal/None.meta | 8 + .../OpenGLCore/127_ClearRenderTexture.png | 3 + .../127_ClearRenderTexture.png.meta | 93 +++ .../Linear/OSXPlayer/OpenGLCore/None.meta | 8 + .../Direct3D11/127_ClearRenderTexture.png | 3 + .../127_ClearRenderTexture.png.meta | 93 +++ .../Linear/WindowsEditor/Direct3D11/None.meta | 8 + .../Linear/WindowsEditor/Vulkan/None.meta | 8 + .../Vulkan/None/127_ClearRenderTexture.png | 3 + .../None/127_ClearRenderTexture.png.meta | 93 +++ .../Direct3D11/127_ClearRenderTexture.png | 3 + .../127_ClearRenderTexture.png.meta | 93 +++ .../Linear/WindowsPlayer/Direct3D11/None.meta | 8 + .../Vulkan/127_ClearRenderTexture.png | 3 + .../Vulkan/127_ClearRenderTexture.png.meta | 93 +++ .../Linear/WindowsPlayer/Vulkan/None.meta | 8 + .../Assets/Scenes/127_ClearRenderTexture.meta | 8 + .../Scenes/127_ClearRenderTexture.unity | 569 ++++++++++++++++++ .../Scenes/127_ClearRenderTexture.unity.meta | 7 + .../127_ClearRenderTexture/RTT.renderTexture | 37 ++ .../RTT.renderTexture.meta | 8 + .../Scenes/127_ClearRenderTexture/Unlit.mat | 90 +++ .../127_ClearRenderTexture/Unlit.mat.meta | 8 + .../127_ClearRenderTextureSettings.lighting | 63 ++ ...7_ClearRenderTextureSettings.lighting.meta | 8 + .../Test/Runtime/UniversalGraphicsTests.cs | 31 +- .../ProjectSettings/EditorBuildSettings.asset | 6 + .../ProjectSettings/ProjectSettings.asset | 60 +- .../CHANGELOG.md | 4 + .../RenderObjectsPassFeatureEditor.cs | 9 +- .../Runtime/ForwardRenderer.cs | 5 +- .../ShaderLibrary/Lighting.hlsl | 2 +- 51 files changed, 2124 insertions(+), 31 deletions(-) create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.unity create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.unity.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/Unlit.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/Unlit.mat.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..8bff46f24ab --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 6843abefc4b734db2a73a875c9cede0a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None.meta new file mode 100644 index 00000000000..6f8dd26014f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b3e89a1e879ab4beb9f4f1fd490635ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..cb5bae25b8c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 893502eb5c8174218aee64a072c1700e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None.meta new file mode 100644 index 00000000000..bec76c32610 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bc7114fb34674503994f9c8a416c95e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..b229412e443 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 4e4c51cf7e96843de8df190069a15e19 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta new file mode 100644 index 00000000000..aead0b03267 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d969a8b88ba84ba7a4ab7ca4eda07f1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..4105ebb03f2 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: d25ac8bbf3506435ca094303d2e903f4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..bfde34b8f92 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 12d1fa1abd5e34d558ed53dd5459688c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta new file mode 100644 index 00000000000..15d4cdb6a98 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb81349f7b1d947859ba6dd4fe497e05 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..45593aecd79 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: f5c2ace0a056e4ae08d30959ab053ae9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None.meta new file mode 100644 index 00000000000..256ea5a0cb8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d593dc2dd023c4d3cbff8727a714a225 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..aa2d9b30cb2 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 0abfd71904ba14a09bdc46f764b65178 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta new file mode 100644 index 00000000000..9f34c6e4c4b --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad4a2388aaaf14eb4b72558c59efe7dc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..06eafdeff9d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 728bc6ad9c1f74bceb2938e939f66b30 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None.meta new file mode 100644 index 00000000000..97388d9da6e --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 980fe77177eec44419806e63086d1a94 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..102750c90fa --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 8b593cd34cd274831b7533b24d151bab +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta new file mode 100644 index 00000000000..e6927b4d85f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6947eb8000a0541978bf00a58117c292 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta new file mode 100644 index 00000000000..e6ed6358e54 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 416d67a5eb69248a9981112e744ddca5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..0466f64ec3e --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 99ff4abe0de5547a292066a90dc1c9dd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..d17b30bb3d3 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 230054c7a409e4f0c9cfec069e37729b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta new file mode 100644 index 00000000000..7ff40595c44 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 876e8222af634487ba654379998993a2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..83c8f550a4c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 6d62d4863f98347eba85a86f42f4df0f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta new file mode 100644 index 00000000000..f408794b9d7 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3514e01e4d44044e1bb178b3e89ea6b8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.meta new file mode 100644 index 00000000000..32541a26d1a --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a42414b1e744254ca0ffb961b3aa483 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.unity new file mode 100644 index 00000000000..3d22c3c0dcb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.unity @@ -0,0 +1,569 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 4890085278179872738, guid: 286db413b8f862a4596678a63e43e1ea, + type: 2} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &66220547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 66220551} + - component: {fileID: 66220550} + - component: {fileID: 66220548} + m_Layer: 0 + m_Name: Camera_B + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &66220548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66220547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!20 &66220550 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66220547} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 1, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0.5 + y: 0 + width: 0.5 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 39 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: b5fedf867466f754eaa6898d3fea1f05, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &66220551 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66220547} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &346850592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 346850596} + - component: {fileID: 346850595} + - component: {fileID: 346850593} + m_Layer: 0 + m_Name: Camera_A + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &346850593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 346850592} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!20 &346850595 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 346850592} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 1, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0.5 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 39 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: b5fedf867466f754eaa6898d3fea1f05, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &346850596 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 346850592} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &617885103 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 617885107} + - component: {fileID: 617885106} + - component: {fileID: 617885105} + - component: {fileID: 617885104} + - component: {fileID: 617885108} + m_Layer: 0 + m_Name: Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &617885104 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617885103} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &617885105 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617885103} + m_Enabled: 1 +--- !u!20 &617885106 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617885103} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 0.5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &617885107 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617885103} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &617885108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617885103} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} + m_Name: + m_EditorClassIdentifier: + ImageComparisonSettings: + TargetWidth: 640 + TargetHeight: 480 + PerPixelCorrectnessThreshold: 0.001 + AverageCorrectnessThreshold: 0.005 + UseHDR: 0 + WaitFrames: 0 +--- !u!1 &906174404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 906174408} + - component: {fileID: 906174407} + - component: {fileID: 906174406} + - component: {fileID: 906174405} + m_Layer: 5 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &906174405 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 906174404} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &906174406 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 906174404} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0013ae710f57b9e4dbaf7e1d681f6178, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &906174407 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 906174404} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &906174408 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 906174404} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.unity.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.unity.meta new file mode 100644 index 00000000000..f0205bcc2f6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ecb4f57b7a1788b4b85f618d4cbc6677 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture new file mode 100644 index 00000000000..a89f07a2e17 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RTT + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 1024 + m_Height: 1024 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture.meta new file mode 100644 index 00000000000..dbddb1198a7 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5fedf867466f754eaa6898d3fea1f05 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/Unlit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/Unlit.mat new file mode 100644 index 00000000000..eb6e280b358 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/Unlit.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6670627461178166269 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Unlit + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 8400000, guid: b5fedf867466f754eaa6898d3fea1f05, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/Unlit.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/Unlit.mat.meta new file mode 100644 index 00000000000..999c1250eaa --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/Unlit.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0013ae710f57b9e4dbaf7e1d681f6178 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting new file mode 100644 index 00000000000..a882e00357f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 127_ClearRenderTextureSettings + serializedVersion: 2 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRRussianRouletteStartBounce: 2 + m_PVREnvironmentMIS: 1 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting.meta new file mode 100644 index 00000000000..4df36150178 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 286db413b8f862a4596678a63e43e1ea +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTests.cs b/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTests.cs index 73b625ca200..3a0e6dd4ac2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTests.cs +++ b/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTests.cs @@ -6,6 +6,8 @@ using UnityEngine.XR; using UnityEngine.TestTools.Graphics; using UnityEngine.SceneManagement; +using UnityEngine.Rendering.Universal; +using UnityEngine.Experimental.Rendering.Universal; public class UniversalGraphicsTests { @@ -63,22 +65,29 @@ public IEnumerator Run(GraphicsTestCase testCase) ImageAssert.AreEqual(testCase.ReferenceImage, cameras.Where(x => x != null), settings.ImageComparisonSettings); -#if CHECK_ALLOCATIONS_WHEN_RENDERING // 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) + + // 2D Renderer is currently allocating memory, skip it as it will always fail GC alloc tests. + var additionalCameraData = mainCamera.GetUniversalAdditionalCameraData(); + bool is2DRenderer = additionalCameraData.scriptableRenderer is Renderer2D; + + // Post-processing is allocating memory. Case https://fogbugz.unity3d.com/f/cases/1227490/ + bool isPostProcessingEnabled = additionalCameraData.renderPostProcessing; + if (!is2DRenderer && !isPostProcessingEnabled) { - allocatesMemory = true; + try + { + ImageAssert.AllocatesMemory(mainCamera, settings?.ImageComparisonSettings); + } + catch (AssertionException) + { + allocatesMemory = true; + } + if (allocatesMemory) + Assert.Fail("Allocated memory when rendering what is on main camera"); } - if (allocatesMemory) - Assert.Fail("Allocated memory when rendering what is on main camera"); -#endif - } #if UNITY_EDITOR diff --git a/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset b/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset index 21cb2849aeb..959cf9a4727 100644 --- a/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset @@ -242,4 +242,10 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/109_URPShadersAlphaOutput.unity guid: 0a89803a0d2352245a452c202f9a67d1 + - enabled: 1 + path: Assets/Scenes/126_SampleDepth.unity + guid: d66b74ae4e7264d62bdb2c4f56261030 + - enabled: 1 + path: Assets/Scenes/127_ClearRenderTexture.unity + guid: ecb4f57b7a1788b4b85f618d4cbc6677 m_configObjects: {} diff --git a/TestProjects/UniversalGraphicsTest/ProjectSettings/ProjectSettings.asset b/TestProjects/UniversalGraphicsTest/ProjectSettings/ProjectSettings.asset index 597799c6494..e5a612bd91d 100644 --- a/TestProjects/UniversalGraphicsTest/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/UniversalGraphicsTest/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 18 + serializedVersion: 20 productGUID: 3d55fb3b8c70e604a84c55c7cb6a259b AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,10 +49,12 @@ PlayerSettings: m_StereoRenderingPath: 1 m_ActiveColorSpace: 1 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 + iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -84,7 +86,6 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 - graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -92,7 +93,6 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - graphicsJobMode: 0 fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -105,6 +105,7 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 switchQueueControlMemory: 16384 @@ -112,6 +113,7 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: 4:3: 1 @@ -150,9 +152,10 @@ PlayerSettings: sharedDepthBuffer: 0 dashSupport: 0 lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 - protectGraphicsMemory: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 D3DHDRBitDepth: 0 @@ -179,10 +182,10 @@ PlayerSettings: StripUnusedMeshComponents: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 + iOSTargetOSVersionString: 11.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 + tvOSTargetOSVersionString: 11.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -275,6 +278,38 @@ PlayerSettings: m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: MacStandaloneSupport m_APIs: 1000000011000000 @@ -290,7 +325,6 @@ PlayerSettings: openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 - vuforiaEnabled: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -298,7 +332,7 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] - playModeTestRunnerEnabled: 0 + playModeTestRunnerEnabled: 1 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 @@ -307,12 +341,14 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -406,6 +442,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -505,6 +542,7 @@ PlayerSettings: ps4contentSearchFeaturesUsed: 0 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} @@ -521,9 +559,10 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 0 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: 1: LWRP_DEBUG_STATIC_POSTFX 4: LWRP_DEBUG_STATIC_POSTFX @@ -629,3 +668,4 @@ PlayerSettings: enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 1 + virtualTexturingSupportEnabled: 0 diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index e519e172561..373187ee72b 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - The number of maximum visible lights is now set to 32 if the platform is mobile or if the graphics API is OpenGLCore, otherwise it is set to 256. - UniversalRenderPipelineAsset no longer supports presets [case 1197020](https://issuetracker.unity3d.com/issues/urp-reset-functionality-does-not-work-on-preset-of-universalrenderpipelineassets) +- You can now subclass ForwardRenderer to create a custom renderer based on it. ### Fixed - Fixed an issue with shadows not appearing on terrains when no cascades were selected [case 1226530](https://issuetracker.unity3d.com/issues/urp-no-shadows-on-terrain-when-cascades-is-set-to-no-cascades-in-render-pipeline-asset-settings) @@ -20,6 +21,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed shader compilation errors when using multiple lights in DX10 level GPU. [case 1222302](https://issuetracker.unity3d.com/issues/urp-no-materials-apart-from-ui-are-rendered-when-using-direct3d11-graphics-api-on-a-dx10-gpu) - Fixed an issue where opaque objects were outputting incorrect alpha values [case 1168283](https://issuetracker.unity3d.com/issues/lwrp-alpha-clipping-material-makes-other-materials-look-like-alpha-clipping-when-gameobject-is-shown-in-render-texture) - Fixed an issue with URP switching such that every avaiable URP makes a total set of supported features such that all URPs are taken into consideration. [case 1157420](https://issuetracker.unity3d.com/issues/lwrp-srp-switching-doesnt-work-even-with-manually-adding-shadervariants-per-scene) +- Fixed an issue that causes viewport to not work correctly when rendering to textures. [case 1225103](https://issuetracker.unity3d.com/issues/urp-the-viewport-rect-isnt-correctly-applied-when-the-camera-is-outputting-into-a-rendertexture) +- Fixed an issue that caused incorrect sampling of HDR reflection probe textures. +- Fixed UI text of RenderObjects feature to display LightMode tag instead of Shader Pass Name. [case 1201696](https://issuetracker.unity3d.com/issues/render-feature-slash-pass-ui-has-a-field-for-shader-pass-name-when-it-actually-expects-shader-pass-lightmode) ## [7.3.0] - 2020-03-11 diff --git a/com.unity.render-pipelines.universal/Editor/RendererFeatures/RenderObjectsPassFeatureEditor.cs b/com.unity.render-pipelines.universal/Editor/RendererFeatures/RenderObjectsPassFeatureEditor.cs index 33ab2cb838f..7650c85487d 100644 --- a/com.unity.render-pipelines.universal/Editor/RendererFeatures/RenderObjectsPassFeatureEditor.cs +++ b/com.unity.render-pipelines.universal/Editor/RendererFeatures/RenderObjectsPassFeatureEditor.cs @@ -21,7 +21,7 @@ internal class Styles //Filters public static GUIContent renderQueueFilter = new GUIContent("Queue", "Only render objects in the selected render queue range."); public static GUIContent layerMask = new GUIContent("Layer Mask", "Only render objects in a layer that match the given layer mask."); - public static GUIContent shaderPassFilter = new GUIContent("Shader Passes", "Controls which shader passes to use when rendering objects. The name given here must match the LightMode tag in a shader pass."); + public static GUIContent shaderPassFilter = new GUIContent("LightMode Tags", "Controls which shader passes to render by filtering by LightMode tag."); //Render Options public static GUIContent overrideMaterial = new GUIContent("Material", "Choose an override material, every renderer will be rendered with this material."); @@ -33,7 +33,7 @@ internal class Styles public static GUIContent depthState = new GUIContent("Depth Test", "Choose a new depth test function."); //Camera Settings - public static GUIContent overrideCamera = new GUIContent("Camera", "Override camera matrices."); + public static GUIContent overrideCamera = new GUIContent("Camera", "Override camera matrices. Toggling this setting will make camera use perspective projection."); public static GUIContent cameraFOV = new GUIContent("Field Of View", "The camera's view angle measured in degrees along vertical axis."); public static GUIContent positionOffset = new GUIContent("Position Offset", "Position offset to apply to the original camera's position."); public static GUIContent restoreCamera = new GUIContent("Restore", "Restore to the original camera matrices after the execution of the render passes added by this feature."); @@ -123,10 +123,7 @@ private void CreateShaderPassList() { var element = m_ShaderPassesList.serializedProperty.GetArrayElementAtIndex(index); var propRect = new Rect(rect.x, rect.y, rect.width, EditorGUIUtility.singleLineHeight); - var labelWidth = EditorGUIUtility.labelWidth; - EditorGUIUtility.labelWidth = 50; - element.stringValue = EditorGUI.TextField(propRect, "Name", element.stringValue); - EditorGUIUtility.labelWidth = labelWidth; + element.stringValue = EditorGUI.TextField(propRect, "", element.stringValue); }; m_ShaderPassesList.drawHeaderCallback = (Rect testHeaderRect) => diff --git a/com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs b/com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs index 9330b3a79dc..6a4584ba4e7 100644 --- a/com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs +++ b/com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs @@ -541,13 +541,12 @@ bool RequiresIntermediateColorTexture(ref RenderingData renderingData, RenderTex isCompatibleBackbufferTextureDimension = UnityEngine.XR.XRSettings.deviceEyeTextureDimension == baseDescriptor.dimension; #endif - bool requiresBlitForOffscreenCamera = cameraData.postProcessEnabled || cameraData.requiresOpaqueTexture || requiresExplicitMsaaResolve; + bool requiresBlitForOffscreenCamera = cameraData.postProcessEnabled || cameraData.requiresOpaqueTexture || requiresExplicitMsaaResolve || !cameraData.isDefaultViewport; if (isOffscreenRender) return requiresBlitForOffscreenCamera; return requiresBlitForOffscreenCamera || cameraData.isSceneViewCamera || isScaledRender || cameraData.isHdrEnabled || - !isCompatibleBackbufferTextureDimension || !cameraData.isDefaultViewport || isCapturing || - (Display.main.requiresBlitToBackbuffer && !isStereoEnabled); + !isCompatibleBackbufferTextureDimension || isCapturing || (Display.main.requiresBlitToBackbuffer && !isStereoEnabled); } bool CanCopyDepth(ref CameraData cameraData) diff --git a/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl b/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl index c5710feec4b..0d7b0458a32 100644 --- a/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl +++ b/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl @@ -458,7 +458,7 @@ half3 GlossyEnvironmentReflection(half3 reflectVector, half perceptualRoughness, #if !defined(UNITY_USE_NATIVE_HDR) half3 irradiance = DecodeHDREnvironment(encodedIrradiance, unity_SpecCube0_HDR); #else - half3 irradiance = encodedIrradiance.rbg; + half3 irradiance = encodedIrradiance.rgb; #endif return irradiance * occlusion; From c1f874acc0c40e53e342b3f892dfb3d25ed40aed Mon Sep 17 00:00:00 2001 From: Oleksandr Kokoshyn Date: Tue, 24 Mar 2020 08:22:38 +0100 Subject: [PATCH 09/28] Requirements section for URP (#6150) * Requirements section draft for URP * Removed the note "Projects made using URP are not compatible..." from index.md since this note is on the Requirements page now. * Generic Requirements page draft. * Added the compatibility table. * Replaced "+" with "Yes", minor changes to formatting. * Minor edit. * Changed the table format. * Made the values in the Maximum column more generic. * Minor edit. * Fixed a typo (https://fogbugz.unity3d.com/f/cases/1229007/). * Removed "latest" and "final version" from descriptions to avoid ambiguity. Updated the table with the latest info from Felipe. * Removed the word "Planned:". --- .../Documentation~/InstallURPIntoAProject.md | 2 +- .../Documentation~/TableOfContents.md | 3 ++- .../Documentation~/index.md | 14 +++-------- .../Documentation~/requirements.md | 23 +++++++++++++++++++ 4 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 com.unity.render-pipelines.universal/Documentation~/requirements.md diff --git a/com.unity.render-pipelines.universal/Documentation~/InstallURPIntoAProject.md b/com.unity.render-pipelines.universal/Documentation~/InstallURPIntoAProject.md index ecb2ae970e5..e2f1f90175d 100644 --- a/com.unity.render-pipelines.universal/Documentation~/InstallURPIntoAProject.md +++ b/com.unity.render-pipelines.universal/Documentation~/InstallURPIntoAProject.md @@ -16,7 +16,7 @@ URP's integrated post-processing solution does not currently support custom post 2. In the top navigation bar, select __Window > Package Manager__ to open the __Package Manager__ window. 3. Select the __All__ tab. This tab displays the list of available packages for the version of Unity that you are currently running. 4. Select **Universal RP** from the list of packages. -5. In the botoom right corner of the Package Manager window, select __Install__. Unity installs URP directly into your Project. +5. In the bottom right corner of the Package Manager window, select __Install__. Unity installs URP directly into your Project. ## Configuring URP diff --git a/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md b/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md index 78440022543..d57af32749d 100644 --- a/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md +++ b/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md @@ -1,4 +1,5 @@ * [Universal Render Pipeline](index.md) +* [Requirements](requirements) * [Features]() * [Feature Comparison with the Built-in Render Pipeline](universalrp-builtin-feature-comparison.md) * [Getting started](InstallingAndConfiguringURP.md) @@ -78,4 +79,4 @@ * [Frequently asked questions (FAQ)](faq.md) -* [Feature comparison with the Built-in Render Pipeline](universalrp-builtin-feature-comparison.md) \ No newline at end of file +* [Feature comparison with the Built-in Render Pipeline](universalrp-builtin-feature-comparison.md) diff --git a/com.unity.render-pipelines.universal/Documentation~/index.md b/com.unity.render-pipelines.universal/Documentation~/index.md index f5a9571f0d7..56e7319050e 100644 --- a/com.unity.render-pipelines.universal/Documentation~/index.md +++ b/com.unity.render-pipelines.universal/Documentation~/index.md @@ -4,17 +4,9 @@ The Universal Render Pipeline (URP) is a prebuilt Scriptable Render Pipeline, made by Unity. URP provides artist-friendly workflows that let you quickly and easily create optimized graphics across a range of platforms, from mobile to high-end consoles and PCs. -URP is supported on the following platforms: -* Windows and UWP -* Mac and iOS -* Android -* XBox One -* PlayStation4 -* Nintendo Switch -* WebGL -* All current VR platforms +## Requirements -**Note:** Projects made using URP are not compatible with the High Definition Render Pipeline (HDRP) or the Built-in Render Pipeline. Before you start development, you must decide which render pipeline to use in your Project. For information on choosing a render pipeline, see [the Render Pipelines section of the Unity Manual](https://docs.unity3d.com/2019.3/Documentation/Manual/render-pipelines.html). +For information about requirements and compatibility, see section [Requirements](requirements.md). ## What's new in URP For information on what's new in the latest version of URP, see the [Changelog](../changelog/CHANGELOG.html). @@ -23,4 +15,4 @@ For information on what's new in the latest version of URP, see the [Changelog]( For information on starting a new URP Project from scratch, or about installing URP in an existing Unity Project, see [Getting started](InstallingAndConfiguringURP.md). ## Upgrading -For information on upgrading from a previous version of URP to the current version, or for information about upgrading from the Lightweight Render Pipeline (LWRP) to URP, see [Upgrade guides](upgrade-guides.md). \ No newline at end of file +For information on upgrading from a previous version of URP to the current version, or for information about upgrading from the Lightweight Render Pipeline (LWRP) to URP, see [Upgrade guides](upgrade-guides.md). diff --git a/com.unity.render-pipelines.universal/Documentation~/requirements.md b/com.unity.render-pipelines.universal/Documentation~/requirements.md new file mode 100644 index 00000000000..867c9f725c2 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/requirements.md @@ -0,0 +1,23 @@ +# Requirements and compatibility + +This page contains information on system requirements and compatibility of this package. + +## Unity Editor compatibility + +The following table shows the compatibility of URP package versions with different Unity Editor versions. + +| Package version | Minimum Unity version | Maximum Unity version | +|-----------------|-----------------------|-----------------------| +| 9.x.x | 2020.1.0a23 | 2020.2.x | +| 8.x.x | 2020.1.0a23 | 2020.1.x | +| 7.3.x | 2019.3.2f1 | 2019.4.x | +| 7.2.x | 2019.3.0f6 | 2019.4.x | +| 7.1.8 | 2019.3.0f3 | 2019.4.x | + +## Render pipeline compatibility + +Projects made using URP are not compatible with the High Definition Render Pipeline (HDRP) or the Built-in Render Pipeline. Before you start development, you must decide which render pipeline to use in your Project. For information on choosing a render pipeline, see the [Render Pipelines](https://docs.unity3d.com/2019.3/Documentation/Manual/render-pipelines.html) section of the Unity Manual. + +## Unity Player system requirements + +This package does not add any extra platform-specific requirements. General system requirements for the Unity Player apply. For more information on Unity system requirements, see [System requirements for Unity](https://docs.unity3d.com/Manual/system-requirements.html). From 1d781f99039820934d4e0ea21c4c438529b88382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20Zigmantavi=C4=8Dius?= <30701728+tomzig16@users.noreply.github.com> Date: Tue, 31 Mar 2020 16:40:21 +0300 Subject: [PATCH 10/28] Fix for blank screen on Android 8+ when Depth Texture is enabled (#6171) * Fix blank screen with Depth texture on Android * Add an entry to the CHANGELOG.md * Check if color texture is needed after checking for depth Co-authored-by: Felipe Lira # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md --- com.unity.render-pipelines.universal/CHANGELOG.md | 1 + .../Runtime/ForwardRenderer.cs | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 373187ee72b..46214d5f3ad 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue that causes viewport to not work correctly when rendering to textures. [case 1225103](https://issuetracker.unity3d.com/issues/urp-the-viewport-rect-isnt-correctly-applied-when-the-camera-is-outputting-into-a-rendertexture) - Fixed an issue that caused incorrect sampling of HDR reflection probe textures. - Fixed UI text of RenderObjects feature to display LightMode tag instead of Shader Pass Name. [case 1201696](https://issuetracker.unity3d.com/issues/render-feature-slash-pass-ui-has-a-field-for-shader-pass-name-when-it-actually-expects-shader-pass-lightmode) +- Fixed an issue that caused Android GLES to render blank screen when Depth texture was enabled without Opaque texture [case 1219325](https://issuetracker.unity3d.com/issues/scene-is-not-rendered-on-android-8-and-9-when-depth-texture-is-enabled-in-urp-asset) ## [7.3.0] - 2020-03-11 diff --git a/com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs b/com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs index 6a4584ba4e7..7ef675d35e7 100644 --- a/com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs +++ b/com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs @@ -198,6 +198,15 @@ public override void Setup(ScriptableRenderContext context, ref RenderingData re bool createDepthTexture = cameraData.requiresDepthTexture && !requiresDepthPrepass; createDepthTexture |= (renderingData.cameraData.renderType == CameraRenderType.Base && !renderingData.resolveFinalTarget); +#if UNITY_ANDROID + if (SystemInfo.graphicsDeviceType != GraphicsDeviceType.Vulkan) + { + // GLES can not use render texture's depth buffer with the color buffer of the backbuffer + // in such case we create a color texture for it too. + createColorTexture |= createDepthTexture; + } +#endif + // Configure all settings require to start a new camera stack (base camera only) if (cameraData.renderType == CameraRenderType.Base) { From 9f59027f33d1a4a995a6dac160d6dd60163ba1bd Mon Sep 17 00:00:00 2001 From: Andre McGrail Date: Fri, 20 Mar 2020 10:24:25 +0100 Subject: [PATCH 11/28] [Bugfix]1069375 metallic gamma tag (#6194) * Removed Gamma tag on metallic value * Updated changelog, fixed spelling in previous changelog entry Co-authored-by: Felipe Lira # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md # com.unity.render-pipelines.universal/Shaders/Lit.shader --- com.unity.render-pipelines.universal/CHANGELOG.md | 2 ++ com.unity.render-pipelines.universal/Shaders/Lit.shader | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 46214d5f3ad..1b4feaa9a93 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - The number of maximum visible lights is now set to 32 if the platform is mobile or if the graphics API is OpenGLCore, otherwise it is set to 256. - UniversalRenderPipelineAsset no longer supports presets [case 1197020](https://issuetracker.unity3d.com/issues/urp-reset-functionality-does-not-work-on-preset-of-universalrenderpipelineassets) - You can now subclass ForwardRenderer to create a custom renderer based on it. +- The Metallic property value of a Material is now linear, which is the correct behavior for the PBR approach. In the previous URP package version, those values were interpreted as gamma values. This change might affect the look of Materials that use this property after upgrading from the previous package version. ### Fixed - Fixed an issue with shadows not appearing on terrains when no cascades were selected [case 1226530](https://issuetracker.unity3d.com/issues/urp-no-shadows-on-terrain-when-cascades-is-set-to-no-cascades-in-render-pipeline-asset-settings) @@ -25,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue that caused incorrect sampling of HDR reflection probe textures. - Fixed UI text of RenderObjects feature to display LightMode tag instead of Shader Pass Name. [case 1201696](https://issuetracker.unity3d.com/issues/render-feature-slash-pass-ui-has-a-field-for-shader-pass-name-when-it-actually-expects-shader-pass-lightmode) - Fixed an issue that caused Android GLES to render blank screen when Depth texture was enabled without Opaque texture [case 1219325](https://issuetracker.unity3d.com/issues/scene-is-not-rendered-on-android-8-and-9-when-depth-texture-is-enabled-in-urp-asset) +- Metallic slider on the Lit shader is now linear meaning correct values are used for PBR. ## [7.3.0] - 2020-03-11 diff --git a/com.unity.render-pipelines.universal/Shaders/Lit.shader b/com.unity.render-pipelines.universal/Shaders/Lit.shader index f9ea307871a..403f7837d54 100644 --- a/com.unity.render-pipelines.universal/Shaders/Lit.shader +++ b/com.unity.render-pipelines.universal/Shaders/Lit.shader @@ -14,7 +14,7 @@ Shader "Universal Render Pipeline/Lit" _GlossMapScale("Smoothness Scale", Range(0.0, 1.0)) = 1.0 _SmoothnessTextureChannel("Smoothness texture channel", Float) = 0 - [Gamma] _Metallic("Metallic", Range(0.0, 1.0)) = 0.0 + _Metallic("Metallic", Range(0.0, 1.0)) = 0.0 _MetallicGlossMap("Metallic", 2D) = "white" {} _SpecColor("Specular", Color) = (0.2, 0.2, 0.2) From e53145a30ec42ecde998c2f390679f8dd75db79f Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Fri, 20 Mar 2020 10:23:39 +0100 Subject: [PATCH 12/28] Use 2-component edge texture for SMAA on Mali (#6066) (#6196) The SMAA edge texture only requires 2 components, but using 4 may be faster on some vendors (SMAA authors mention it is faster on Nvidia). 2 components is faster on Mali, so make sure 2 components is used when running on a Mali device but keep 4 components for other vendors. Measurements were done in the URP default template scene with SMAA on medium settings and all other post-processing effects turned off on a Mali G-76. Mali Core Internal Bus Write Beats: Tile buffer internal -12.6% (+-2.3%) Mali Core Tiles (CRC): Killed tiles: +16.1% (+-2.3%) Mali External Bus Accesses: Write transaction: -10.9% (+-2.3%) Mali External Bus Beats: Write beat: -10.8% (+-2.3%) Mali External Bus Outstanding Writes: 0-25%: -14.8% (+-2.1%) Mali L2 Cache Lookups: Write lookup -10.2% (+-3.2%) Co-authored-by: AlbinBernhardssonARM <60749571+AlbinBernhardssonARM@users.noreply.github.com> --- .../Runtime/Passes/PostProcessPass.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs index 5c28c8b3418..2643c189d78 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs @@ -49,6 +49,7 @@ public class PostProcessPass : ScriptableRenderPass const int k_MaxPyramidSize = 16; readonly GraphicsFormat m_DefaultHDRFormat; bool m_UseRGBM; + readonly GraphicsFormat m_SMAAEdgeFormat; readonly GraphicsFormat m_GaussianCoCFormat; Matrix4x4 m_PrevViewProjM = Matrix4x4.identity; bool m_ResetHistory; @@ -92,6 +93,12 @@ public PostProcessPass(RenderPassEvent evt, PostProcessData data, Material blitM m_UseRGBM = true; } + // Only two components are needed for edge render texture, but on some vendors four components may be faster. + if (SystemInfo.IsFormatSupported(GraphicsFormat.R8G8_UNorm, FormatUsage.Render) && SystemInfo.graphicsDeviceVendor.ToLowerInvariant().Contains("arm")) + m_SMAAEdgeFormat = GraphicsFormat.R8G8_UNorm; + else + m_SMAAEdgeFormat = GraphicsFormat.R8G8B8A8_UNorm; + if (SystemInfo.IsFormatSupported(GraphicsFormat.R16_UNorm, FormatUsage.Linear | FormatUsage.Render)) m_GaussianCoCFormat = GraphicsFormat.R16_UNorm; else if (SystemInfo.IsFormatSupported(GraphicsFormat.R16_SFloat, FormatUsage.Linear | FormatUsage.Render)) @@ -470,7 +477,7 @@ void DoSubpixelMorphologicalAntialiasing(ref CameraData cameraData, CommandBuffe stencil = m_Depth.Identifier(); tempDepthBits = 0; } - cmd.GetTemporaryRT(ShaderConstants._EdgeTexture, GetStereoCompatibleDescriptor(m_Descriptor.width, m_Descriptor.height, GraphicsFormat.R8G8B8A8_UNorm, tempDepthBits), FilterMode.Point); + cmd.GetTemporaryRT(ShaderConstants._EdgeTexture, GetStereoCompatibleDescriptor(m_Descriptor.width, m_Descriptor.height, m_SMAAEdgeFormat, tempDepthBits), FilterMode.Point); cmd.GetTemporaryRT(ShaderConstants._BlendTexture, GetStereoCompatibleDescriptor(m_Descriptor.width, m_Descriptor.height, GraphicsFormat.R8G8B8A8_UNorm), FilterMode.Point); // Prepare for manual blit From 007f315eeab4f1e8ac3c438550cb0ddb39afdde0 Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Tue, 31 Mar 2020 14:59:19 +0200 Subject: [PATCH 13/28] Bitangent computation per fragment (#6214) * switch URP built-in shaders to bitangent in the pixel shader switch URP built-in shaders to bitangent in the pixel shader * remove redundant per vertex Normalize remove redundant per vertex Normalize * added some comments requested previously by evgenii and sebastien added some comments requested previously by evgenii and sebastien * Fixed CopyDepthPass compilation error. * Added TBN test scene * Fixes regarding half precision. Added default * added changelog * reverted change from float to half, adjusted file format. * file format changes * Added parameter to choose whether to normalize direction/normal. * Updated baked lit to add tangent space transform after hybrid work landed. * updated particle shaders * Revert " updated particle shaders" This reverts commit d811fcbdbbda506d467d8cee85d7ab1208e748db. Co-authored-by: mmikk # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md # com.unity.render-pipelines.universal/Shaders/BakedLit.shader --- .../Assets/Scenes/128_TBN.meta | 8 + .../Assets/Scenes/128_TBN.unity | 406 ++++++++++++++++++ .../Assets/Scenes/128_TBN.unity.meta | 7 + .../Assets/Scenes/128_TBN/Baked_normal.tiff | 3 + .../Scenes/128_TBN/Baked_normal.tiff.meta | 117 +++++ .../128_TBN/LP_Normal_Map_Stress_Test.obj | 3 + .../LP_Normal_Map_Stress_Test.obj.meta | 100 +++++ .../Assets/Scenes/128_TBN/LitTBN.mat | 91 ++++ .../Assets/Scenes/128_TBN/LitTBN.mat.meta | 8 + .../ShaderLibrary/Packing.hlsl | 10 +- .../ShaderLibrary/SpaceTransforms.hlsl | 106 +++-- .../CHANGELOG.md | 1 + .../Shaders/BakedLit.shader | 22 +- .../Shaders/LitForwardPass.hlsl | 37 +- 14 files changed, 853 insertions(+), 66 deletions(-) create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.meta new file mode 100644 index 00000000000..76978ba4dc8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85b590a69c8a640baa04566d46a1d735 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity new file mode 100644 index 00000000000..153d77222eb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity @@ -0,0 +1,406 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &258907406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 258907408} + - component: {fileID: 258907407} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &258907407 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 258907406} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &258907408 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 258907406} + m_LocalRotation: {x: 0.30089864, y: 0.6364036, z: -0.29676083, w: 0.6452779} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -630.79297, z: 0} +--- !u!1001 &299435196 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2416733968201007103, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 94f4eec55f2984cb4a38ad10465d853d, type: 2} + - target: {fileID: -927199367670048503, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_Name + value: LP_Normal_Map_Stress_Test + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c92b68c31d5bf48d0a609ccc515a6cf7, type: 3} +--- !u!1 &723586225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 723586228} + - component: {fileID: 723586227} + - component: {fileID: 723586226} + - component: {fileID: 723586229} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &723586226 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723586225} + m_Enabled: 1 +--- !u!20 &723586227 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723586225} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &723586228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723586225} + m_LocalRotation: {x: -0.009857253, y: -0.70042616, z: 0.009671118, w: -0.7135913} + m_LocalPosition: {x: -6.0977936, y: 1.5080056, z: -0.5367039} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &723586229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723586225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity.meta new file mode 100644 index 00000000000..7067274174c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 49aa042448a7b4260874ed632254cd4e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff new file mode 100644 index 00000000000..655b5dfe77f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:806b0db77c8083bb34bd97c04c8e4c07a3e59b8543c66d86f4573f1c1cdbaef5 +size 12329148 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff.meta new file mode 100644 index 00000000000..7a83a7b0ce6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 6627ea28e0e754519b2316a28ae392e6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj new file mode 100644 index 00000000000..1242db7fae7 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34ab16753d6e2ea9c26fdd2577c301bcc9de697d1440b92588de78f98ea719bd +size 17640 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj.meta new file mode 100644 index 00000000000..c6d15f67852 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj.meta @@ -0,0 +1,100 @@ +fileFormatVersion: 2 +guid: c92b68c31d5bf48d0a609ccc515a6cf7 +ModelImporter: + serializedVersion: 20100 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat new file mode 100644 index 00000000000..7cca45f3744 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6591972991259300075 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LitTBN + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 6627ea28e0e754519b2316a28ae392e6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 1 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat.meta new file mode 100644 index 00000000000..8b689586f4c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 94f4eec55f2984cb4a38ad10465d853d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl index 19e38f62cbb..603622e8f7a 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl @@ -177,8 +177,16 @@ real3 UnpackNormalAG(real4 packedNormal, real scale = 1.0) { real3 normal; normal.xy = packedNormal.ag * 2.0 - 1.0; - normal.xy *= scale; normal.z = sqrt(1.0 - saturate(dot(normal.xy, normal.xy))); + + // must scale after reconstruction of normal.z which also + // mirrors UnpackNormalRGB(). This does imply normal is not returned + // as a unit length vector but doesn't need it since it will get normalized after TBN transformation. + // If we ever need to blend contributions with built-in shaders for URP + // then we should consider using UnpackDerivativeNormalAG() instead like + // HDRP does since derivatives do not use renormalization and unlike tangent space + // normals allow you to blend, accumulate and scale contributions correctly. + normal.xy *= scale; return normal; } diff --git a/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl index bc8762f4c0f..90f8da1c54f 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl @@ -86,48 +86,73 @@ float4 TransformWViewToHClip(float3 positionVS) return mul(GetViewToHClipMatrix(), float4(positionVS, 1.0)); } -real3 TransformObjectToWorldDir(real3 dirOS) +// Normalize to support uniform scaling +float3 TransformObjectToWorldDir(float3 dirOS, bool doNormalize = true) { - // Normalize to support uniform scaling - return SafeNormalize(mul((real3x3)GetObjectToWorldMatrix(), dirOS)); + float3 dirWS = mul((float3x3)GetObjectToWorldMatrix(), dirOS); + if (doNormalize) + return SafeNormalize(dirWS); + + return dirWS; } -real3 TransformWorldToObjectDir(real3 dirWS) +// Normalize to support uniform scaling +float3 TransformWorldToObjectDir(float3 dirWS, bool doNormalize = true) { - // Normalize to support uniform scaling - return normalize(mul((real3x3)GetWorldToObjectMatrix(), dirWS)); + float3 dirOS = mul((float3x3)GetWorldToObjectMatrix(), dirWS); + if (doNormalize) + return normalize(dirOS); + + return dirOS; } -real3 TransformWorldToViewDir(real3 dirWS) +// Tranforms vector from world space to view space +real3 TransformWorldToViewDir(real3 dirWS, bool doNormalize = false) { - return mul((real3x3)GetWorldToViewMatrix(), dirWS).xyz; + float3 dirVS = mul((real3x3)GetWorldToViewMatrix(), dirWS).xyz; + if (doNormalize) + return normalize(dirVS); + + return dirVS; } // Tranforms vector from world space to homogenous space -real3 TransformWorldToHClipDir(real3 directionWS) +real3 TransformWorldToHClipDir(real3 directionWS, bool doNormalize = false) { - return mul((real3x3)GetWorldToHClipMatrix(), directionWS); + float dirHCS = mul((real3x3)GetWorldToHClipMatrix(), directionWS); + if (doNormalize) + return normalize(dirHCS); + + return dirHCS; } // Transforms normal from object to world space -float3 TransformObjectToWorldNormal(float3 normalOS) +float3 TransformObjectToWorldNormal(float3 normalOS, bool doNormalize = true) { #ifdef UNITY_ASSUME_UNIFORM_SCALING - return TransformObjectToWorldDir(normalOS); + return TransformObjectToWorldDir(normalOS, doNormalize); #else // Normal need to be multiply by inverse transpose - return SafeNormalize(mul(normalOS, (float3x3)GetWorldToObjectMatrix())); + float3 normalWS = mul(normalOS, (float3x3)GetWorldToObjectMatrix()); + if (doNormalize) + return SafeNormalize(normalWS); + + return normalWS; #endif } // Transforms normal from world to object space -float3 TransformWorldToObjectNormal(float3 normalWS) +float3 TransformWorldToObjectNormal(float3 normalWS, bool doNormalize = true) { #ifdef UNITY_ASSUME_UNIFORM_SCALING - return TransformWorldToObjectDir(normalWS); + return TransformWorldToObjectDir(normalWS, doNormalize); #else // Normal need to be multiply by inverse transpose - return SafeNormalize(mul(normalWS, (float3x3)GetObjectToWorldMatrix())); + float3 normalOS = mul(normalWS, (float3x3)GetObjectToWorldMatrix()); + if (doNormalize) + return SafeNormalize(normalOS); + + return normalOS; #endif } @@ -146,41 +171,48 @@ real3 TransformTangentToWorld(real3 dirTS, real3x3 tangentToWorld) return mul(dirTS, tangentToWorld); } +// This function does the exact inverse of TransformTangentToWorld() and is +// also decribed within comments in mikktspace.h and it follows implicitly +// from the scalar triple product (google it). real3 TransformWorldToTangent(real3 dirWS, real3x3 tangentToWorld) { // Note matrix is in row major convention with left multiplication as it is build on the fly float3 row0 = tangentToWorld[0]; - float3 row1 = tangentToWorld[1]; - float3 row2 = tangentToWorld[2]; - - // these are the columns of the inverse matrix but scaled by the determinant - float3 col0 = cross(row1, row2); - float3 col1 = cross(row2, row0); - float3 col2 = cross(row0, row1); - - float determinant = dot(row0, col0); - float sgn = determinant<0.0 ? (-1.0) : 1.0; - - // inverse transposed but scaled by determinant - real3x3 matTBN_I_T = real3x3(col0, col1, col2); - - // remove transpose part by using matrix as the first arg in mul() - // this makes it the exact inverse of what TransformTangentToWorld() does. - return SafeNormalize( sgn * mul(matTBN_I_T, dirWS) ); + float3 row1 = tangentToWorld[1]; + float3 row2 = tangentToWorld[2]; + + // these are the columns of the inverse matrix but scaled by the determinant + float3 col0 = cross(row1, row2); + float3 col1 = cross(row2, row0); + float3 col2 = cross(row0, row1); + + float determinant = dot(row0, col0); + float sgn = determinant<0.0 ? (-1.0) : 1.0; + + // inverse transposed but scaled by determinant + // Will remove transpose part by using matrix as the first arg in the mul() below + // this makes it the exact inverse of what TransformTangentToWorld() does. + real3x3 matTBN_I_T = real3x3(col0, col1, col2); + + return SafeNormalize( sgn * mul(matTBN_I_T, dirWS) ); } real3 TransformTangentToObject(real3 dirTS, real3x3 tangentToWorld) { // Note matrix is in row major convention with left multiplication as it is build on the fly - real3 normalWS = TransformTangentToWorld(dirTS, tangentToWorld); - return TransformWorldToObjectNormal(normalWS); + real3 normalWS = TransformTangentToWorld(dirTS, tangentToWorld); + return TransformWorldToObjectNormal(normalWS); } real3 TransformObjectToTangent(real3 dirOS, real3x3 tangentToWorld) { // Note matrix is in row major convention with left multiplication as it is build on the fly - float3 normalWS = TransformObjectToWorldNormal(dirOS); - return TransformWorldToTangent(normalWS, tangentToWorld); + + // don't normalize, as normalWS will be normalized after TransformWorldToTangent + float3 normalWS = TransformObjectToWorldNormal(dirOS, false); + + // transform from world to tangent + return TransformWorldToTangent(normalWS, tangentToWorld); } #endif diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 1b4feaa9a93..4b4d5b6ab32 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - UniversalRenderPipelineAsset no longer supports presets [case 1197020](https://issuetracker.unity3d.com/issues/urp-reset-functionality-does-not-work-on-preset-of-universalrenderpipelineassets) - You can now subclass ForwardRenderer to create a custom renderer based on it. - The Metallic property value of a Material is now linear, which is the correct behavior for the PBR approach. In the previous URP package version, those values were interpreted as gamma values. This change might affect the look of Materials that use this property after upgrading from the previous package version. +- The pipeline is now computing tangent space in per fragment. ### Fixed - Fixed an issue with shadows not appearing on terrains when no cascades were selected [case 1226530](https://issuetracker.unity3d.com/issues/urp-no-shadows-on-terrain-when-cascades-is-set-to-no-cascades-in-render-pipeline-asset-settings) diff --git a/com.unity.render-pipelines.universal/Shaders/BakedLit.shader b/com.unity.render-pipelines.universal/Shaders/BakedLit.shader index 526609693f2..84c769ed041 100644 --- a/com.unity.render-pipelines.universal/Shaders/BakedLit.shader +++ b/com.unity.render-pipelines.universal/Shaders/BakedLit.shader @@ -70,10 +70,9 @@ Shader "Universal Render Pipeline/Baked Lit" { float3 uv0AndFogCoord : TEXCOORD0; // xy: uv0, z: fogCoord DECLARE_LIGHTMAP_OR_SH(lightmapUV, vertexSH, 1); - half3 normal : TEXCOORD2; + half3 normalWS : TEXCOORD2; #if defined(_NORMALMAP) - half3 tangent : TEXCOORD3; - half3 bitangent : TEXCOORD4; + half4 tangentWS : TEXCOORD3; #endif float4 vertex : SV_POSITION; @@ -94,14 +93,17 @@ Shader "Universal Render Pipeline/Baked Lit" output.uv0AndFogCoord.xy = TRANSFORM_TEX(input.uv, _BaseMap); output.uv0AndFogCoord.z = ComputeFogFactor(vertexInput.positionCS.z); + // normalWS and tangentWS already normalize. + // this is required to avoid skewing the direction during interpolation + // also required for per-vertex SH evaluation VertexNormalInputs normalInput = GetVertexNormalInputs(input.normalOS, input.tangentOS); - output.normal = normalInput.normalWS; + output.normalWS = normalInput.normalWS; #if defined(_NORMALMAP) - output.tangent = normalInput.tangentWS; - output.bitangent = normalInput.bitangentWS; + real sign = input.tangentOS.w * GetOddNegativeScale(); + output.tangentWS = half4(normalInput.tangentWS.xyz, sign); #endif OUTPUT_LIGHTMAP_UV(input.lightmapUV, unity_LightmapST, output.lightmapUV); - OUTPUT_SH(output.normal, output.vertexSH); + OUTPUT_SH(output.normalWS, output.vertexSH); return output; } @@ -123,9 +125,11 @@ Shader "Universal Render Pipeline/Baked Lit" #if defined(_NORMALMAP) half3 normalTS = SampleNormal(uv, TEXTURE2D_ARGS(_BumpMap, sampler_BumpMap)).xyz; - half3 normalWS = TransformTangentToWorld(normalTS, half3x3(input.tangent, input.bitangent, input.normal)); + float sgn = input.tangentWS.w; // should be either +1 or -1 + float3 bitangent = sgn * cross(input.normalWS.xyz, input.tangentWS.xyz); + half3 normalWS = TransformTangentToWorld(normalTS, half3x3(input.tangentWS.xyz, bitangent, input.normalWS)); #else - half3 normalWS = input.normal; + half3 normalWS = input.normalWS; #endif normalWS = NormalizeNormalPerPixel(normalWS); color *= SAMPLE_GI(input.lightmapUV, input.vertexSH, normalWS); diff --git a/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl index 66ad8220999..317f0401590 100644 --- a/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl @@ -22,14 +22,11 @@ struct Varyings float3 positionWS : TEXCOORD2; #endif -#ifdef _NORMALMAP - float4 normalWS : TEXCOORD3; // xyz: normal, w: viewDir.x - float4 tangentWS : TEXCOORD4; // xyz: tangent, w: viewDir.y - float4 bitangentWS : TEXCOORD5; // xyz: bitangent, w: viewDir.z -#else float3 normalWS : TEXCOORD3; - float3 viewDirWS : TEXCOORD4; +#ifdef _NORMALMAP + float4 tangentWS : TEXCOORD4; // xyz: tangent, w: sign #endif + float3 viewDirWS : TEXCOORD5; half4 fogFactorAndVertexLight : TEXCOORD6; // x: fogFactor, yzw: vertex light @@ -50,17 +47,16 @@ void InitializeInputData(Varyings input, half3 normalTS, out InputData inputData inputData.positionWS = input.positionWS; #endif -#ifdef _NORMALMAP - half3 viewDirWS = half3(input.normalWS.w, input.tangentWS.w, input.bitangentWS.w); - inputData.normalWS = TransformTangentToWorld(normalTS, - half3x3(input.tangentWS.xyz, input.bitangentWS.xyz, input.normalWS.xyz)); + half3 viewDirWS = SafeNormalize(input.viewDirWS); +#ifdef _NORMALMAP + float sgn = input.tangentWS.w; // should be either +1 or -1 + float3 bitangent = sgn * cross(input.normalWS.xyz, input.tangentWS.xyz); + inputData.normalWS = TransformTangentToWorld(normalTS, half3x3(input.tangentWS.xyz, bitangent.xyz, input.normalWS.xyz)); #else - half3 viewDirWS = input.viewDirWS; inputData.normalWS = input.normalWS; #endif inputData.normalWS = NormalizeNormalPerPixel(inputData.normalWS); - viewDirWS = SafeNormalize(viewDirWS); inputData.viewDirectionWS = viewDirWS; #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) @@ -90,20 +86,23 @@ Varyings LitPassVertex(Attributes input) UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz); + + // normalWS and tangentWS already normalize. + // this is required to avoid skewing the direction during interpolation + // also required for per-vertex lighting and SH evaluation VertexNormalInputs normalInput = GetVertexNormalInputs(input.normalOS, input.tangentOS); - half3 viewDirWS = GetCameraPositionWS() - vertexInput.positionWS; + float3 viewDirWS = GetCameraPositionWS() - vertexInput.positionWS; half3 vertexLight = VertexLighting(vertexInput.positionWS, normalInput.normalWS); half fogFactor = ComputeFogFactor(vertexInput.positionCS.z); output.uv = TRANSFORM_TEX(input.texcoord, _BaseMap); -#ifdef _NORMALMAP - output.normalWS = half4(normalInput.normalWS, viewDirWS.x); - output.tangentWS = half4(normalInput.tangentWS, viewDirWS.y); - output.bitangentWS = half4(normalInput.bitangentWS, viewDirWS.z); -#else - output.normalWS = NormalizeNormalPerVertex(normalInput.normalWS); + // already normalized from normal transform to WS. + output.normalWS = normalInput.normalWS; output.viewDirWS = viewDirWS; +#ifdef _NORMALMAP + real sign = input.tangentOS.w * GetOddNegativeScale(); + output.tangentWS = half4(normalInput.tangentWS.xyz, sign); #endif OUTPUT_LIGHTMAP_UV(input.lightmapUV, unity_LightmapST, output.lightmapUV); From db3f5d67d09f1c4bdfd34cfc88962c0f4faeba25 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 23 Mar 2020 13:03:38 +0100 Subject: [PATCH 14/28] GC fix (#1227490) (#6228) * Fixed GC pressure in volume component's GetHashCode * Changelog update * Update com.unity.render-pipelines.core/CHANGELOG.md Co-Authored-By: Felipe Lira Co-authored-by: Felipe Lira --- com.unity.render-pipelines.core/CHANGELOG.md | 2 +- .../Runtime/Volume/VolumeParameter.cs | 2 +- .../Runtime/Passes/PostProcessPass.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md index f00af746201..094071bc882 100644 --- a/com.unity.render-pipelines.core/CHANGELOG.md +++ b/com.unity.render-pipelines.core/CHANGELOG.md @@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed duplicated entry for com.unity.modules.xr in the runtime asmdef file - Fixed the texture curve being destroyed from another thread than main (case 1211754) - Fixed unreachable code in TextureXR.useTexArray +- Fixed GC pressure caused by `VolumeParameter.GetHashCode()` ### Changed - Updated macros to be compatible with the new shader preprocessor. @@ -180,4 +181,3 @@ The version number for this package has increased due to a version update of a r ### Changed - Moved root files into folders for easier maintenance - diff --git a/com.unity.render-pipelines.core/Runtime/Volume/VolumeParameter.cs b/com.unity.render-pipelines.core/Runtime/Volume/VolumeParameter.cs index 8fa9e1078e9..074e00306ee 100644 --- a/com.unity.render-pipelines.core/Runtime/Volume/VolumeParameter.cs +++ b/com.unity.render-pipelines.core/Runtime/Volume/VolumeParameter.cs @@ -234,7 +234,7 @@ public override int GetHashCode() int hash = 17; hash = hash * 23 + overrideState.GetHashCode(); - if (!ReferenceEquals(value, null)) + if (!EqualityComparer.Default.Equals(value, default)) // Catches null for references with boxing of value types hash = hash * 23 + value.GetHashCode(); return hash; diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs index 2643c189d78..7799c5eb9c1 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs @@ -651,7 +651,7 @@ void DoBokehDepthOfField(CommandBuffer cmd, int source, int destination, Rect pi cmd.SetGlobalVector(ShaderConstants._CoCParams, new Vector4(P, maxCoC, maxRadius, rcpAspect)); // Prepare the bokeh kernel constant buffer - int hash = m_DepthOfField.GetHashCode(); // TODO: GC fix + int hash = m_DepthOfField.GetHashCode(); if (hash != m_BokehHash) { m_BokehHash = hash; From e9261cf2ea81f791058ec6cbf8f67bfc0fc80fc9 Mon Sep 17 00:00:00 2001 From: Florian Penzkofer Date: Wed, 25 Mar 2020 03:37:19 -0500 Subject: [PATCH 15/28] Check if R16G16B16A16_SFloat is supported before using it (#6358) Co-authored-by: Florian Penzkofer # Conflicts: # com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs --- .../Runtime/UniversalRenderPipelineCore.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs index e607e885ce2..342f98f5388 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs @@ -305,10 +305,15 @@ static RenderTextureDescriptor CreateRenderTextureDescriptor(Camera camera, floa } else { - bool use32BitHDR = !needsAlpha && RenderingUtils.SupportsRenderTextureFormat(RenderTextureFormat.RGB111110Float); - RenderTextureFormat hdrFormat = (use32BitHDR) ? RenderTextureFormat.RGB111110Float : RenderTextureFormat.DefaultHDR; - - desc.colorFormat = isHdrEnabled ? hdrFormat : renderTextureFormatDefault; + GraphicsFormat hdrFormat; + if (!needsAlpha && RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear | FormatUsage.Render)) + hdrFormat = GraphicsFormat.B10G11R11_UFloatPack32; + else if (RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Linear | FormatUsage.Render)) + hdrFormat = GraphicsFormat.R16G16B16A16_SFloat; + else + hdrFormat = SystemInfo.GetGraphicsFormat(DefaultFormat.HDR); // This might actually be a LDR format on old devices. + + desc.graphicsFormat = isHdrEnabled ? hdrFormat : renderTextureFormatDefault; desc.depthBufferBits = 32; desc.msaaSamples = msaaSamples; desc.sRGB = (QualitySettings.activeColorSpace == ColorSpace.Linear); From 4e2bf5b64cb97e64393bc9ff2fd14520eaab9257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20=C3=96rn=20Unn=C3=BE=C3=B3rsson?= Date: Thu, 2 Apr 2020 16:52:49 +0200 Subject: [PATCH 16/28] [9.x.x] Fixing defines and calculations for shadow coordinates [Skip CI] (#6376) * Making sure we use the right define checks for shadowcoords in all shaders [Skip CI] * More fixes [Skip CI] * Changelog [Skip CI] * Update Changelog [Skip CI] * Fixing an issue in SpeedTree8Passes # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md --- .../CHANGELOG.md | 1 + .../ShaderGraph/Includes/PBRForwardPass.hlsl | 16 +++++++++------- .../Editor/ShaderGraph/Includes/Varyings.hlsl | 10 +++++----- .../Nature/SpeedTree7BillboardPasses.hlsl | 6 +++--- .../Nature/SpeedTree7CommonPasses.hlsl | 2 +- .../Shaders/Nature/SpeedTree8Passes.hlsl | 19 +++++++++++-------- .../Shaders/Terrain/WavingGrassPasses.hlsl | 11 +++++++---- 7 files changed, 37 insertions(+), 28 deletions(-) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 4b4d5b6ab32..2cb9f6b9670 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed UI text of RenderObjects feature to display LightMode tag instead of Shader Pass Name. [case 1201696](https://issuetracker.unity3d.com/issues/render-feature-slash-pass-ui-has-a-field-for-shader-pass-name-when-it-actually-expects-shader-pass-lightmode) - Fixed an issue that caused Android GLES to render blank screen when Depth texture was enabled without Opaque texture [case 1219325](https://issuetracker.unity3d.com/issues/scene-is-not-rendered-on-android-8-and-9-when-depth-texture-is-enabled-in-urp-asset) - Metallic slider on the Lit shader is now linear meaning correct values are used for PBR. +- Fixed an issue with shadows not being correctly calculated in some shaders. ## [7.3.0] - 2020-03-11 diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl index 5581ee4c221..9ac3b77b6fb 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl @@ -13,14 +13,16 @@ #elif _NORMAL_DROPOFF_WS inputData.normalWS = normal; #endif - + #else inputData.normalWS = input.normalWS; #endif inputData.normalWS = NormalizeNormalPerPixel(inputData.normalWS); inputData.viewDirectionWS = SafeNormalize(input.viewDirectionWS); -#if defined(MAIN_LIGHT_CALCULATE_SHADOWS) +#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) + inputData.shadowCoord = input.shadowCoord; +#elif defined(MAIN_LIGHT_CALCULATE_SHADOWS) inputData.shadowCoord = TransformWorldToShadowCoord(inputData.positionWS); #else inputData.shadowCoord = float4(0, 0, 0, 0); @@ -40,8 +42,8 @@ PackedVaryings vert(Attributes input) return packedOutput; } -half4 frag(PackedVaryings packedInput) : SV_TARGET -{ +half4 frag(PackedVaryings packedInput) : SV_TARGET +{ Varyings unpacked = UnpackVaryings(packedInput); UNITY_SETUP_INSTANCE_ID(unpacked); UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(unpacked); @@ -59,7 +61,7 @@ half4 frag(PackedVaryings packedInput) : SV_TARGET #ifdef _SPECULAR_SETUP float3 specular = surfaceDescription.Specular; float metallic = 1; - #else + #else float3 specular = 0; float metallic = surfaceDescription.Metallic; #endif @@ -72,8 +74,8 @@ half4 frag(PackedVaryings packedInput) : SV_TARGET surfaceDescription.Smoothness, surfaceDescription.Occlusion, surfaceDescription.Emission, - surfaceDescription.Alpha); + surfaceDescription.Alpha); - color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.rgb = MixFog(color.rgb, inputData.fogCoord); return color; } diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/Varyings.hlsl b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/Varyings.hlsl index a20c0b95edb..801d1cbe473 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/Varyings.hlsl +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/Varyings.hlsl @@ -14,12 +14,12 @@ Varyings BuildVaryings(Attributes input) // Evaluate Vertex Graph VertexDescriptionInputs vertexDescriptionInputs = BuildVertexDescriptionInputs(input); VertexDescription vertexDescription = VertexDescriptionFunction(vertexDescriptionInputs); - + // Assign modified vertex attributes input.positionOS = vertexDescription.VertexPosition; #if defined(VARYINGS_NEED_NORMAL_WS) input.normalOS = vertexDescription.VertexNormal; - #endif //FEATURES_GRAPH_NORMAL + #endif //FEATURES_GRAPH_NORMAL #if defined(VARYINGS_NEED_TANGENT_WS) input.tangentOS.xyz = vertexDescription.VertexTangent.xyz; #endif //FEATURES GRAPH TANGENT @@ -51,7 +51,7 @@ Varyings BuildVaryings(Attributes input) #ifdef VARYINGS_NEED_POSITION_WS output.positionWS = positionWS; #endif - + #ifdef VARYINGS_NEED_NORMAL_WS output.normalWS = normalWS; // normalized in TransformObjectToWorldNormal() #endif @@ -110,9 +110,9 @@ Varyings BuildVaryings(Attributes input) output.fogFactorAndVertexLight = half4(fogFactor, vertexLight); #endif -#ifdef _MAIN_LIGHT_SHADOWS +#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) output.shadowCoord = GetShadowCoord(vertexInput); #endif return output; -} \ No newline at end of file +} diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7BillboardPasses.hlsl b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7BillboardPasses.hlsl index d0a554c8b2c..90a1211baa2 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7BillboardPasses.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7BillboardPasses.hlsl @@ -99,9 +99,9 @@ SpeedTreeVertexOutput SpeedTree7Vert(SpeedTreeVertexInput input) output.clipPos = vertexInput.positionCS; -#ifdef _MAIN_LIGHT_SHADOWS - output.shadowCoord = GetShadowCoord(vertexInput); -#endif + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) + output.shadowCoord = GetShadowCoord(vertexInput); + #endif return output; } diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl index 2dabe8c8045..df726443d7a 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl @@ -40,7 +40,7 @@ struct SpeedTreeVertexOutput half3 viewDirWS : TEXCOORD4; #endif - #ifdef _MAIN_LIGHT_SHADOWS + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) float4 shadowCoord : TEXCOORD6; #endif diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl index 9c17d4b183e..e0e85b26236 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl @@ -33,7 +33,7 @@ struct SpeedTreeVertexOutput half3 viewDirWS : TEXCOORD4; #endif - #ifdef _MAIN_LIGHT_SHADOWS + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) float4 shadowCoord : TEXCOORD6; #endif @@ -230,11 +230,12 @@ SpeedTreeVertexOutput SpeedTree8Vert(SpeedTreeVertexInput input) output.viewDirWS = viewDirWS; #endif - #ifdef _MAIN_LIGHT_SHADOWS + output.positionWS = vertexInput.positionWS; + + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) output.shadowCoord = GetShadowCoord(vertexInput); #endif - output.positionWS = vertexInput.positionWS; output.clipPos = vertexInput.positionCS; return output; @@ -282,11 +283,13 @@ void InitializeInputData(SpeedTreeFragmentInput input, half3 normalTS, out Input inputData.viewDirectionWS = SafeNormalize(inputData.viewDirectionWS); #endif -#ifdef _MAIN_LIGHT_SHADOWS - inputData.shadowCoord = input.interpolated.shadowCoord; -#else - inputData.shadowCoord = float4(0, 0, 0, 0); -#endif + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) + inputData.shadowCoord = input.interpolated.shadowCoord; + #elif defined(MAIN_LIGHT_CALCULATE_SHADOWS) + inputData.shadowCoord = TransformWorldToShadowCoord(inputData.positionWS); + #else + inputData.shadowCoord = float4(0, 0, 0, 0); + #endif inputData.fogCoord = input.interpolated.fogFactorAndVertexLight.x; inputData.vertexLighting = input.interpolated.fogFactorAndVertexLight.yzw; diff --git a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassPasses.hlsl b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassPasses.hlsl index bdbe53a1a63..a701a7d0efe 100644 --- a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassPasses.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassPasses.hlsl @@ -26,7 +26,7 @@ struct GrassVertexOutput half4 fogFactorAndVertexLight : TEXCOORD5; // x: fogFactor, yzw: vertex light -#ifdef _MAIN_LIGHT_SHADOWS +#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) float4 shadowCoord : TEXCOORD6; #endif half4 color : TEXCOORD7; @@ -46,13 +46,16 @@ void InitializeInputData(GrassVertexOutput input, out InputData inputData) #endif inputData.normalWS = NormalizeNormalPerPixel(input.normal); - inputData.viewDirectionWS = viewDirWS; -#ifdef _MAIN_LIGHT_SHADOWS + +#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) inputData.shadowCoord = input.shadowCoord; +#elif defined(MAIN_LIGHT_CALCULATE_SHADOWS) + inputData.shadowCoord = TransformWorldToShadowCoord(inputData.positionWS); #else inputData.shadowCoord = float4(0, 0, 0, 0); #endif + inputData.fogCoord = input.fogFactorAndVertexLight.x; inputData.vertexLighting = input.fogFactorAndVertexLight.yzw; inputData.bakedGI = SAMPLE_GI(input.lightmapUV, input.vertexSH, inputData.normalWS); @@ -86,7 +89,7 @@ void InitializeVertData(GrassVertexInput input, inout GrassVertexOutput vertData half fogFactor = ComputeFogFactor(vertexInput.positionCS.z); vertData.fogFactorAndVertexLight = half4(fogFactor, vertexLight); -#ifdef _MAIN_LIGHT_SHADOWS +#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) vertData.shadowCoord = GetShadowCoord(vertexInput); #endif } From 384ffe8b52db1cd2929d56a7fc54c3529a7eb222 Mon Sep 17 00:00:00 2001 From: Andre McGrail Date: Wed, 1 Apr 2020 08:03:52 +0200 Subject: [PATCH 17/28] Revert RenderQueue '+50' offset on all URP shaders (#6381) * moved all URP shaders to not do the +50 offset in their render queue, created a material upgrader * updated changelog * rename particlesLit shader to unlit * removed irrelevant variables * remove un-used variable * upgrade all test project materials * updated all URP materials in test projects * Added debugs for Yamato [Skip CI] * Revert "Added debugs for Yamato [Skip CI]" This reverts commit 72b88d734dcb4dd32bdb26f2a68cf58d241951a2. # Conflicts: # TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/LitInstanced.mat # TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/SimpleLitInstanced.mat # TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/UnlitInstanced.mat # TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Lit.mat # TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/SimpleLit.mat # TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Unlit.mat # TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/LitInstanced.mat # TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/SimpleLitInstanced.mat # TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_PBR.mat # TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_Unlit.mat # TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/Smooth.mat # TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_Realtime_ReflectionProbe/Smooth_NormalMap.mat # TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth/unlit.mat # TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepth/unlit.mat # com.unity.render-pipelines.universal/CHANGELOG.md --- .../ProjectSettings/URPProjectSettings.asset | 15 +++ .../Graphs/Instanced/LitInstanced.mat | 91 ++++++++++++++ .../Graphs/Instanced/SimpleLitInstanced.mat | 95 +++++++++++++++ .../Graphs/Instanced/UnlitInstanced.mat | 92 +++++++++++++++ .../ProjectSettings/URPProjectSettings.asset | 2 +- .../Assets/CommonAssets/Materials/Lit.mat | 91 ++++++++++++++ .../CommonAssets/Materials/SimpleLit.mat | 95 +++++++++++++++ .../Assets/CommonAssets/Materials/Unlit.mat | 92 +++++++++++++++ .../LitInstanced.mat | 91 ++++++++++++++ .../SimpleLitInstanced.mat | 95 +++++++++++++++ .../ProjectSettings/URPProjectSettings.asset | 15 +++ .../CommonAssets/Materials/001_SimpleCube.mat | 5 +- .../CommonAssets/Materials/Cornell Box.mat | 6 +- .../Materials/Cornell Box_green.mat | 5 +- .../Materials/Cornell Box_red.mat | 6 +- .../CommonAssets/Materials/Gray Unlit.mat | 5 +- .../CommonAssets/Materials/LW_Diffuse.mat | 5 +- .../CommonAssets/Materials/LW_Material.mat | 5 +- .../CommonAssets/Materials/Red Unlit.mat | 5 +- .../CommonAssets/Materials/red_paint.mat | 5 +- .../Crowd_LOD0_Mat_Limbs_metallic.mat | 6 +- .../Materials/Crowd_LOD0_Mat_Limbs_spec.mat | 6 +- .../Crowd_LOD0_Mat_Torso_metallic.mat | 6 +- .../Materials/Crowd_LOD0_Mat_Torso_spec.mat | 6 +- .../Meshes/PBR Spheres/PBRtest_Spec.mat | 6 +- .../Meshes/PBR Spheres/PBRtest_met.mat | 6 +- .../002_CameraClip_Sphere.mat | 6 +- .../006_LitShaderLightProbes_Sphere.mat | 5 +- .../007_LitShaderMaps_01_BaseWhite.mat | 6 +- .../007_LitShaderMaps_02_BaseColor.mat | 6 +- .../007_LitShaderMaps_03_Specular.mat | 6 +- .../007_LitShaderMaps_04_Normal.mat | 6 +- .../007_LitShaderMaps_05_Emission.mat | 6 +- .../007_LitShaderMaps_06_All.mat | 6 +- .../007_LitShaderMaps_UnlitMatTexture_08.mat | 6 +- .../007_LitShaderMaps_UnlitMat_07.mat | 6 +- .../PBRSphere 1.mat | 6 +- .../PBRSphere 10.mat | 6 +- .../PBRSphere 11.mat | 6 +- .../PBRSphere 12.mat | 6 +- .../PBRSphere 13.mat | 6 +- .../PBRSphere 14.mat | 6 +- .../PBRSphere 15.mat | 6 +- .../PBRSphere 16.mat | 6 +- .../PBRSphere 17.mat | 6 +- .../PBRSphere 18.mat | 6 +- .../PBRSphere 19.mat | 6 +- .../PBRSphere 2.mat | 6 +- .../PBRSphere 20.mat | 6 +- .../PBRSphere 21.mat | 6 +- .../PBRSphere 3.mat | 6 +- .../PBRSphere 4.mat | 6 +- .../PBRSphere 5.mat | 6 +- .../PBRSphere 6.mat | 6 +- .../PBRSphere 7.mat | 6 +- .../PBRSphere 8.mat | 6 +- .../PBRSphere 9.mat | 6 +- .../PBRSphere.mat | 6 +- .../CutoutBaked.mat | 5 +- .../Scenes/013_xr_PostFX/013_xr_PBR.mat | 91 ++++++++++++++ .../Scenes/013_xr_PostFX/013_xr_Unlit.mat | 92 +++++++++++++++ .../Smooth.mat | 111 ++++++++++++++++++ .../Smooth_NormalMap.mat | 111 ++++++++++++++++++ .../Assets/Scenes/126_SampleDepth/unlit.mat | 92 +++++++++++++++ .../ProjectSettings/URPProjectSettings.asset | 2 +- .../CommonAssets/Materials/Array Element.mat | 5 +- .../CommonAssets/Materials/BW Gradient.mat | 5 +- .../CommonAssets/Materials/CeramicTiles.mat | 6 +- .../Materials/Challenge-Brick.mat | 6 +- .../CommonAssets/Materials/Cornell Box.mat | 6 +- .../Materials/Cornell Box_green.mat | 6 +- .../Materials/Cornell Box_red.mat | 6 +- .../CommonAssets/Materials/Hole_mesh.mat | 6 +- .../Materials/Hole_mesh_cutout.mat | 5 +- .../Materials/IndustrialGlass.mat | 4 +- .../Materials/LDpipe_targetTex.mat | 6 +- .../CommonAssets/Materials/LW_Diffuse.mat | 5 +- .../Materials/LW_DiffuseParticles.mat | 5 +- .../LW_DiffuseParticlesWithTexture.mat | 5 +- .../Materials/LW_DiffuseTransparent.mat | 3 +- .../LW_DiffuseTransparentParticles.mat | 3 +- ...DiffuseTransparentParticlesWithTexture.mat | 3 +- .../LW_DiffuseTransparentWithTexture.mat | 3 +- .../Materials/LW_DiffuseUnlit.mat | 5 +- .../Materials/LW_DiffuseUnlitParticles.mat | 5 +- .../LW_DiffuseUnlitParticlesTransparent.mat | 3 +- ...seUnlitParticlesTransparentWithTexture.mat | 3 +- .../LW_DiffuseUnlitParticlesWithTexture.mat | 5 +- .../Materials/LW_DiffuseUnlitTransparent.mat | 3 +- .../LW_DiffuseUnlitTransparentWithTexture.mat | 3 +- .../Materials/LW_DiffuseUnlitWithTexture.mat | 5 +- .../Materials/LW_DiffuseWithTexture.mat | 5 +- .../CommonAssets/Materials/LW_Material.mat | 6 +- .../Materials/LW_MaterialParticles.mat | 5 +- .../LW_MaterialParticlesWithTexture.mat | 5 +- .../Materials/LW_MaterialTransparent.mat | 3 +- .../LW_MaterialTransparentParticles.mat | 3 +- ...aterialTransparentParticlesWithTexture.mat | 3 +- .../LW_MaterialTransparentWithTexture.mat | 3 +- .../Materials/LW_MaterialWithTexture.mat | 5 +- .../Assets/CommonAssets/Materials/Matte.mat | 6 +- .../CommonAssets/Materials/PW_WoodLog.mat | 6 +- .../Materials/Pyramids Wall - v01.mat | 6 +- .../Assets/CommonAssets/Materials/Roofing.mat | 6 +- .../CommonAssets/Materials/ShoreRockSand.mat | 6 +- .../Materials/SyntheticColorChart.mat | 5 +- .../CommonAssets/Materials/UnlitColor.mat | 5 +- .../Materials/Unlit_GridMarkers_X1Y1.mat | 5 +- .../Materials/Unlit_GridMarkers_X2Y1.mat | 5 +- .../Materials/Unlit_GridMarkers_X6Y6.mat | 5 +- .../CommonAssets/Materials/White_Mate.mat | 5 +- .../Assets/CommonAssets/Materials/bark.mat | 6 +- .../Materials/herringbone_brick_floor.mat | 6 +- .../Materials/metal_aluminium_directional.mat | 6 +- .../Materials/metal_brushed_copper.mat | 6 +- .../CommonAssets/Materials/red_paint.mat | 6 +- .../Materials/rocks_dirt_ground.mat | 6 +- .../Crowd_LOD0_Mat_Limbs_metallic.mat | 6 +- .../Materials/Crowd_LOD0_Mat_Limbs_spec.mat | 6 +- .../Crowd_LOD0_Mat_Torso_metallic.mat | 6 +- .../Materials/Crowd_LOD0_Mat_Torso_spec.mat | 6 +- .../Meshes/PBR Spheres/PBRtest_Spec.mat | 6 +- .../Meshes/PBR Spheres/PBRtest_met.mat | 6 +- .../Scenes/001_SimpleCube/001_SimpleCube.mat | 6 +- .../002_Camera_Clip/002_CameraClip_Sphere.mat | 6 +- .../003_CameraOrtho_Sphere.mat | 6 +- .../004_CameraTargetTextureSphere.mat | 7 +- .../004_Camera_TargetTexture_Sphere.mat | 6 +- .../005_LitBakeEmission_Sphere.mat | 5 +- .../006_LitShaderLightProbes_Sphere.mat | 5 +- .../006_LitShaderLightProbes/006_emission.mat | 6 +- .../007_LitShaderMaps_01_BaseWhite.mat | 6 +- .../007_LitShaderMaps_02_BaseColor.mat | 6 +- .../007_LitShaderMaps_03_Specular.mat | 6 +- .../007_LitShaderMaps_04_Normal.mat | 6 +- .../007_LitShaderMaps_05_Emission.mat | 6 +- .../007_LitShaderMaps_06_All.mat | 6 +- .../007_LitShaderMaps_UnlitMatTexture_08.mat | 6 +- .../007_LitShaderMaps_UnlitMat_07.mat | 6 +- .../008_AdditionalLights/mahogfloor-pbs.mat | 3 +- .../plasticpattern-pbs.mat | 3 +- .../008_AdditionalLights/redbricks-pbs.mat | 5 +- .../PBRSphere 1.mat | 6 +- .../PBRSphere 10.mat | 6 +- .../PBRSphere 11.mat | 6 +- .../PBRSphere 12.mat | 6 +- .../PBRSphere 13.mat | 6 +- .../PBRSphere 14.mat | 6 +- .../PBRSphere 15.mat | 6 +- .../PBRSphere 16.mat | 6 +- .../PBRSphere 17.mat | 6 +- .../PBRSphere 18.mat | 6 +- .../PBRSphere 19.mat | 6 +- .../PBRSphere 2.mat | 6 +- .../PBRSphere 20.mat | 6 +- .../PBRSphere 21.mat | 6 +- .../PBRSphere 3.mat | 6 +- .../PBRSphere 4.mat | 6 +- .../PBRSphere 5.mat | 6 +- .../PBRSphere 6.mat | 6 +- .../PBRSphere 7.mat | 6 +- .../PBRSphere 8.mat | 6 +- .../PBRSphere 9.mat | 6 +- .../PBRSphere.mat | 6 +- .../Materials/blue.mat | 6 +- .../Materials/green.mat | 6 +- .../Materials/red.mat | 6 +- .../Materials/yellow.mat | 6 +- .../Scenes/014_CameraMulti_MiniMap/red.mat | 6 +- .../Scenes/015_CameraMulti_FPSCam/blue.mat | 6 +- .../Scenes/015_CameraMulti_FPSCam/red.mat | 6 +- .../CutoutBaked.mat | 5 +- .../PhysicallyBased_NoReceiveShadows.mat | 6 +- .../SimpleLighting_NoReceiveShadows.mat | 6 +- .../BenchDrill/materials/kabel.mat | 6 +- .../BenchDrill/materials/korpus.mat | 6 +- .../BenchDrill/materials/kozhuh.mat | 6 +- .../BenchDrill/materials/motor.mat | 6 +- .../BenchDrill/materials/spindle.mat | 6 +- .../BenchDrill/materials/stanina.mat | 6 +- .../BenchDrill/materials/stanina_vk.mat | 6 +- .../BenchDrill/materials/top.mat | 6 +- .../BenchDrill/materials/val.mat | 6 +- .../Materials/031_Hole_mesh.mat | 6 +- .../Materials/031_Hole_mesh_gloss.mat | 6 +- .../Materials/031_IndustrialGlass.mat | 4 +- .../Materials/031_IndustrialGlass_gloss.mat | 6 +- .../Materials/031_Roofing.mat | 9 +- .../Materials/031_Roofing_gloss.mat | 6 +- .../Materials/031_rocks_dirt_ground.mat | 9 +- .../Materials/031_rocks_dirt_ground_gloss.mat | 6 +- .../Materials/032_Hole_mesh.mat | 6 +- .../Materials/032_Hole_mesh_gloss.mat | 6 +- .../Materials/032_IndustrialGlass.mat | 6 +- .../Materials/032_IndustrialGlass_gloss.mat | 6 +- .../Materials/032_Roofing.mat | 9 +- .../Materials/032_Roofing_gloss.mat | 6 +- .../Materials/032_rocks_dirt_ground.mat | 9 +- .../Materials/032_rocks_dirt_ground_gloss.mat | 6 +- .../Materials/033_Hole_mesh.mat | 6 +- .../Materials/033_Hole_mesh_highlights.mat | 6 +- .../Materials/033_IndustrialGlass.mat | 6 +- .../033_IndustrialGlass_highlights.mat | 6 +- .../Materials/033_Roofing.mat | 6 +- .../Materials/033_Roofing_highlights.mat | 6 +- .../Materials/033_rocks_dirt_ground.mat | 6 +- .../033_rocks_dirt_ground_highlights.mat | 6 +- .../Materials/034_Hole_mesh.mat | 6 +- .../Materials/034_Hole_mesh_highlights.mat | 6 +- .../Materials/034_IndustrialGlass.mat | 4 +- .../034_IndustrialGlass_highlights.mat | 4 +- .../Materials/034_Roofing.mat | 4 +- .../Materials/034_Roofing_highlights.mat | 4 +- .../Materials/034_basic.mat | 6 +- .../Materials/034_basic_highlights.mat | 6 +- .../Materials/034_rocks_dirt_ground.mat | 6 +- .../034_rocks_dirt_ground_highlights.mat | 6 +- .../Scenes/035_Shader_TerrainShaders/Rock.mat | 6 +- .../035_Shader_TerrainShaders/Terrain.mat | 29 ++++- .../Fern/Materials/Fern 2sided-Fern.mat | 6 +- .../Dots.mat | 6 +- .../Materials/1. Lit - Cutout.mat | 7 +- .../037_Particles/Materials/1. Lit - Fade.mat | 5 +- .../Materials/1. Lit - Shadow - Cutout.mat | 7 +- .../Materials/1. Lit - Shadow - Fade.mat | 5 +- .../Materials/1. Lit - Shadow - Opaque.mat | 7 +- .../1. Lit - Shadow - Transparent.mat | 5 +- .../Materials/2. Unlit - Additive.mat | 6 +- .../2. Unlit - Camera Fading - Fade.mat | 4 +- ...2. Unlit - Camera Fading - Transparent.mat | 4 +- .../Materials/2. Unlit - Modulate.mat | 4 +- .../2. Unlit - Soft Particles - Fade.mat | 4 +- .... Unlit - Soft Particles - Transparent.mat | 4 +- .../Materials/2. Unlit - Subtractive.mat | 4 +- .../Materials/3. Lit - Additive.mat | 4 +- .../Materials/3. Lit - Color.mat | 4 +- .../Materials/3. Lit - Difference.mat | 4 +- .../Materials/3. Lit - Multiply.mat | 4 +- .../Materials/3. Lit - Overlay.mat | 4 +- .../Materials/3. Lit - Subtractive.mat | 4 +- .../Materials/4. Lit - Opaque.mat | 7 +- .../Materials/5. Lit - Two Sided.mat | 7 +- .../Materials/5. Unlit - Two Sided.mat | 6 +- .../6. Lit - Flip Book Simple - Fade.mat | 5 +- .../6. Unlit - Flip Book Blended - Fade.mat | 4 +- .../Materials/7. Lit - Transparent.mat | 5 +- .../Materials/8. Lit - Distortion.mat | 4 +- .../Scenes/037_Particles/Materials/Plane.mat | 6 +- .../CurrentMaterials/ArchesMaterial.mat | 6 +- .../CurrentMaterials/BloxMaterial.mat | 6 +- .../CurrentMaterials/ClockGlassMaterial.mat | 6 +- .../CurrentMaterials/ClockMaterial.mat | 6 +- .../CurrentMaterials/DollhouseMaterial.mat | 6 +- .../CurrentMaterials/DrawersMaterial.mat | 6 +- .../CurrentMaterials/EyesMaterial.mat | 6 +- .../FlareParticleMaterial.mat | 6 +- .../FluffParticleMaterial.mat | 6 +- .../CurrentMaterials/GunMaterial.mat | 6 +- .../CurrentMaterials/HearseMaterial.mat | 6 +- .../CurrentMaterials/HellephantMaterial.mat | 6 +- .../CurrentMaterials/PlanksMaterial.mat | 6 +- .../CurrentMaterials/PlayerMaterial.mat | 6 +- .../CurrentMaterials/RobotMaterial.mat | 6 +- .../CurrentMaterials/SpinningTopMaterial.mat | 6 +- .../CurrentMaterials/StarMaterial.mat | 6 +- .../CurrentMaterials/TrainMaterial.mat | 6 +- .../CurrentMaterials/WallMaterial.mat | 6 +- .../CurrentMaterials/ZombearMaterial.mat | 6 +- .../CurrentMaterials/ZombunnyMaterial.mat | 6 +- .../Materials/New Material.mat | 6 +- .../044_ReflectionProbe.mat | 6 +- .../044_ReflectionProbeRough.mat | 6 +- .../044_ReflectionProbeTextured.mat | 6 +- .../044_ReflectionProbeTextured_rough.mat | 4 +- .../CallbackTestRenderer.asset | 4 + .../053_UnlitShader/unlit shader red GI.mat | 6 +- .../unlit shader red no GI.mat | 6 +- .../053_UnlitShader/unlit shader white GI.mat | 6 +- .../2D_Renderer_Shader_Compatibility.asset | 27 +++-- .../Materials/BakedLit.mat | 3 +- .../Materials/DefaultLit.mat | 3 +- .../Materials/DefaultSimple.mat | 3 +- .../Materials/DefaultUnlit.mat | 3 +- .../Materials/Materials/GreenRock01.mat | 5 +- .../Materials/ParticlesLit.mat | 3 +- .../Materials/ParticlesSimple.mat | 3 +- .../Materials/ParticlesUnlit.mat | 3 +- .../109_CameraTargetTexture.mat | 5 +- .../BottomLeftTexture.mat | 5 +- .../BottomRightTexture.mat | 5 +- .../TopLeftTexture.mat | 5 +- .../TopRightTexture.mat | 5 +- .../Assets/Scenes/126_SampleDepth/unlit.mat | 92 +++++++++++++++ .../ProjectSettings/URPProjectSettings.asset | 2 +- .../SampleScene/DefaultMaterial.mat | 5 +- .../Shadergraph/SampleScene/EmissiveRed.mat | 5 +- .../ProjectSettings/URPProjectSettings.asset | 2 +- .../CHANGELOG.md | 1 + .../MaterialPostprocessor.cs | 9 +- .../Editor/ShaderGUI/BaseShaderGUI.cs | 111 +++++++++--------- .../Runtime/Materials/Lit.mat | 5 +- .../{ParticlesLit.mat => ParticlesUnlit.mat} | 6 +- ...esLit.mat.meta => ParticlesUnlit.mat.meta} | 0 .../Runtime/Materials/SimpleLit.mat | 6 +- .../Runtime/Materials/TerrainLit.mat | 3 +- 305 files changed, 2283 insertions(+), 798 deletions(-) create mode 100644 TestProjects/SRP_SmokeTest/ProjectSettings/URPProjectSettings.asset create mode 100644 TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/LitInstanced.mat create mode 100644 TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/SimpleLitInstanced.mat create mode 100644 TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/UnlitInstanced.mat create mode 100644 TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Lit.mat create mode 100644 TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/SimpleLit.mat create mode 100644 TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Unlit.mat create mode 100644 TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/LitInstanced.mat create mode 100644 TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/SimpleLitInstanced.mat create mode 100644 TestProjects/ShaderGraphUniversalStereo/ProjectSettings/URPProjectSettings.asset create mode 100644 TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_PBR.mat create mode 100644 TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_Unlit.mat create mode 100644 TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/Smooth.mat create mode 100644 TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_Realtime_ReflectionProbe/Smooth_NormalMap.mat create mode 100644 TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth/unlit.mat create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepth/unlit.mat rename com.unity.render-pipelines.universal/Runtime/Materials/{ParticlesLit.mat => ParticlesUnlit.mat} (98%) rename com.unity.render-pipelines.universal/Runtime/Materials/{ParticlesLit.mat.meta => ParticlesUnlit.mat.meta} (100%) diff --git a/TestProjects/SRP_SmokeTest/ProjectSettings/URPProjectSettings.asset b/TestProjects/SRP_SmokeTest/ProjectSettings/URPProjectSettings.asset new file mode 100644 index 00000000000..91791f36dfa --- /dev/null +++ b/TestProjects/SRP_SmokeTest/ProjectSettings/URPProjectSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: 247994e1f5a72c2419c26a37e9334c01, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LastMaterialVersion: 2 diff --git a/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/LitInstanced.mat b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/LitInstanced.mat new file mode 100644 index 00000000000..984fb14e1e7 --- /dev/null +++ b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/LitInstanced.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-646386980306967801 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LitInstanced + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/SimpleLitInstanced.mat b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/SimpleLitInstanced.mat new file mode 100644 index 00000000000..4bebec739eb --- /dev/null +++ b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/SimpleLitInstanced.mat @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-646386980306967801 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SimpleLitInstanced + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossinessSource: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/UnlitInstanced.mat b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/UnlitInstanced.mat new file mode 100644 index 00000000000..2140cf26c2d --- /dev/null +++ b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/UnlitInstanced.mat @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-646386980306967801 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UnlitInstanced + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraph/ProjectSettings/URPProjectSettings.asset b/TestProjects/ShaderGraph/ProjectSettings/URPProjectSettings.asset index fa89832b363..91791f36dfa 100644 --- a/TestProjects/ShaderGraph/ProjectSettings/URPProjectSettings.asset +++ b/TestProjects/ShaderGraph/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 1 + m_LastMaterialVersion: 2 diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Lit.mat b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Lit.mat new file mode 100644 index 00000000000..95f5531fa7f --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Lit.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2548804055186137174 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Lit + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/SimpleLit.mat b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/SimpleLit.mat new file mode 100644 index 00000000000..4c3b3fbceb9 --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/SimpleLit.mat @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2548804055186137174 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SimpleLit + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossinessSource: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Unlit.mat b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Unlit.mat new file mode 100644 index 00000000000..81f0b46b02d --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Unlit.mat @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2548804055186137174 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Unlit + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/LitInstanced.mat b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/LitInstanced.mat new file mode 100644 index 00000000000..984fb14e1e7 --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/LitInstanced.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-646386980306967801 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LitInstanced + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/SimpleLitInstanced.mat b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/SimpleLitInstanced.mat new file mode 100644 index 00000000000..4bebec739eb --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/SimpleLitInstanced.mat @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-646386980306967801 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SimpleLitInstanced + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossinessSource: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/URPProjectSettings.asset b/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/URPProjectSettings.asset new file mode 100644 index 00000000000..91791f36dfa --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/URPProjectSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: 247994e1f5a72c2419c26a37e9334c01, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LastMaterialVersion: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/001_SimpleCube.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/001_SimpleCube.mat index 0e39b649984..497be713fba 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/001_SimpleCube.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/001_SimpleCube.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +116,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.97058815, g: 0.97058815, b: 0.97058815, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box.mat index 938014eed21..b24c6a22175 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_green.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_green.mat index 03bcd57373a..81caf9eabc0 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_green.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_green.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &231368138080592282 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,4 +117,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_red.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_red.mat index c30e578a290..4eb4861cce1 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_red.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_red.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Gray Unlit.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Gray Unlit.mat index 69209758c40..069692214fd 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Gray Unlit.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Gray Unlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Diffuse.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Diffuse.mat index 8ba64189d2c..62595123d00 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Diffuse.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Diffuse.mat @@ -13,7 +13,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -100,3 +100,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Material.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Material.mat index a47ffab1415..6e3e5eb099c 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Material.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Material.mat @@ -13,7 +13,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,3 +108,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Red Unlit.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Red Unlit.mat index 8a3f866a1ad..99cef7f9f99 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Red Unlit.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Red Unlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/red_paint.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/red_paint.mat index cfb2a9353af..2c4a24d27b0 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/red_paint.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/red_paint.mat @@ -13,7 +13,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +121,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat index 06b62ba0a69..a587867d969 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat index af372519243..56b8ae69150 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat index c3983a22b24..864d055253f 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.38235295, g: 0.8722108, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat index 73fb4efe541..b07e136176a 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.38235295, g: 0.8722108, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat index 259eea2234a..b52f3a837b4 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -99,6 +99,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &214017953261494582 MonoBehaviour: m_ObjectHideFlags: 11 @@ -108,8 +109,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat index 18c576fdb5e..837b213acd1 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip/002_CameraClip_Sphere.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip/002_CameraClip_Sphere.mat index a30232de434..9e3ce888d22 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip/002_CameraClip_Sphere.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip/002_CameraClip_Sphere.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat index 134a987da21..f7ea805a601 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat index e84cf27eff1..5f622419ffb 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -86,6 +86,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] --- !u!114 &4901046320368005149 MonoBehaviour: m_ObjectHideFlags: 11 @@ -95,8 +96,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat index 928e6ee6bf5..f5238a1fa02 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1148464917096585531 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_03_Specular.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_03_Specular.mat index 3540628ed48..d873b66b9c1 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_03_Specular.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_03_Specular.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_04_Normal.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_04_Normal.mat index 27320d3331e..65e96bae030 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_04_Normal.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_04_Normal.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.182} + m_BuildTextureStacks: [] --- !u!114 &5624294885565558276 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_05_Emission.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_05_Emission.mat index bddcd7c773f..fd417fe2723 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_05_Emission.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_05_Emission.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 1, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_06_All.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_06_All.mat index 4ffb6d3fcd9..381c1761081 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_06_All.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_06_All.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0.07386969, g: 0.11979348, b: 0.18867922, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6615595408240019016 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat index 6a1ab338587..691d7fb6147 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +115,4 @@ Material: - _MainColor: {r: 1, g: 1, b: 1, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat index 1f4677df388..c3e98114a0c 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +115,4 @@ Material: - _MainColor: {r: 1, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat index 4cce736cd04..fdbe0778ce8 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat index 40fa596d36f..1b65cb8019e 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat index f58a46b6c07..6d0964420f4 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2195807599642219274 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat index 81ccd1813ea..77654371cd5 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat index 623c39f1212..ab61aee5441 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4968206030522163895 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat index cee0324a62c..f7ae680926f 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat index f1848e70734..11b1d75df5e 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat index dc59238c8bf..2cd36403e72 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat index ee5b3c2a6cc..862b207df4a 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat index 98f0126fe09..d508dd666ae 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat index d5040c7259d..db1a74680a9 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat index 45b8094d82a..acc49649a62 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4650732631101754418 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat index 8d0b067591e..f7b52aead4b 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &5953474538914956738 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat index e11e629edb1..0bb90854e66 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat index 90d1f99e9ac..22b8f71b437 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat index 96624fcc788..95290c5063d 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4243513974690905907 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat index 63c93602da7..3cfb9f784f2 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7489248718814999123 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat index 5eb19fd4673..a0b4f6b5395 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat index a1aa020ed6a..aac487be62a 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4717768852030574692 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat index 6814289a7c1..e5cbf76bb1f 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat index 759cd6b538b..87cebd73cef 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat index fdbdca454f2..266832b7167 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2378779546398475007 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked/CutoutBaked.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked/CutoutBaked.mat index 0f152b0f556..cea1ff24277 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked/CutoutBaked.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked/CutoutBaked.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_PBR.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_PBR.mat new file mode 100644 index 00000000000..3535c05ddf9 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_PBR.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 013_xr_PBR + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &8754966084146806372 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_Unlit.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_Unlit.mat new file mode 100644 index 00000000000..47865c3a26a --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_Unlit.mat @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2643792049807317967 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 013_xr_Unlit + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/Smooth.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/Smooth.mat new file mode 100644 index 00000000000..50edc757240 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/Smooth.mat @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1254135393476062041 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Smooth + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _SPECULAR_SETUP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 1 + - _GlossyReflections: 1 + - _Metallic: 1 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_Realtime_ReflectionProbe/Smooth_NormalMap.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_Realtime_ReflectionProbe/Smooth_NormalMap.mat new file mode 100644 index 00000000000..3d163e7c001 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_Realtime_ReflectionProbe/Smooth_NormalMap.mat @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5159078685894839536 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Smooth_NormalMap + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 2, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 77bf3f5170a004139b83abf58a665c0e, type: 3} + 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: 2, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 2, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 1 + - _GlossyReflections: 1 + - _Metallic: 1 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth/unlit.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth/unlit.mat new file mode 100644 index 00000000000..6d4bf05c435 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth/unlit.mat @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: unlit + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &4553114880188406304 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/ProjectSettings/URPProjectSettings.asset b/TestProjects/UniversalGfxTestStereo/ProjectSettings/URPProjectSettings.asset index fa89832b363..91791f36dfa 100644 --- a/TestProjects/UniversalGfxTestStereo/ProjectSettings/URPProjectSettings.asset +++ b/TestProjects/UniversalGfxTestStereo/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 1 + m_LastMaterialVersion: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Array Element.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Array Element.mat index fa01ec72324..6039b7d1520 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Array Element.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Array Element.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -111,3 +111,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/BW Gradient.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/BW Gradient.mat index 84a427b16e0..a4e45e6b56e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/BW Gradient.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/BW Gradient.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -265,6 +265,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6722335431463595756 MonoBehaviour: m_ObjectHideFlags: 11 @@ -277,4 +278,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/CeramicTiles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/CeramicTiles.mat index b5ba3f4413b..a2b3abeeafc 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/CeramicTiles.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/CeramicTiles.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Challenge-Brick.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Challenge-Brick.mat index fce310bf93a..40d56ee5116 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Challenge-Brick.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Challenge-Brick.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2253018316625577987 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box.mat index 938014eed21..b24c6a22175 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_green.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_green.mat index 03bcd57373a..67a623cee86 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_green.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_green.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &231368138080592282 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_red.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_red.mat index c30e578a290..4eb4861cce1 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_red.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_red.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh.mat index 6e4e200c4e1..ecafbbfcc04 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat index d01413ecd0a..bb103aa0e8e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -121,3 +121,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/IndustrialGlass.mat index db05d819676..8e66051f444 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/IndustrialGlass.mat @@ -108,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1816354734817690348 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LDpipe_targetTex.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LDpipe_targetTex.mat index 62110d30939..14a7e7c47a0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LDpipe_targetTex.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LDpipe_targetTex.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +115,4 @@ Material: - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Diffuse.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Diffuse.mat index 833c7599253..0970401e82d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Diffuse.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Diffuse.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -99,3 +99,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat index 80780ccb2fd..f84ae03bfa4 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -126,3 +126,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat index bb1f259a4f0..9a0d58b854c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -126,3 +126,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.45641106, g: 0.45641106, b: 0.45641106, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat index bff4d9b6bbb..8a97c3d0743 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -100,3 +100,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat index 55c68e449ee..d75ac91b50f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -127,3 +127,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat index f84b511964a..38804f5c7e6 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -127,3 +127,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat index 46fd7115056..b80d4249e77 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -100,3 +100,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat index 1d8d4c63eea..c5f36e53045 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -112,3 +112,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat index f9b91326f7f..1f79dfa70f8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -130,3 +130,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat index 0503f98f240..d1662866309 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -131,3 +131,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat index c5db13b53f5..6991ce0f9ca 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -131,3 +131,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat index 963ce394b27..b752a555a69 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -130,3 +130,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat index 152e26447c5..025d9295611 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -113,3 +113,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat index 242aab80523..802e961ceca 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -113,3 +113,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat index 6b4edaaa7c7..431db5f649f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -112,3 +112,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat index 86b55614654..e8a00594861 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -99,3 +99,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Material.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Material.mat index a47ffab1415..e588a24c5da 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Material.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Material.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,3 +107,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticles.mat index 34354c4d787..26635098a88 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticles.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -125,3 +125,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat index 42560360146..0fc88006963 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -125,3 +125,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat index 43fad5f8dab..cad5f6cb8cd 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -108,3 +108,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat index b1b6c10c8a4..dae284e40bd 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -126,3 +126,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat index 1c3f48551c4..51ec8ba431a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -126,3 +126,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat index 5150d43942c..775f7a3e19d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -108,3 +108,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat index b5f87aef6d9..ad80eb4cc03 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,3 +107,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Matte.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Matte.mat index cae81f1fbc9..3b5a1d01fd3 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Matte.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Matte.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -95,6 +95,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1336921032651070000 MonoBehaviour: m_ObjectHideFlags: 11 @@ -104,8 +105,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/PW_WoodLog.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/PW_WoodLog.mat index f6c98d2dc17..93dd6ad8518 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/PW_WoodLog.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/PW_WoodLog.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat index b4b89d5ce23..13d9c834d94 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4097738520251698563 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Roofing.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Roofing.mat index 646964989a0..7c817a455f7 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Roofing.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Roofing.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/ShoreRockSand.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/ShoreRockSand.mat index 757f067c3e3..ac3ac689410 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/ShoreRockSand.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/ShoreRockSand.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &329385301596340264 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/SyntheticColorChart.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/SyntheticColorChart.mat index da2ee3a76f3..f72bd82cf97 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/SyntheticColorChart.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/SyntheticColorChart.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -278,3 +278,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/UnlitColor.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/UnlitColor.mat index 6b7d394ce34..452ac7b3ad2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/UnlitColor.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/UnlitColor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat index 2333408c7d4..b87c0cd5ea5 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -278,3 +278,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat index dfebc63cebe..59ec46b67a5 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -265,6 +265,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &317697389925408209 MonoBehaviour: m_ObjectHideFlags: 11 @@ -277,4 +278,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat index fbadc0489dd..d536d4d3856 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -265,6 +265,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &317697389925408209 MonoBehaviour: m_ObjectHideFlags: 11 @@ -277,4 +278,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/White_Mate.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/White_Mate.mat index e3e4b47e15a..ed31e8a66da 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/White_Mate.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/White_Mate.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -261,6 +261,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &4402007217999009948 MonoBehaviour: m_ObjectHideFlags: 11 @@ -273,4 +274,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/bark.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/bark.mat index 34591767705..b81c6cddd36 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/bark.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/bark.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/herringbone_brick_floor.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/herringbone_brick_floor.mat index 5e96cd828d8..da99c79544c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/herringbone_brick_floor.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/herringbone_brick_floor.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_aluminium_directional.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_aluminium_directional.mat index b545604f908..1a72511f061 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_aluminium_directional.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_aluminium_directional.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_brushed_copper.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_brushed_copper.mat index 2057102592c..57c91adb48a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_brushed_copper.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_brushed_copper.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7345119257614298518 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/red_paint.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/red_paint.mat index cfb2a9353af..d1272ec618a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/red_paint.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/red_paint.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/rocks_dirt_ground.mat index 6491b1feb31..686c1bfc7c2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/rocks_dirt_ground.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1263833708553139920 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat index 06b62ba0a69..a587867d969 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat index af372519243..56b8ae69150 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat index c3983a22b24..864d055253f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.38235295, g: 0.8722108, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat index 73fb4efe541..b07e136176a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.38235295, g: 0.8722108, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat index 259eea2234a..b52f3a837b4 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -99,6 +99,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &214017953261494582 MonoBehaviour: m_ObjectHideFlags: 11 @@ -108,8 +109,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat index 18c576fdb5e..837b213acd1 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat index 87fbdfccbb0..497be713fba 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.97058815, g: 0.97058815, b: 0.97058815, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat index a30232de434..9e3ce888d22 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat index e1a304a6f18..a3568febb5c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat index a667ff5922d..65bb9e2a531 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat @@ -9,7 +9,6 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,6 +116,7 @@ Material: - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] --- !u!114 &6474889523495581265 MonoBehaviour: m_ObjectHideFlags: 11 @@ -126,8 +126,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat index c469310cfc1..0f1dddb2409 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat index 667d7f404aa..df5f55bfb0b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +116,4 @@ Material: - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat index 134a987da21..f7ea805a601 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_emission.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_emission.mat index 7bcea635ae8..7cabcae9284 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_emission.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_emission.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 2.37969, g: 2.37969, b: 2.37969, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1989026644308367711 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat index e84cf27eff1..5f622419ffb 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -86,6 +86,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] --- !u!114 &4901046320368005149 MonoBehaviour: m_ObjectHideFlags: 11 @@ -95,8 +96,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat index 928e6ee6bf5..f5238a1fa02 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1148464917096585531 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat index 3540628ed48..d873b66b9c1 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat index 27320d3331e..65e96bae030 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.182} + m_BuildTextureStacks: [] --- !u!114 &5624294885565558276 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat index bddcd7c773f..fd417fe2723 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 1, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat index 4ffb6d3fcd9..381c1761081 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0.07386969, g: 0.11979348, b: 0.18867922, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6615595408240019016 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat index 6a1ab338587..691d7fb6147 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +115,4 @@ Material: - _MainColor: {r: 1, g: 1, b: 1, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat index 1f4677df388..c3e98114a0c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +115,4 @@ Material: - _MainColor: {r: 1, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/mahogfloor-pbs.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/mahogfloor-pbs.mat index 164e0261826..57fe9caac2f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/mahogfloor-pbs.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/mahogfloor-pbs.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.98039216} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/plasticpattern-pbs.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/plasticpattern-pbs.mat index 4d8bb987790..5b36c750244 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/plasticpattern-pbs.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/plasticpattern-pbs.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 0.15686275} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/redbricks-pbs.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/redbricks-pbs.mat index 93218058c36..baae1dea4ce 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/redbricks-pbs.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/redbricks-pbs.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat index 4cce736cd04..fdbe0778ce8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat index 40fa596d36f..1b65cb8019e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat index f58a46b6c07..6d0964420f4 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2195807599642219274 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat index 81ccd1813ea..77654371cd5 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat index 623c39f1212..ab61aee5441 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4968206030522163895 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat index cee0324a62c..f7ae680926f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat index f1848e70734..11b1d75df5e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat index dc59238c8bf..2cd36403e72 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat index ee5b3c2a6cc..862b207df4a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat index 98f0126fe09..d508dd666ae 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat index d5040c7259d..db1a74680a9 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat index 45b8094d82a..acc49649a62 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4650732631101754418 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat index 8d0b067591e..f7b52aead4b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &5953474538914956738 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat index e11e629edb1..0bb90854e66 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat index 90d1f99e9ac..22b8f71b437 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat index 96624fcc788..95290c5063d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4243513974690905907 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat index 63c93602da7..3cfb9f784f2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7489248718814999123 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat index 5eb19fd4673..a0b4f6b5395 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat index a1aa020ed6a..aac487be62a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4717768852030574692 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat index 6814289a7c1..e5cbf76bb1f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat index 759cd6b538b..87cebd73cef 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat index fdbdca454f2..266832b7167 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2378779546398475007 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat index e50a0978eb1..77385086edd 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,3 +105,4 @@ Material: - _Color: {r: 0, g: 0.08965492, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat index 13da5e2208a..759ebe06f2f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,3 +105,4 @@ Material: - _Color: {r: 0, g: 1, b: 0.17241383, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat index 7465fc02629..bce09e5dc3d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -92,6 +92,7 @@ Material: - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4448076703450405270 MonoBehaviour: m_ObjectHideFlags: 11 @@ -101,8 +102,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat index e338a7635c4..b04cfc9e244 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -92,6 +92,7 @@ Material: - _Color: {r: 1, g: 0.9724138, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &3704495100615245849 MonoBehaviour: m_ObjectHideFlags: 11 @@ -101,8 +102,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/014_CameraMulti_MiniMap/red.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/014_CameraMulti_MiniMap/red.mat index dc2ec0be0d6..2fc6afb041b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/014_CameraMulti_MiniMap/red.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/014_CameraMulti_MiniMap/red.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,3 +105,4 @@ Material: - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat index f1f9982eb92..267532050f8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -92,6 +92,7 @@ Material: - _Color: {r: 0, g: 0.13103485, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7520433432322078338 MonoBehaviour: m_ObjectHideFlags: 11 @@ -101,8 +102,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/red.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/red.mat index 1c37847ca60..4efef01527e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/red.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/red.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,3 +105,4 @@ Material: - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat index 0f152b0f556..cea1ff24277 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat index b07f3100a40..41c86a85d21 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7216049310591378603 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat index 0c122c66437..71c7fc4be11 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1290122637615856472 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat index db4f4b51e91..fe1850b05aa 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4313290387182987576 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat index d2101fd2802..b1fd6f40931 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 1.6624746, b: 1.0588236, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat index 0f6c96c9e84..5f80e65a281 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6469696794627641041 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat index 5ea82b308bd..f16f2dfad78 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat index b28871559f4..568f7736a4f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &391571561504505556 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat index 73b91ee48c5..eeea87a1f1e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1303672152882122231 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat index 96ba887a1c3..00520169558 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat index a4aa89ff07d..5cdb2ee4b17 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat index 026bffe00aa..09d84f16881 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6562641413808166721 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh.mat index 7f79eb37d7f..3607940a155 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &8366807865063943512 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh_gloss.mat index 21c98cc1ff2..872a62530bd 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh_gloss.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat index 321cb9b6129..f1db5b1091d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -122,3 +121,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass_gloss.mat index e8c3cd11d96..9cd4a196535 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass_gloss.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7888827194497951473 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing.mat index 09b167ac8db..995e013503e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing.mat @@ -9,11 +9,12 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 031_Roofing m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP + m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP + _OCCLUSIONMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1033830812834852596 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing_gloss.mat index adb097be072..90f3c8673c8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing_gloss.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7760970516850343107 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground.mat index 4c843e1bd3b..34ce641f7e9 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground.mat @@ -9,11 +9,12 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 031_rocks_dirt_ground m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP + m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP + _OCCLUSIONMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7615336496678759994 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground_gloss.mat index 48a2e76114f..d68d64ba34a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground_gloss.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7517772181644380721 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh.mat index 021e3deaa1b..8afcc3d2123 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh_gloss.mat index cd9da1c3972..34884e33e2c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh_gloss.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass.mat index 22e37d862b7..5590102704b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass_gloss.mat index 6251dc7abfa..5e8a7a1a421 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass_gloss.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing.mat index 410f6779b4b..673d89a6c19 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing.mat @@ -9,11 +9,12 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 032_Roofing m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP + m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP + _OCCLUSIONMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1429075521766613134 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing_gloss.mat index 9547541e84d..b4652928723 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing_gloss.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground.mat index 1b7a4e221d6..67719c5a78b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground.mat @@ -9,11 +9,12 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 032_rocks_dirt_ground m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP + m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP + _OCCLUSIONMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4026353311599070343 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground_gloss.mat index 1bae6b6789a..dec27ee5b89 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground_gloss.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2931395071271964285 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh.mat index cc72dcfd04a..7cd43019c18 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &860780029588167018 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh_highlights.mat index 0d37286a501..c6560c649c5 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh_highlights.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1654177241399515973 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass.mat index bca70e0e1ad..b6ad362b427 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass_highlights.mat index b2becf7c2fb..e418fc26cc2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass_highlights.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1094090493879525788 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing.mat index 1e97f700ec7..21355ee22e0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &5005052061151087845 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing_highlights.mat index ec5bb092a38..e927dedfa63 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing_highlights.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground.mat index 213937d44f8..e2b7d8c8dc0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground_highlights.mat index 44466179e47..c40a423c0de 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground_highlights.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6208861177992375556 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat index c1a0a25841d..a1fa74a5e08 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat index 4aceb8b24d8..36a95352638 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6656868026772058311 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat index 0840259c616..d3b18ea1981 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat @@ -108,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1713885918665958580 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat index 8fe9fb72371..bbd0af38415 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -122,3 +121,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat index 17009413f86..35d1d6ca1b8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat @@ -108,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7541821551165332098 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat index 42f629093f4..1eefa700f0f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat @@ -108,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &8368340887267111576 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat index 44e1489fef4..4c012ac6161 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4390171450934998380 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat index f94ea06daa2..910f34c19c5 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &8554096116055619990 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat index d633dd1514a..820197ecd81 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat index cff8b182e61..5b2962d879c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat index 12b833bd141..0950df92b80 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,3 +107,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat index 56dbde66672..c38ee5be645 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -61,6 +60,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Mask0: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask1: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask2: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask3: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -109,20 +124,28 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnableHeightBlend: 0 + - _EnableInstancedPerPixelNormal: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _HeightTransition: 0 - _Metallic: 0 - _Metallic0: 0 - _Metallic1: 0 - _Metallic2: 0 - _Metallic3: 0 - _Mode: 0 + - _NumLayersCount: 1 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Smoothness0: 1 @@ -137,6 +160,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat index e11aa50e4d2..fdd42658059 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,3 +107,4 @@ Material: - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat index b565d86d0ac..505aabbd4ca 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Cutout.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Cutout.mat index f6c241ddd5c..6af72ddb5e2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Cutout.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Cutout.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: @@ -91,6 +91,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 0.864 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -108,6 +109,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &2924155635232868104 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Fade.mat index 077d1acc51f..50be5ae8016 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Fade.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -106,6 +105,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 0.864 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -123,3 +123,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Cutout.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Cutout.mat index 981cbd9e1c1..5a99dc879ed 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Cutout.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Cutout.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: @@ -105,6 +104,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 0.864 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -122,3 +122,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Fade.mat index 6a7abdc80eb..6adbf9e36fc 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Fade.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -106,6 +105,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 0.864 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -123,3 +123,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Opaque.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Opaque.mat index 1a21fac251d..28e69907fff 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Opaque.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Opaque.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -91,6 +91,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -108,6 +109,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.8965521, g: 2, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &5130783043215099687 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Transparent.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Transparent.mat index a63bf230dda..666ac239d6f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Transparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Transparent.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -107,6 +106,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -126,3 +126,4 @@ Material: - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Additive.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Additive.mat index 588b9758597..bde6b6bcfc8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Additive.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Additive.mat @@ -97,7 +97,7 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 @@ -109,6 +109,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &7595174566679455379 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Fade.mat index 4c84e39632c..d9778f14e28 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Fade.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -123,3 +122,4 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Transparent.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Transparent.mat index 99b77b33d21..da573b5823b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Transparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Transparent.mat @@ -109,6 +109,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &1119655945628308448 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Modulate.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Modulate.mat index cdcc3db0b14..47f2a43a440 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Modulate.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Modulate.mat @@ -109,6 +109,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &4158709294018868473 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Fade.mat index 32a9b90cb0b..0ddb7e98a55 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Fade.mat @@ -109,6 +109,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &6816448251434543432 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Transparent.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Transparent.mat index 3aaa50c3d7f..68570243d61 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Transparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Transparent.mat @@ -110,6 +110,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &1651253450045955903 MonoBehaviour: m_ObjectHideFlags: 11 @@ -119,8 +120,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Subtractive.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Subtractive.mat index b79d9f3cd6f..3292f22daa0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Subtractive.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Subtractive.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -123,3 +122,4 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Additive.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Additive.mat index 034ab7196b4..30bf83a2241 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Additive.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Additive.mat @@ -108,6 +108,7 @@ Material: - _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &4512445395021624393 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Color.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Color.mat index 9e882c938a7..8aa8e499653 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Color.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Color.mat @@ -108,6 +108,7 @@ Material: - _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &5018780211658097140 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Difference.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Difference.mat index d21e72c89fc..7c11aaa0b9b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Difference.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Difference.mat @@ -108,6 +108,7 @@ Material: - _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &3407332257721997827 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Multiply.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Multiply.mat index 65f50b82c2d..d79d25c722b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Multiply.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Multiply.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -122,3 +121,4 @@ Material: - _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Overlay.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Overlay.mat index 72d8c47a453..f0da479ec08 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Overlay.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Overlay.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -122,3 +121,4 @@ Material: - _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Subtractive.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Subtractive.mat index 79c7e39d8b5..4f5f2a957c4 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Subtractive.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Subtractive.mat @@ -108,6 +108,7 @@ Material: - _ColorAddSubDiff: {r: -1, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &607434661605134500 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/4. Lit - Opaque.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/4. Lit - Opaque.mat index 458d83ad9a3..675511b8e4b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/4. Lit - Opaque.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/4. Lit - Opaque.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -91,6 +91,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -109,6 +110,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.8965521, g: 2, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &6769237588484150783 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +120,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Lit - Two Sided.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Lit - Two Sided.mat index b56705734d1..4fcd2e30d0a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Lit - Two Sided.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Lit - Two Sided.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -106,6 +105,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -126,3 +126,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Unlit - Two Sided.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Unlit - Two Sided.mat index ffe9cb7fc2e..7a8db0d3ddd 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Unlit - Two Sided.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Unlit - Two Sided.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -108,6 +108,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &3441735669689148505 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Lit - Flip Book Simple - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Lit - Flip Book Simple - Fade.mat index 4bbd7620069..e958f07cb7e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Lit - Flip Book Simple - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Lit - Flip Book Simple - Fade.mat @@ -92,6 +92,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 0.806 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -109,6 +110,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &5803572847513578147 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +120,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Unlit - Flip Book Blended - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Unlit - Flip Book Blended - Fade.mat index e5eb78ccd8b..c8bbcb83165 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Unlit - Flip Book Blended - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Unlit - Flip Book Blended - Fade.mat @@ -109,6 +109,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &7046824391579358999 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/7. Lit - Transparent.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/7. Lit - Transparent.mat index 22829fd2565..2d033b0f864 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/7. Lit - Transparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/7. Lit - Transparent.mat @@ -92,6 +92,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -109,6 +110,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &6591741492913736838 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +120,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/8. Lit - Distortion.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/8. Lit - Distortion.mat index e3729e19e9a..192982ad3b2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/8. Lit - Distortion.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/8. Lit - Distortion.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -123,3 +122,4 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/Plane.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/Plane.mat index aaeeecec7b7..3ccdf3c0dae 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/Plane.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/Plane.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -98,6 +98,7 @@ Material: - _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6319853491600825126 MonoBehaviour: m_ObjectHideFlags: 11 @@ -107,8 +108,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat index 9e32ec86b45..0aed0c34a28 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.33823532, g: 0.33823532, b: 0.33823532, a: 1} - _SpecularColor: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat index fa26848a26f..b6cfb1c256a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.21568628, g: 0.21568628, b: 0.21568628, a: 1} - _SpecularColor: {r: 0.25490198, g: 0.25490198, b: 0.25490198, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat index a2362854c68..3ae7efaf79a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -126,3 +125,4 @@ Material: - _ReflectColor: {r: 1, g: 1, b: 1, a: 0.5} - _SpecColor: {r: 1, g: 1, b: 1, a: 0} - _SpecularColor: {r: 0.23921569, g: 0.23921569, b: 0.23921569, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat index 9e28205765c..648f60cbeda 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat index 362b8b1e57b..8ad8ee5b08b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,6 +106,7 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4430986222480757237 MonoBehaviour: m_ObjectHideFlags: 11 @@ -115,8 +116,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat index 4d817e597fc..ed27998f0a0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,6 +106,7 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.41911763, g: 0.41911763, b: 0.41911763, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &987105362078538165 MonoBehaviour: m_ObjectHideFlags: 11 @@ -115,8 +116,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat index 681416aaf0e..cebdeec3c7a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,6 +108,7 @@ Material: - _RimColor: {r: 0.2, g: 0.2, b: 0.2, a: 0} - _SpecColor: {r: 0.5960784, g: 0.5960784, b: 0.5960784, a: 1} - _SpecularColor: {r: 0.49264705, g: 0.49264705, b: 0.49264705, a: 1} + m_BuildTextureStacks: [] --- !u!114 &8571290814737199059 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat index 6b5b579b01a..3625907bb51 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat @@ -64,7 +64,7 @@ Material: - _SoftParticlesEnabled: 0 - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - - _SrcBlend: 1 + - _SrcBlend: 5 - _Surface: 1 - _ZWrite: 0 m_Colors: @@ -76,6 +76,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 1, g: 1, b: 1, a: 0.5019608} + m_BuildTextureStacks: [] --- !u!114 &4710356110149861696 MonoBehaviour: m_ObjectHideFlags: 11 @@ -85,8 +86,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat index 3f3758afc91..d40700599b0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -114,3 +113,4 @@ Material: - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat index 085518b0571..bce267c639b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat index 9a79fb72f92..14c72941cc2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat index 9ac01c0867b..4250c83673f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -134,3 +133,4 @@ Material: - _RimColor: {r: 0.19007264, g: 0.18425605, b: 0.35294116, a: 0} - _SpecColor: {r: 0.283737, g: 0.2845931, b: 0.30147058, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat index c7ac17bbf6d..1a3c7ea2000 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,6 +106,7 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1} + m_BuildTextureStacks: [] --- !u!114 &5984242074890382976 MonoBehaviour: m_ObjectHideFlags: 11 @@ -115,8 +116,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat index 040a3b082c3..50d3ded3936 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.25, g: 0.21323529, b: 0.21323529, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat index 0428edc61ef..4b7c2709a27 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.20588237, g: 0.20588237, b: 0.20588237, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat index 5a866da23fa..5a38386b725 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,6 +106,7 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.72794116, g: 0.72794116, b: 0.72794116, a: 1} - _SpecularColor: {r: 0.7882353, g: 0.7882353, b: 0.7882353, a: 1} + m_BuildTextureStacks: [] --- !u!114 &890071247540972588 MonoBehaviour: m_ObjectHideFlags: 11 @@ -115,8 +116,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat index e01e030b503..85643b6bdc7 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -126,3 +125,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.5441177, g: 1, b: 0.5661258, a: 1} - _SpecularColor: {r: 0.74264705, g: 0.74264705, b: 0.74264705, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat index 4286e70959e..1035062e175 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.49264705, g: 0.49264705, b: 0.49264705, a: 1} - _SpecularColor: {r: 0.2205882, g: 0.2205882, b: 0.2205882, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat index f57e6abb9d8..3af72a43acc 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,6 +106,7 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.5661765, g: 0.5661765, b: 0.5661765, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4508372676771204003 MonoBehaviour: m_ObjectHideFlags: 11 @@ -115,8 +116,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat index 0da3909226b..73d36801c03 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -122,3 +121,4 @@ Material: - _RimColor: {r: 0.19007264, g: 0.18425605, b: 0.35294116, a: 0} - _SpecColor: {r: 0.283737, g: 0.2845931, b: 0.30147058, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat index a1863b924af..0149a31cd0f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,6 +108,7 @@ Material: - _RimColor: {r: 0.19007264, g: 0.18425605, b: 0.35294116, a: 0} - _SpecColor: {r: 0.283737, g: 0.2845931, b: 0.30147058, a: 1} - _SpecularColor: {r: 0.22794116, g: 0.22794116, b: 0.22794116, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7720935081963420072 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/New Material.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/New Material.mat index 75e48feb87b..3e2cb613eb8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/New Material.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/New Material.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -95,6 +95,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2611509416719530959 MonoBehaviour: m_ObjectHideFlags: 11 @@ -104,8 +105,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat index 2f0edc1d4c4..c5bd7851d22 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,3 +108,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat index 53f162682c2..6a50a2d4db7 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -95,6 +95,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &696773388402950971 MonoBehaviour: m_ObjectHideFlags: 11 @@ -104,8 +105,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat index c73f5999c39..510573e308d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,3 +108,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat index 4d4ebfa588c..bffa774def3 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -110,3 +109,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset b/TestProjects/UniversalGraphicsTest/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset index 38869e48732..63da074ea18 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: - {fileID: 5740704530427184019} + m_RendererFeatureMap: postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} shaders: blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} @@ -21,6 +22,7 @@ MonoBehaviour: screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3} samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -34,6 +36,7 @@ MonoBehaviour: passOperation: 0 failOperation: 0 zFailOperation: 0 + m_ShadowTransparentReceive: 1 --- !u!114 &5740704530427184019 MonoBehaviour: m_ObjectHideFlags: 0 @@ -46,3 +49,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1922bf90be6ebc54da38e96e30f9339a, type: 3} m_Name: NewCameraCallbackTests m_EditorClassIdentifier: + m_Active: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red GI.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red GI.mat index ca7c6dbff8d..a65b926a14e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red GI.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red GI.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,3 +106,4 @@ Material: - _Color: {r: 0.75, g: 0.75, b: 0.75, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red no GI.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red no GI.mat index 71b4b71d2ed..f2b15fa7604 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red no GI.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red no GI.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,3 +106,4 @@ Material: - _Color: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader white GI.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader white GI.mat index 0b4cdbca2cf..6a2b360cf42 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader white GI.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader white GI.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4878811381003065862 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/2D_Renderer_Shader_Compatibility.asset b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/2D_Renderer_Shader_Compatibility.asset index f8181a349f7..27a62933bf3 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/2D_Renderer_Shader_Compatibility.asset +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/2D_Renderer_Shader_Compatibility.asset @@ -13,40 +13,47 @@ MonoBehaviour: m_Name: 2D_Renderer_Shader_Compatibility m_EditorClassIdentifier: m_RendererFeatures: [] + m_RendererFeatureMap: + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 1, z: 0} m_HDREmulationScale: 1 m_LightBlendStyles: - - enabled: 1 - name: Default + - name: Default maskTextureChannel: 0 renderTextureScale: 1 blendMode: 1 customBlendFactors: multiplicative: 0 additive: 0 - - enabled: 0 - name: Blend Style 1 + - name: Blend Style 1 maskTextureChannel: 0 renderTextureScale: 1 blendMode: 1 customBlendFactors: multiplicative: 0 additive: 0 - - enabled: 0 - name: Blend Style 2 + - name: Blend Style 2 maskTextureChannel: 0 renderTextureScale: 1 blendMode: 1 customBlendFactors: multiplicative: 0 additive: 0 - - enabled: 0 - name: Blend Style 3 + - name: Blend Style 3 maskTextureChannel: 0 renderTextureScale: 1 blendMode: 1 customBlendFactors: multiplicative: 0 additive: 0 + m_UseDepthStencilBuffer: 1 + m_DefaultMaterialType: 0 + m_DefaultCustomMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, + type: 2} + m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, + type: 2} + m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, + type: 2} m_ShapeLightShader: {fileID: 4800000, guid: d79e1c784eaf80c4585c0be7391f757a, type: 3} m_ShapeLightVolumeShader: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, type: 3} @@ -54,7 +61,7 @@ MonoBehaviour: m_PointLightVolumeShader: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, type: 3} m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - m_ShadowShader: {fileID: 0} m_ShadowGroupShader: {fileID: 4800000, guid: d33b6d70b14697547ad0dc2d4debb009, type: 3} - m_RemoveSelfShadowShader: {fileID: 0} + m_RemoveSelfShadowShader: {fileID: 4800000, guid: 02e071f10b6a15d4d87dac88ce529302, + type: 3} m_PostProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/BakedLit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/BakedLit.mat index 413bc94840f..49f3258942a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/BakedLit.mat +++ b/TestProjects/UniversalGraphicsTest/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: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultLit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultLit.mat index 0b6aa5cb2ba..643ed1088d0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultLit.mat +++ b/TestProjects/UniversalGraphicsTest/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: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultSimple.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultSimple.mat index bf145a30905..7a22c649e53 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultSimple.mat +++ b/TestProjects/UniversalGraphicsTest/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: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,3 +93,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultUnlit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultUnlit.mat index 04947f4fcbf..858692faf2f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultUnlit.mat +++ b/TestProjects/UniversalGraphicsTest/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: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -90,3 +90,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/Materials/GreenRock01.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/Materials/GreenRock01.mat index c4aadbcf8d1..ef34a797587 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/Materials/GreenRock01.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/Materials/GreenRock01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat index f32894d806a..fd573b69b0b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat @@ -94,6 +94,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &5998429150232711907 MonoBehaviour: m_ObjectHideFlags: 11 @@ -106,4 +107,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat index 1151aa85670..1929090317a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat @@ -95,6 +95,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4963088423575533316 MonoBehaviour: m_ObjectHideFlags: 11 @@ -107,4 +108,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat index 91857fe2d7f..1ce27aca5b7 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat @@ -94,6 +94,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1528233709893421592 MonoBehaviour: m_ObjectHideFlags: 11 @@ -106,4 +107,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat index 051063a94c0..c7a2aebe292 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,6 +117,7 @@ Material: - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] --- !u!114 &6474889523495581265 MonoBehaviour: m_ObjectHideFlags: 11 @@ -129,4 +130,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat index e74fea7faf9..ccabeac1e93 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -76,6 +76,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2549847662200077430 MonoBehaviour: m_ObjectHideFlags: 11 @@ -88,4 +89,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat index 7387d5c926b..a89fc94fb74 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -76,6 +76,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2549847662200077430 MonoBehaviour: m_ObjectHideFlags: 11 @@ -88,4 +89,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat index 24bebcf2bcb..baf206beb9b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -76,6 +76,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2549847662200077430 MonoBehaviour: m_ObjectHideFlags: 11 @@ -88,4 +89,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat index 9f0ec1473fb..ea02191497d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -76,6 +76,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2549847662200077430 MonoBehaviour: m_ObjectHideFlags: 11 @@ -88,4 +89,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepth/unlit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepth/unlit.mat new file mode 100644 index 00000000000..6d4bf05c435 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepth/unlit.mat @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: unlit + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + 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} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &4553114880188406304 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/ProjectSettings/URPProjectSettings.asset b/TestProjects/UniversalGraphicsTest/ProjectSettings/URPProjectSettings.asset index fa89832b363..91791f36dfa 100644 --- a/TestProjects/UniversalGraphicsTest/ProjectSettings/URPProjectSettings.asset +++ b/TestProjects/UniversalGraphicsTest/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 1 + m_LastMaterialVersion: 2 diff --git a/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/DefaultMaterial.mat b/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/DefaultMaterial.mat index 63fa4672710..23b6db1d3ed 100644 --- a/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/DefaultMaterial.mat +++ b/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/DefaultMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat b/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat index 953a7dd94b1..719e8501ebf 100644 --- a/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat +++ b/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 1, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/VisualEffectGraph_LWRP/ProjectSettings/URPProjectSettings.asset b/TestProjects/VisualEffectGraph_LWRP/ProjectSettings/URPProjectSettings.asset index fa89832b363..91791f36dfa 100644 --- a/TestProjects/VisualEffectGraph_LWRP/ProjectSettings/URPProjectSettings.asset +++ b/TestProjects/VisualEffectGraph_LWRP/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 1 + m_LastMaterialVersion: 2 diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 2cb9f6b9670..38c13260731 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue that caused Android GLES to render blank screen when Depth texture was enabled without Opaque texture [case 1219325](https://issuetracker.unity3d.com/issues/scene-is-not-rendered-on-android-8-and-9-when-depth-texture-is-enabled-in-urp-asset) - Metallic slider on the Lit shader is now linear meaning correct values are used for PBR. - Fixed an issue with shadows not being correctly calculated in some shaders. +- URP shaders that contain a priority slider now no longer have an offset of 50 by default. ## [7.3.0] - 2020-03-11 diff --git a/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs b/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs index cea1c576209..43915f47264 100644 --- a/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs +++ b/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs @@ -89,7 +89,7 @@ class MaterialPostprocessor : AssetPostprocessor internal static List s_ImportedAssetThatNeedSaving = new List(); internal static bool s_NeedsSavingAssets = false; - internal static readonly Action[] k_Upgraders = { UpgradeV1 }; + internal static readonly Action[] k_Upgraders = { UpgradeV1, UpgradeV2 }; static internal void SaveAssetsToDisk() { @@ -213,6 +213,13 @@ static void UpgradeV1(Material material, ShaderPathID shaderID) break; } } + + static void UpgradeV2(Material material, ShaderPathID shaderID) + { + // fix 50 offset on shaders + if(material.HasProperty("_QueueOffset")) + BaseShaderGUI.SetupMaterialBlendMode(material); + } } // Upgraders v1 diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGUI/BaseShaderGUI.cs b/com.unity.render-pipelines.universal/Editor/ShaderGUI/BaseShaderGUI.cs index c160aa3194a..1959d4e7534 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGUI/BaseShaderGUI.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderGUI/BaseShaderGUI.cs @@ -408,7 +408,10 @@ public static void SetupMaterialBlendMode(Material material) if (material == null) throw new ArgumentNullException("material"); - bool alphaClip = material.GetFloat("_AlphaClip") == 1; + bool alphaClip = false; + if(material.HasProperty("_AlphaClip")) + alphaClip = material.GetFloat("_AlphaClip") >= 0.5; + if (alphaClip) { material.EnableKeyword("_ALPHATEST_ON"); @@ -418,65 +421,65 @@ public static void SetupMaterialBlendMode(Material material) material.DisableKeyword("_ALPHATEST_ON"); } - var queueOffset = 0; // queueOffsetRange; - if(material.HasProperty("_QueueOffset")) - queueOffset = queueOffsetRange - (int) material.GetFloat("_QueueOffset"); - - SurfaceType surfaceType = (SurfaceType)material.GetFloat("_Surface"); - if (surfaceType == SurfaceType.Opaque) + if (material.HasProperty("_Surface")) { - if (alphaClip) + SurfaceType surfaceType = (SurfaceType) material.GetFloat("_Surface"); + if (surfaceType == SurfaceType.Opaque) { - material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.AlphaTest; - material.SetOverrideTag("RenderType", "TransparentCutout"); + if (alphaClip) + { + material.renderQueue = (int) RenderQueue.AlphaTest; + material.SetOverrideTag("RenderType", "TransparentCutout"); + } + else + { + material.renderQueue = (int) RenderQueue.Geometry; + material.SetOverrideTag("RenderType", "Opaque"); + } + + material.renderQueue += material.HasProperty("_QueueOffset") ? (int) material.GetFloat("_QueueOffset") : 0; + material.SetInt("_SrcBlend", (int) UnityEngine.Rendering.BlendMode.One); + material.SetInt("_DstBlend", (int) UnityEngine.Rendering.BlendMode.Zero); + material.SetInt("_ZWrite", 1); + material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); + material.SetShaderPassEnabled("ShadowCaster", true); } else { - material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.Geometry; - material.SetOverrideTag("RenderType", "Opaque"); - } - material.renderQueue += queueOffset; - material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.One); - material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.Zero); - material.SetInt("_ZWrite", 1); - material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); - material.SetShaderPassEnabled("ShadowCaster", true); - } - else - { - BlendMode blendMode = (BlendMode)material.GetFloat("_Blend"); - var queue = (int) UnityEngine.Rendering.RenderQueue.Transparent; - - // Specific Transparent Mode Settings - switch (blendMode) - { - case BlendMode.Alpha: - material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha); - material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha); - material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); - break; - case BlendMode.Premultiply: - material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.One); - material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha); - material.EnableKeyword("_ALPHAPREMULTIPLY_ON"); - break; - case BlendMode.Additive: - material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha); - material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.One); - material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); - break; - case BlendMode.Multiply: - material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.DstColor); - material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.Zero); - material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); - material.EnableKeyword("_ALPHAMODULATE_ON"); - break; + BlendMode blendMode = (BlendMode) material.GetFloat("_Blend"); + + // Specific Transparent Mode Settings + switch (blendMode) + { + case BlendMode.Alpha: + material.SetInt("_SrcBlend", (int) UnityEngine.Rendering.BlendMode.SrcAlpha); + material.SetInt("_DstBlend", (int) UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha); + material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); + break; + case BlendMode.Premultiply: + material.SetInt("_SrcBlend", (int) UnityEngine.Rendering.BlendMode.One); + material.SetInt("_DstBlend", (int) UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha); + material.EnableKeyword("_ALPHAPREMULTIPLY_ON"); + break; + case BlendMode.Additive: + material.SetInt("_SrcBlend", (int) UnityEngine.Rendering.BlendMode.SrcAlpha); + material.SetInt("_DstBlend", (int) UnityEngine.Rendering.BlendMode.One); + material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); + break; + case BlendMode.Multiply: + material.SetInt("_SrcBlend", (int) UnityEngine.Rendering.BlendMode.DstColor); + material.SetInt("_DstBlend", (int) UnityEngine.Rendering.BlendMode.Zero); + material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); + material.EnableKeyword("_ALPHAMODULATE_ON"); + break; + } + + // General Transparent Material Settings + material.SetOverrideTag("RenderType", "Transparent"); + material.SetInt("_ZWrite", 0); + material.renderQueue += material.HasProperty("_QueueOffset") ? (int) material.GetFloat("_QueueOffset") : 0; + material.SetShaderPassEnabled("ShadowCaster", false); } - // General Transparent Material Settings - material.SetOverrideTag("RenderType", "Transparent"); - material.SetInt("_ZWrite", 0); - material.renderQueue = queue + queueOffset; - material.SetShaderPassEnabled("ShadowCaster", false); } } diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat index 5b4b5a1e9a9..efa3f2495e3 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +120,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesLit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat similarity index 98% rename from com.unity.render-pipelines.universal/Runtime/Materials/ParticlesLit.mat rename to com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat index 083a3aa3fc7..338f67cff91 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesLit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -21,7 +20,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ParticlesLit + m_Name: ParticlesUnlit m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} m_ShaderKeywords: _RECEIVE_SHADOWS_OFF m_LightmapFlags: 4 @@ -124,3 +123,4 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesLit.mat.meta b/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat.meta similarity index 100% rename from com.unity.render-pipelines.universal/Runtime/Materials/ParticlesLit.mat.meta rename to com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat.meta diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat index d3c808511f0..34679c7d969 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -92,6 +92,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] --- !u!114 &2591765247069500558 MonoBehaviour: m_ObjectHideFlags: 11 @@ -101,8 +102,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat index 4d41eb70b7b..7dcf74e9565 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -164,3 +164,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] From c6f080404cec4e328ee683e7201e14d03fe1af83 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 6 Mar 2020 10:55:52 +0100 Subject: [PATCH 18/28] Moved Universal texture formats to GraphicsFormat (#4936) * Moved Universal to GraphicsFormat * Fixed 2D bug * Tabs -> spaces # Conflicts: # com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs --- .../UserSettings/EditorUserSettings.asset | 22 ++++++++++++++++ .../2D/Passes/Utility/Light2DLookupTexture.cs | 20 +++++++------- .../2D/Passes/Utility/RendererLighting.cs | 26 ++++++++----------- .../Passes/ScreenSpaceShadowResolvePass.cs | 7 ++--- .../Runtime/RenderingUtils.cs | 23 +++++++++++++++- .../Runtime/UniversalRenderPipelineCore.cs | 5 ++-- 6 files changed, 71 insertions(+), 32 deletions(-) create mode 100644 TestProjects/UniversalGraphicsTest/UserSettings/EditorUserSettings.asset diff --git a/TestProjects/UniversalGraphicsTest/UserSettings/EditorUserSettings.asset b/TestProjects/UniversalGraphicsTest/UserSettings/EditorUserSettings.asset new file mode 100644 index 00000000000..c01cab83dc9 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/UserSettings/EditorUserSettings.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + lightmappingDeviceAndPlatform: + value: 53 + flags: 0 + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCOverlayIcons: 1 + m_VCAllowAsyncUpdate: 0 diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/Light2DLookupTexture.cs b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/Light2DLookupTexture.cs index a8ee3d59dcd..aab6091d190 100644 --- a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/Light2DLookupTexture.cs +++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/Light2DLookupTexture.cs @@ -1,5 +1,6 @@ using UnityEditor; using System.IO; +using UnityEngine.Rendering.Universal; namespace UnityEngine.Experimental.Rendering.Universal { @@ -12,13 +13,13 @@ static public Texture2D CreatePointLightLookupTexture() { const float WIDTH = 256; const float HEIGHT = 256; - TextureFormat textureFormat = TextureFormat.ARGB32; - if (SystemInfo.SupportsTextureFormat(TextureFormat.RGBAHalf)) - textureFormat = TextureFormat.RGBAHalf; - else if (SystemInfo.SupportsTextureFormat(TextureFormat.RGBAFloat)) - textureFormat = TextureFormat.RGBAFloat; + GraphicsFormat textureFormat = GraphicsFormat.R8G8B8A8_UNorm; + if (RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.SetPixels)) + textureFormat = GraphicsFormat.R16G16B16A16_SFloat; + else if (RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R32G32B32A32_SFloat, FormatUsage.SetPixels)) + textureFormat = GraphicsFormat.R32G32B32A32_SFloat; - s_PointLightLookupTexture = new Texture2D((int)WIDTH, (int)HEIGHT, textureFormat, false); + s_PointLightLookupTexture = new Texture2D((int)WIDTH, (int)HEIGHT, textureFormat, TextureCreationFlags.None); s_PointLightLookupTexture.filterMode = FilterMode.Bilinear; s_PointLightLookupTexture.wrapMode = TextureWrapMode.Clamp; if (s_PointLightLookupTexture != null) @@ -70,8 +71,8 @@ static public Texture2D CreateFalloffLookupTexture() const float WIDTH = 2048; const float HEIGHT = 192; - TextureFormat textureFormat = TextureFormat.ARGB32; - s_FalloffLookupTexture = new Texture2D((int)WIDTH, (int)HEIGHT-64, textureFormat, false); + GraphicsFormat textureFormat = GraphicsFormat.R8G8B8A8_SRGB; + s_FalloffLookupTexture = new Texture2D((int)WIDTH, (int)HEIGHT-64, textureFormat, TextureCreationFlags.None); s_FalloffLookupTexture.filterMode = FilterMode.Bilinear; s_FalloffLookupTexture.wrapMode = TextureWrapMode.Clamp; if (s_FalloffLookupTexture != null) @@ -82,9 +83,6 @@ static public Texture2D CreateFalloffLookupTexture() float lineValue = -baseValue + 1; float exponent = Mathf.Log(lineValue) / Mathf.Log(baseValue); - if (y == HEIGHT - 1) - textureFormat = TextureFormat.ARGB32; - for (int x=0;x m_RenderTextureFormatSupport = new Dictionary(); + static Dictionary m_GraphicsFormatSupport = new Dictionary(); internal static void ClearSystemInfoCache() { m_RenderTextureFormatSupport.Clear(); + m_GraphicsFormatSupport.Clear(); } /// @@ -223,6 +226,24 @@ public static bool SupportsRenderTextureFormat(RenderTextureFormat format) return support; } + /// + /// Checks if a texture format is supported by the run-time system. + /// Similar to , but doesn't allocate memory. + /// + /// The format to look up. + /// The format usage to look up. + /// Returns true if the graphics card supports the given GraphicsFormat + public static bool SupportsGraphicsFormat(GraphicsFormat format, FormatUsage usage) + { + if (!m_GraphicsFormatSupport.TryGetValue(format, out var support)) + { + support = SystemInfo.IsFormatSupported(format, usage); + m_GraphicsFormatSupport.Add(format, support); + } + + return support; + } + /// /// Return the last colorBuffer index actually referring to an existing RenderTarget /// diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs index 342f98f5388..675e3e9eb37 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs @@ -4,6 +4,7 @@ using UnityEngine.Scripting.APIUpdating; using UnityEngine.Experimental.GlobalIllumination; +using UnityEngine.Experimental.Rendering; using Lightmapping = UnityEngine.Experimental.GlobalIllumination.Lightmapping; namespace UnityEngine.Rendering.Universal @@ -274,7 +275,7 @@ static RenderTextureDescriptor CreateRenderTextureDescriptor(Camera camera, floa bool isStereoEnabled, bool isHdrEnabled, int msaaSamples, bool needsAlpha) { RenderTextureDescriptor desc; - RenderTextureFormat renderTextureFormatDefault = RenderTextureFormat.Default; + GraphicsFormat renderTextureFormatDefault = SystemInfo.GetGraphicsFormat(DefaultFormat.LDR); // NB: There's a weird case about XR and render texture // In test framework currently we render stereo tests to target texture @@ -283,7 +284,7 @@ static RenderTextureDescriptor CreateRenderTextureDescriptor(Camera camera, floa if (isStereoEnabled) { desc = XRGraphics.eyeTextureDesc; - renderTextureFormatDefault = desc.colorFormat; + renderTextureFormatDefault = desc.graphicsFormat; } else if (camera.targetTexture == null) { From e85eb8f33a479e395d0727c666ff75af554677b9 Mon Sep 17 00:00:00 2001 From: Andre McGrail Date: Mon, 30 Mar 2020 10:13:59 +0200 Subject: [PATCH 19/28] Dynamic Resolution fix for DOF (#6382) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fixed dynamic resolution issue * added changelog * Added test * added test script to test scene * test images * updated changelog with docs input * Squashed commit of the following: commit e21324451dcd729c08c56daf6676fab823c331c9 Author: Sebastien Lagarde Date: Wed Mar 25 12:12:39 2020 +0100 Fix pack template pipeline - Packages need to be included commit 47cdcf6e13ec170c8a1c27cf912e0028e9d7d816 Author: Sophia <16596228+sophiaaar@users.noreply.github.com> Date: Wed Mar 25 11:56:42 2020 +0100 Bump Graphics Test Framework version in Test projects [skip ci] (#6359) * bump gtf version to 7.1.12-preview * Rename folders in Stereo projects * update hdrp reference image after baking was fixed in test framework commit f1e89417dc96871dfdd4cfa4c76f87aab32f9a33 Author: sebastienlagarde Date: Wed Mar 25 10:58:30 2020 +0100 Add HDRP and URP template to SRP repository [Skip CI] (#6321) * add template on master * Update upm-ci-packages.yml * Update upm-ci-packages.yml * move template yml into another file * fix up templates file * add templates to nightly * add editors and platforms * fix template dependencies * fix dependencies * bump templates version to 9.0.0-preview.2 * remove template ci from nightly Co-authored-by: Sophia commit 3ebd835a23570e72801a59eabbb51b5e41b759bf Author: Paul Demeulenaere Date: Wed Mar 25 10:22:28 2020 +0100 [VFX] Fix Asset Bundle test (#6333) * Fix asset bundle test for PS4/X1 - Use UnityEditor.EditorUserBuildSettings.activeBuildTarget instead of compîlation define - Output assetBundle directly in streaming asset * Fix Yamato (I guess) using Application.streamingAssetsPath in standalone commit 2abcd983aa4eb707a7210946922deece41e56157 Author: UPM-CI <> Date: Wed Mar 25 08:42:40 2020 +0000 Auto bumped package versions: com.unity.render-pipelines.core: 9.0.0-preview.5 com.unity.render-pipelines.high-definition-config: 9.0.0-preview.6 com.unity.render-pipelines.high-definition: 9.0.0-preview.5 com.unity.render-pipelines.lightweight: 9.0.0-preview.6 com.unity.render-pipelines.universal: 9.0.0-preview.6 com.unity.shadergraph: 9.0.0-preview.5 com.unity.visualeffectgraph: 9.0.0-preview.5 commit 6d9df32cc970f7b35f05c7f4d8a568613fb6c3a5 Author: Florian Penzkofer Date: Wed Mar 25 03:37:19 2020 -0500 Check if R16G16B16A16_SFloat is supported before using it (#6358) Co-authored-by: Florian Penzkofer commit 2212ac83ed6184b8c9c06e0575a8e6d4b38a6b39 Author: sebastienlagarde Date: Tue Mar 24 15:32:03 2020 +0100 Merge Hdrp/staging (#6353) * revert: Hdrp/update default scenes (#5485) * Fix issue with missing texture in test * Disable POM test in 1708 SG_OnSG as it is unstable * Add missing texture in runtime test * update caption for geometric normal debug in forward * add missing texture to runtime test * Create Textures.meta * fix SG on decal SG * Fixed an issue where ambient occlusion and screen space reflections editors would generate null ref exceptions when HDRP was not set as the current pipeline. (#5577) * Fixed a null reference exception in the probe UI when no HDRP asset is present. (#5582) * Fixed a null reference exception in the probe UI when no HDRP asset is present. * Indentation Co-authored-by: sebastienlagarde * Fix custom pass outline (#5590) * Fixed custom pass outline resolution screen resolution dependent * Updated changelog Co-authored-by: sebastienlagarde * Fixed a null reference exception in the HDRI Sky editor when no HDRP asset is present. (#5596) Co-authored-by: sebastienlagarde * Fix decal orientation when created from script. (#5592) * Fixed all migration classes to default to latest version so that Decals created by script to get migrated. Fixed decal created through context menu so that they get the proper rotation convention. * Update changelog * Moved the GetEnumLastValue to TypeInfo class * Updated super old test scenes to the proper latest version for decals Co-authored-by: sebastienlagarde * Refactor of HDCamera (accesibility mostly) [Skip CI] (#5548) * Refactor of HDCamera - Made internal/private APIs that should not have been public - Fixed naming convention for private members - Moved everything by accessibility for clarity (public, internal, then private) * Added Doc and returned some API public. * Fix visibility of Density Volumes in reflections [Skip CI] (#5589) * Oblique projection frustum fix, first try * HDCamera frustum now recalculates near and far plane to avoid issues with oblique projection matrices. * Update changelog * Added comments * Indentation * Fixed camera relative position of frustum * Indentation * Fixed a null reference exception in Path Tracing, Recursive Rendering and raytraced Global Illumination editors when no HDRP asset is present. (#5597) Co-authored-by: sebastienlagarde * Fix ray tracing tests and add a test scene for lights and cookies in ray tracing (#5604) * expose StartSinglePass() and StopSinglePass() as public interface for XRPass (#5605) * Add missing custom pass API documentation (#5530) * Add missing custom pass API documentation * Fix doc spells and grammar * Stencil Refactor and Material migration fixes (#5581) * Remove leftover code * commit to switch machine * Remove hard coded stencil values in shaders * clear stencil * tmp commit, start of splitting decal in dbuffer and normal patchup * Make decal patching up run after GBuffer * Remove hardcoded value for SSS split lighting * Tmp commit to switch branch * Finalize build coarse stencil (with debug leftover and render graph NOT handled) * The AA bits (the easy one :-) ) * split in two enums * Distortion vectors bit sorted * SSR bit * Motion vector bit * decals bit * Lighting bits * Use HTile for SSR * HTile SSS -> Incomplete, verify and test. * SSS fixes, but still not working (probably not HTile related, but main stencil) * Make decal patch normal work and remove stencil bit * some leftover fixes * was commited by mistake * Update materials * Revert "Update materials" This reverts commit 4a0de82ef51750b77546020d77ad6b5d773e60af. * Fix issues with MSAA and with migration * Forgot this out * update materials and maps * default materials * don't have SSR on unlit * Fix some leftovers * Renaming * Revert "update materials and maps" This reverts commit 103f1cb71d8fffa49b0c2ef57f1b41b36d0a3dbf. * Revert "default materials" This reverts commit 978740acd825562717a01437dcc0c74fc4cfefb0. * Fix migration * white line * Fix migration * Add render queue overide to the material placer. Also add PackageInfo.cs to HDRP, so the graphic tests can call it's internal methods and objects. * Default material post migration * com.unity.testing.hdrp post reimport * Updated materials from test * Disable tests that are to be updated or not needed anymore * Fix VFX issues (To be fixed better by @PaulDemeulenaere ) * Lit hardcoded default was off * Update VFX Test materials ( @PaulDemeulenaere for awareness ) * Fix issue with stencil in TAA * Revert lighting data * revert light map data * Revert other lighting asset * Cleanup post processor. * Update DXR test material * Update commnets * Early (need testing) new migration workflow * Revert "Early (need testing) new migration workflow" This reverts commit 2db025002d66165dd00e90f5f5d3c944ed53f361. * Update post processor * Add manual option to migrate * Add dialog box Co-authored-by: RemyUnity <32760367+RemyUnity@users.noreply.github.com> * Push updated hdrp version in test project (#5617) * Push m_LastMaterialVersion update * Dont open dialog on yamato * Update test projects with recent stencil refector PR (#5618) * Update runtime test project * Create HDRPProjectSettings.asset * update DXR project * Revert "update caption for geometric normal debug in forward" This reverts commit 150d68279b891529be272b37f374c36b879646f4. * Run reimport during update (to avoid unwanted extra dialog during dialog box) (#5620) * Make user stencil bits public (#5616) * Expose bits to user * Update documentation * Update HDStencilUsage.cs Co-authored-by: sebastienlagarde * Implement history rejection based on object velocity (#5532) * Implement history rejection based on object velocity * Update changelog * Fix an issue with ambient occlusion denoising being broken after adding the history rejection feature Adding the GPU Light type for history validation and rejection Co-authored-by: sebastienlagarde * Fixed initial state of material created through the context menu. (#5603) * Fixed an issue where materials newly created from the contextual menu would have an invalid state, causing various problems until it was edited. * Forgot DecalUI (for non shader graph decals) Co-authored-by: sebastienlagarde * Update HDLightUI.Skin.cs * Cookie and planar atlas (#5518) * Added support for cookie atlas * Begin to move planar reflection into atlas * Added texture atlas for planar reflection probe plus a limit to on screen planar probes * Removed debug log * Fixed planar probe atlas scale issue and useless mipmap generation of the atlas * Refactor Texture2D atlas * Move ScaleBias for planar probes to a separate list * Fix cookie mode for directional lights * Added error log for non square cookie textures in the atlas * Fix merge * Fixed cookie atlas * Trying to fix area light cookies * Fixed area light cookie * Disable mipmap for non area light cookies * Added cookie atlas format control + fixed size warnings in HDRP cookie ui * Add resolution in Capture Settings reflection probe drawer * Removed warnings * Added the point light cookie texture array in the debug menu * Fix cookies in ray tracing + celestial body texture * Update dynamic light cookie screenshot * Update Animated cookie test + fix reflection probe texture format * Fix area light cookie * Update HDRP asset cookie and planar atlas sizes * Increase cookie atlas size for area light test * Simplify code * Fix cookie mip clamp * Fixed compilation and CG alloc * Added atlas layouting when there is no more space * Fix directional light cookie * Updated reference image of cookie area lights * Fix hardcoded format and cookie layout * Remove useless mip update * Fix area light cookie x flip * Added the debug exposure option for debug planar reflection atlas * reverted the fix for area light cookie x flip * Tried to simplify the code of the atlas * Update reference image * Added an error when max planar reflection probe on screen is reached * Fixed space parenthesis * Fixed mipmap not updated properly and area light cookie convolution temp texture format * Fixed atlas reset mips * Update tooltip and fixed cookie insertion order when there is no more space in the atlas * Enable exposure on cookie atlas debug * Fix debug overlap * Update reference image * Added migration code for the cookie atlas size and fixed point light cookie debug exposure * Added planar atlas size upgrade code * Updated planar reflection atlas message * Fixed resolution dependent cookie mip maps * Updated changelog * Fixed cookies for ray tracing * Fix cookie in the ray tracing light loop requested without being reserved * Clamp UV when doing the area light convolution * Update reference images * Remove debug symbols * Fixed area light convolution UV limit * Fixed half pixel clamp and updated reference images * Fixed planar reflection mip map edge bleeding and update reference images * Updated more image reference * Updated DXR cookie test scene * Fix default material transparent created with ZWrite enabled (#5621) * Fixed transparent material craeted with ZWrite enabled * Updated changelog Co-authored-by: sebastienlagarde * Hdrp/fix decal gizmo mouseover (#5626) * Remove controlID on projection direction of DecalProjector that conflict with other handles * Update CHANGELOG.md Co-authored-by: sebastienlagarde * Hdrp/smallfixes lookdev (#5619) * Fix zoom being stuck around 0 * fix crash forbiding view manipulation while using directly hdri without passing by an environment * Fix hitch in FPS displacement mode * Fix when user destroy the EnvironmentLibrary being used. * Update CHANGELOG.md Co-authored-by: sebastienlagarde * Mask was never set for some debug pixel deferred shaders [Skip CI] (#5627) * Mask was never set * changelog * Added comments Co-authored-by: sebastienlagarde * Fixed an issue where creating decals at runtime could cause a null reference exception. (#5594) Co-authored-by: sebastienlagarde * Make APIs internal when they should be - 1 - [Skip CI] (#5531) * First pass of making APIs internal when they should be. * Indentation * Compilation fixes + review feedback. * Make APIs internal when they should be - 2 - [Skip CI] (#5533) * First pass of making APIs internal when they should be. * Indentation * WIP * Missing file * More * Revert some changes based on review feedback * Compilation fix * Compilation fixes + review feedback. * Updated HDUtils accessibility * More editor internals. * Better (not hardcoded) stencil handling in VFX (#5624) * Stencil update for vfx * Fix issues * fix missing templates * Avoid displaying material upgrader dialog on new project (#5631) * Don't run dialog on new project creation * skip only on first creation * Check file existence before showing dialog * typo * Push test materials after ZWrite PR (#5632) * Update HDRP_Test project * Update DXR test assets * Update run time tests * Discard invalid pixels when doing deferred lighting in compute (for camera stacking) (#5339) * Discard invalid pixels when doing deferred lighting in compute (as required for camera stacking) Small comment modification Update changelog * Use stencil buffer (instead of normals) to discard pixels in deferred compute * Remove not required if statement when binding the stencil * Small fixes to API visibility. (#5637) * Fixed some more public APIs to internal. * Made hasCustomRender public again. * Moved the tier defining from the asset to the concerned volume components. (#5519) * Alpha post-processing bugfixes and improvements (#5512) * Bug fix for post processing alpha with chrommatic aberation + minor fixes * Avoid double blending in DOF * Unit tests for alpha post-processing (TAA/DoF) Vulkan test images Vulkan meta files * Fix runtime tests (#5639) * Update runtime test screenshots * Update planar resolution * Add test (#5641) * fix material and project settings for VFX (#5642) * Revert change to GBuffer (normalbuffer usage) as it broke the raytracing code * Fix various issues with time and animated materials (#5480) * Fix various issues with time and animated materials * Changelog * Add getters * Only update time once per frame * Fix animation in reflection * Fix null ref exception * Re-applied code after impossible merge. * Comment change * Remove commented code. Co-authored-by: JulienIgnace-Unity Co-authored-by: sebastienlagarde * fix graphic test (#5651) * renaming test 1901 -> 1451 and 1709 -> 1710 * Update EditorBuildSettings.asset * Update 1710_Decals_Normal_Patch.png * update screenshots * update scene backgroud * Update manifest.json * Update decal patch screenshots * update 4052_TAA * Changing the tier system for a preset mode system and removing unnecessary options (#5646) * Changing from a tier management to a "mode" management for reflection and GI and removing the ability to enable/disable deferred and ray bining (they are now implied by performance mode) * Update the scene scenes * Update changelog * Fixing an instability with the light shadows in ray tracing * Update to light explorer (#5615) - Fixed SkyType display when no Visual Environment is present - Changed fog display to reflect the updated fog system - Changed Global to "Mode" as it is in Volume UI now. Co-authored-by: sebastienlagarde * Update 1710_Decals_Normal_Patch.png * disable TAA test for XR * Hdrp/add documentation tool (#5655) * Add the documentation tool to HDRP test project * Fixed window serialization * Update the documentation for the diffusion profile (#5654) * Update the documentation for the diffusion profile * Update Diffusion-Profile.md Co-authored-by: sebastienlagarde * Add missing hdlight api (useVolumetrics) (#5652) * Add missing API to the HDAdditionalLightData * Updated changelog * Global Settings API doc. (#5649) * Fog Volume Component API doc. (#5645) * Debug Display API doc. (#5643) * Color picker API doc. * FullScreen Debug API doc. * Decal debug API doc * False Color debug API doc * Lighting Debug API doc * Material Debug API doc. * DebugDisplaySettings API doc. * Restored contact shadow fade debug. * API documentation for sky related classes. (#5640) * API documentation for sky related classes. * Document the PBR sky * Hdrp/small wizard fixes for dxr (#5633) * Add ScreenSpaceShadow to Camera's default FrameSettings * Forbid to atmpt creating default scene if the hdrpAsset is not right (we depend on its resources) * Update CHANGELOG.md * Add OS and Hardware check in wizard for DXR * Update CHANGELOG.md * Fixe typos * Add missing check on Shadows * Update Documentation Co-authored-by: sebastienlagarde * Documentation (#5613) Co-authored-by: sebastienlagarde * Fix custom pass disable stencil (#5545) * Disable the strencil in custom passes when overwriting the depth and not writing into it * Updated changelog * Rephrase doc Co-authored-by: sebastienlagarde * Add option to exclude camera motion contribution from motion blur (#5656) * Remove camera component from motion blur if desired * changelog * Documentation update Co-authored-by: sebastienlagarde * Implement Semi-transparent Shadows for Point and Spot lights (#5490) * Make the shadow behavior for transparent and transmissive objects more intuitive. * Update changelog * Implementing semi transparent ray traced shadows for point and spot light Adding a test scene for both cases Moving contact shadow ray tracing code to a seperate file Changing the direction of contact shadow rays to be coherent with the other shadows * update changelog * Update the test scenes Co-authored-by: sebastienlagarde * fix shader warning in termporal AA * Support semi-transparent shadows for unlit shader and unlit shader graph (#5663) * Not doing ray tracing when the stencil bit is off for ssr (#5665) adding a test case for it * Restored serialization of deprecated parameters to fix migration. (#5666) * Shadow Atlas is no longer allocated for area lights when they are disabled in the shader config file. (#5662) Co-authored-by: sebastienlagarde * Updated HDRP documentation (#5664) * Updated HDRP asset doc * Update the upgrade guide for cookies and planars * Added warning in the material sorting priority doc for depth write * Added a section about surface option properties for ShaderGraphs * Fix link name * Alpha output documentation (#5658) * Update documentation for HDRI-Sky-Backplate (AO) (#5670) * Avoid MRT Clear on PS4 [Skip CI] (#5675) * Avoid MRT Clear on PS4 * changelog * Update HDRenderPipeline.cs * Update HDRenderPipeline.cs Co-authored-by: sebastienlagarde * Change name of option (#5681) * More code share between inspector materials (#5635) * Share stencil code for inspector materials (Akin to what happens in shadergraph) * changelog * Add comment and fix issue * Better handling of setting state (if not available, don't write it) * Update BaseLitGUI.cs Co-authored-by: sebastienlagarde * Expose alpha cutoff material for ShaderGraphs (#5667) * Expose alpha clip to material UI for ShaderGraphs * Updated changelog * Replace #if by #ifdef * Fix debug menu bitfield (#5683) * Fixed runtime debug menu bitfield controls * Updated changelog * Hdrp/update default scenes (#5634) * Replace default scenes with scene prepared for scene-template * Update of DefaultSettingsProfile * Update DXR scene * fix missing profile in default scene dxr * Update CHANGELOG.md * Fix missing HDRI Sky references in DXR new scene * Fixed VFX Tests Default volume profile * Changed Default Volume settings to an empty one. * Missing volume asset files + update manifest and meta Co-authored-by: JulienIgnace-Unity Co-authored-by: sebastienlagarde * - Fixed the radius value used for ray traced directional light. (#5682) - Fixed compilation issues with the layered lit in ray tracing shaders. - Changed the way the length parameter is used for ray traced contact shadows. - Added contact shadow test scenes Co-authored-by: sebastienlagarde * fixed XR autotests viewport size rounding (#5684) Co-authored-by: sebastienlagarde * Material samples bis (#5686) * Add ball * update Material samples #5638 * Update CHANGELOG.md * Remove unused version property from Material * Updating the documentation for ray tracing (#5680) * Updating the documentation for ray tracing * review corrections * Fix mip slider reflectionprobe (#5689) * Remove the slider knob when the reflection probe preview has no mipmap * Updated changelog * edit VR documentation (#5685) Co-authored-by: sebastienlagarde * Better directional PCSS blur handling (#5688) * Use correct penumbra calculation for directional. * Update visual test * Need cleaning uo * Cleaning * screenshot update * Small cleanup * typo leftover * changelog Co-authored-by: sebastienlagarde * Update 001-HDTemplate.png * Adding the initial implementation of sub-surface scattering (#5625) * Initial implementation of ray traced sub surface scattering Added a test scene for ray traced sub surface scaterring * Update changelog * Updating the tests * Update 8103_PrePostPass.unity * Remove unnecessary skip of material upgrade dialog box. (#5692) * Remove unnecessary skip of material upgrade dialog box. * Update changelog Co-authored-by: sebastienlagarde * Fix warning after metal fixup (#5704) * Various API doc update. (#5705) * Various doc + FrameSettings WIP * Finished frame settings API doc and added various other missing doc. Also made internal wrongly public API in HDRP * Fix density volume blend distance (#5698) * Fixed adjusting positive axis of Blend Distance slides the negative axis * Updated changelog * edit VR doc (#5699) * Hdrp/wizard update vr installation (#5706) * Add installatation checker in UsedPackageRetriever * Add PackageInstaller * Add better control on the displayed HelpBox * Update VR fixes * fix typo * Move Install Config Package Button above with HDRP Package info * Update CHANGELOG.md * Update documentation Co-authored-by: sebastienlagarde * Removing unused alpha threshold depth prepass and post pass for fabric shader graph (#5711) Co-authored-by: sebastienlagarde * Fix default volume profiles location (#5710) * Ray traced reflection smoothness fade and fallback fixes. (#5700) * Fix fall back for ray traced reflections when denoising is enabled Make Smoothness Fade start work with ray traced reflections Fix the blend of reflections based on the weight Add the contact shadow test scenes back * Change the name of the weight function and add it to all shading models Co-authored-by: sebastienlagarde * Fix iridescence color space (#5691) * Fix iridescence color space * Fixed compilation and updated test screenshots * fix test Co-authored-by: JulienIgnace-Unity * Fix Terrain Detail Mesh (stop to spam) [Require C++ PR] (#5690) * disable support of Terrain Detail Fix for error spam issue in HDRP: https://fogbugz.unity3d.com/f/cases/1211848/ * Update CHANGELOG.md * Update HDRenderPipeline.cs * Update HDRenderPipeline.cs * [Waiting for C++] Disable probes in renderers (#5648) * Disable probes section in the Renderer editors * Updated changelog Co-authored-by: sebastienlagarde * Merge Hdrp/fix/case 1210058 to master (#5612) * Fix for 1210058 - NaNs at certain view angles Issue is caused by NaNs/INFs when computing basis on extremely thin (subpixel-width) geometry. Putting some safeguards fixes the issue * Update CHANGELOG.md to reflect 1210058 fix. * Updated fix for issue #1210058 Overwrite the UVs to fix the derivatives. * Updated fix for issue #1210058 Make sure the UVs are zero if unused to fix the derivatives. * Undo last.change -- UV fix addresses NaNs Zeroing the unused UV1 channel on the material seems to do the trick. * Changelog adjustments to be moved Current version puts everything in HDRP, so there is no change in core. * Update CHANGELOG.md Reflect fix for NaNs * Fixed UV1 for lightmaps and detail maps. * update comment * Update NormalSurfaceGradient.hlsl Co-authored-by: JulienIgnace-Unity Co-authored-by: sebastienlagarde * Minor code cleanup * Added script documentation for SSR, SSAO (ray tracing), GI, Light Cluter, RayTracingSettings, Ray Counters, ray traced SSS andRecursive Rendering. (#5732) * Added script documentation for SSR, SSAO (ray tracing), GI, Light Cluster, RayTracingSettings, Ray Counters, ray traced SSS andRecursive Rendering. * udpate changelog * Implementation of ScreenSpaceReflections for Transparent materials (#4968) Co-authored-by: sebastienlagarde * Fix HDRP duplicated frame settings (#5850) * - Added a fallback for ray traced area light shadows in case the material is forward or the lit mode is forward. (#5749) - Fixed a bug related to ray traced area light shadow history. Co-authored-by: sebastienlagarde * Fix cookie index usage (#5871) * Hdrp/merge staging (#5943) * fix case 1205791 custom mesh issue (#5551) * fic case 1205791 custom mesh issue * Updated changelog * Added a call to Dirty() (#5420) * Added a call to Dirty() * Updated changelog Co-authored-by: Marc Templin * Fix shadergraph analytics. (#5912) * Fix analytics. * Added changelog * Fix for case 1200161 Save as subgraph issue (#5503) * Fix for case 1200161 * Edited CHANGELOG.md * Added comment to the code Co-authored-by: Sharlene Tan <43795986+sharlenet@users.noreply.github.com> Co-authored-by: Marc Templin * fix for unreported keyword bug (#5863) * Fixed fogbugz case 1197958 (#5671) * * Fixed fogbugz case 1197958. * * Updated CHANGELOG.md. * * Added spacing. * Added #if ENABLE_VR && ENABLE_VR_MODULE guard to XR code. * Added Logic to Inject render pass to base renderer (#5901) * Moved render pass injection code from Forward Renderer to ScriptableRenderer to be able to use for all renderers. * added changelog * Disabling the GetDefaultRenderer() test for now until it is redone. (#5924) * [Yamato] [skip ci] Setting up master to run on 2020.1 (#5936) * added 2020.1 and fast to editors * added 2020.1/staging and fast to the rest of the files * [CI] Bors setup (#5841) * Create bors.toml * Update bors.toml * Update bors.toml * Update upm-ci-projects.yml * Create testcommit * Update bors.toml * adding trying trigger * add staging trigger * Delete testcommit * use squash merge * updating job that bors will run * [skip ci] update job that bors will run * Fixed MAD and RCP definitions in OpenGL. (#5922) Co-authored-by: Martin Thorzen <35328557+martint-unity@users.noreply.github.com> Co-authored-by: Marc Templin Co-authored-by: Sharlene Tan <43795986+sharlenet@users.noreply.github.com> Co-authored-by: Zachary Diller Co-authored-by: thomas-zeng <49886741+thomas-zeng@users.noreply.github.com> Co-authored-by: Felipe Lira Co-authored-by: Elvar Örn Unnþórsson Co-authored-by: Liis Kivistik Co-authored-by: Sophia <16596228+sophiaaar@users.noreply.github.com> * Fix whitespace * Misc fixes for the sky (#5974) * Static lighting sky now takes the default volume into account. * Fixed a leak in the PBR sky renderer. * Added a tooltip to the Ambient Mode parameter in the Visual Environment volume component. * Update changelog * Fixed null ref * Fixed an issue where having ambient mode set to dynamic might prevent the sky from being included in baking. * Forces an update of static sky when changing it in the Environment panel. * Fixed a problem with static sky when multiple skies are rendered at the same time. * Revert probes renderer PR (#5990) * Re-enable the probes section of renderers as it was not supposed to be disabled * Updated changelog * Fix a leak in the sky system. (#5967) * Fixed a cubemap leak when rendering previews for the first time. Also changed the debug name of the cubemap used for static lighting. * Update changelog. * Fixed an assert getting fired for the wrong reason. * Added a new light layer debug mode (#5942) * Moved lighting debug settings in containers * Light layers debug mode * Categories for Lighting Debug Panel Documentation * Light layers debug mode documentation * DebugUI.BitField now uses correct display names * Added unit test scene * Added changelog * Revert "Added changelog" This reverts commit a148fc2f97ef5288123f8f16485ba35f57b80f5e. * Updated CHANGELOG * Disable light layer debug mode after testing * reset all debug display settings * Renamed Shadow Layers option * Editable layer color. Defaults to color blind friendly colors * Fix when enabling an exclusive setting * Updated screenshots with new colors * Simplified variable API * Renamed class * Fix division by 0. Updated doc Co-authored-by: Adrien * Hdrp/ssr toggle (#5996) * Added an "enable" checkbox to the SSR volume component. * Update changelog * Fix build when not in editor (#6024) * Fixed SSR in scene 1710 (#6028) * Fix merge error * Removed MSAA Buffers allocation when lit shader mode is set to "deferred only" (#6012) * Removed MSAA Buffers allocation when lit shader mode is set to "deferred only". * Removed MSAA SSS Buffer allocation when deferred only. * Invalid cast for realtime reflection probes (case 1220504) (#6026) * Invalid cast for realtime reflection probes (case 1220504) * Updated changelog Co-authored-by: sebastienlagarde * Aov Buffers tests (#6023) * Deactivate Preview Camera for HDCameraEditor to prevent it from rende… (#6022) * Deactivate Preview Camera for HDCameraEditor to prevent it from rendering in the render loop (case 1105163) * Updated changelog Co-authored-by: sebastienlagarde * Disable reflection probes section (#5994) * Disable reflection probes in the renderer components * Updated changelog * Remove version guard for terrainDetailUnsupported Co-authored-by: sebastienlagarde * Integrate first skeleton of post process in render graph. (#5856) * Fixed execution error without raytracing * Prepare Prepass refacto * Another round of preparation * Renamed XRPassScope to XRSinglePassScope * RenderAfterPostProcess is now static * Add AfterPostProcess to RenderGraph (WIP) * AfterPostProcess implementation * Fixed wrong RTHandle allocation * Fixed light layers texture binding during deferred lighting pass * Implemented Post Process Final Pass with RenderGraph * Post merge fixes * Fixed some issues with missing buffers in SSS and deferred lighting compute shaders. * Fixed alpha in post processes * Fix DXR Tests (#6073) * Made ssr enable parameter true by default. (#6076) * Add comment (#6056) * Hdrp /tests/shuriken light module (#6021) * Add shurikent light module test * Fixed Simulate * Fix texts and image ratio Co-authored-by: sebastienlagarde * Hdrp/pt7 (#5831) * Added support for anisotropy. * Tidied the code up, plus moved to correlated G term for aniso GGX. * Added anisotropic refractive sampling. * Disable path tracing for the shading graph preview camera. * Added support for alpha culling. * Fixed issue with transmission rays. * Updated Changelog. * Added support for punctual and directional light cookies. * Updated Changelog. * Added support for area light cookies. * Fixed bug with area cookies atlas not being properly generated when rebuilding library. * Made sure maxDepth > minDepth always, and added support for AO from mask. * Added support for transparent shadows. * Updated Changelog. * Toggling path tracing on/off does not reset iteration anymore. * Reverted change on enable, was causing minor issues. * Made sure we don't have transparent behaviour when shader is set to opaque. * Minor changes. * Tweaks on transparency behaviour. * Updated changelog. * Added path-tracing specific payload. * Added support for iridescence. * Updated Changelog. * Added multiple scattering compensation for specular. * Added Path tracing test. * PT test part 2. * Updated Changelog. * Added proper area light range attenuation. * Fixed issue with alpha clipping in ray-tracing. * Cosmetic. * Fix on the rect area light range. * In the editor, dragging manipulators around now resets accumulation. * Added material dirtiness tracking. * Does not apply intensity clamping to camera rays. * Reste PT iteration when saving a shader graph. * Added dirtiness tracking for acceleration structure and lights. * Added support for bg color. * Minor change to progress bar display. * Minor change to iteration counter, so that it never goes over the max. * Updated path tracing test. * Hdrp/rendergraph cleanup (#6083) * Fixed execution error without raytracing * Prepare Prepass refacto * Another round of preparation * Renamed XRPassScope to XRSinglePassScope * RenderAfterPostProcess is now static * Add AfterPostProcess to RenderGraph (WIP) * AfterPostProcess implementation * Fixed wrong RTHandle allocation * Fixed light layers texture binding during deferred lighting pass * Implemented Post Process Final Pass with RenderGraph * Post merge fixes * Fixed some issues with missing buffers in SSS and deferred lighting compute shaders. * Fixed alpha in post processes * Removed RenderGraphResource and RenderGraphMutableResource in favor of more explicit RendererListHandle and TextureHandle * Fixed decal normal patch pass * Fixed stencil resolve render pass * Fixed RenderDBuffer render pass function capturing variables. * Fixed wrong variable capture and restored ClearLightList to the render graph implementation of BuildGPULightList * Various fixes of things that diverged compared to regular path. * Unified renderer list and texture invalid handle error. * Revert wrong change * post merge fix * Removed useless comment. * Missing doc * Hdrp /fix light prefab infinite reload on inspector gui (#6054) * fix infinite reload loop for light prefab * Update CHANGELOG.md * Fixed an issue where fog sky color mode could sample NaNs in the sky cubemap (#6027) * Fixed an issue where fog sky color mode could sample NaNs in the sky cubemap. * Update changelog. # Conflicts: # com.unity.render-pipelines.high-definition/CHANGELOG.md * Fixed sampling of the sky texture in a more general way (not just fog) updated tests screenshots as well. * Missing screenshot * Fixed the issue properly by generating 7 mips of convolution. * Reverted screenshots * Reverted useless change. * Fix culling group was not disposed error in the build (#5880) * Fix culling group was not disposed error in build * Fix culling was not disposed error in build * Updated changelog Co-authored-by: sebastienlagarde * Fix Material Samples : Revert correct GUIDs (#5875) * Revert correct GUID Change the GUID of the prefab to the correct one referenced in the scene * Fix fern material GUID * Hdrp/light multiplier (#6077) * Allow the light dimmer to get values higher than one * Changelog Co-authored-by: sebastienlagarde * Update documentation typo (#5860) * Add warning and workaround instructions if XR single-pass is enabled after the first frame with XR SDK (#5853) * added warning and workaround instructions if XR single-pass is enabled after the first frame with XR SDK * edit VR doc * Updated CHANGELOG.md * Updated VR-Overview.md Co-authored-by: sebastienlagarde Co-authored-by: Sharlene Tan <43795986+sharlenet@users.noreply.github.com> * Remove info box on Visual Environment and replaced it with info on documentation (#6099) * Remove info box and update documentation * changelog Co-authored-by: sebastienlagarde * Update 9801_ShurikenLightModule.png * Add missing exposure and mipmap sliders to the planar reflection probe preview (#5847) * Added planar reflection probe preview mip and exposure sliders * Updated changelog * Disable mip map as we don't have them anymore * Re-edited changelog * Use SRP macros in shader Co-authored-by: sebastienlagarde * Fix upgrade cookie planar size (#6104) * Fixed the size of the planar reflection / cookie atlas after an upgrade of the HDRP asset * Updated changelog * Fixing merge issue for SSR transparent * Fix universal and yamato after merge. * fixuniversal after merge * renormalize files * Update 9801_ShurikenLightModule.unity * Make isEditorCameraPreview and sky public (#6147) * Update HDAdditionalCameraData.cs * Update SkySettings.cs * Update 9801_ShurikenLightModule.unity * Update HDAdditionalCameraData.cs * Update 9801_ShurikenLightModule.unity * Fixing ray tracing tests (#6158) * Fixed transparent SSR for shader graph. (#6163) * - Fixed transparent SSR for shader graph. * changelog * Added old graphics tests and modifications (#6143) * Update scenes * update blendstates * added OSX reference images * win reference images * fix lit light difference * Update blendstates-c-lit-unlit * disable check memory alloc due to ref probe issues * update ref images * rename test 1709 to 1711 * rename test 1709 to 1711 - bis Co-authored-by: sebastienlagarde * Fix issue with blend mode and with keyword (#6164) * Fixed an issue with emissive light meshes not being in the RAS (#6174) * Hdrp/pt8 (#6090) * Added support for anisotropy. * Tidied the code up, plus moved to correlated G term for aniso GGX. * Added anisotropic refractive sampling. * Disable path tracing for the shading graph preview camera. * Added support for alpha culling. * Fixed issue with transmission rays. * Updated Changelog. * Added support for punctual and directional light cookies. * Updated Changelog. * Added support for area light cookies. * Fixed bug with area cookies atlas not being properly generated when rebuilding library. * Made sure maxDepth > minDepth always, and added support for AO from mask. * Added support for transparent shadows. * Updated Changelog. * Toggling path tracing on/off does not reset iteration anymore. * Reverted change on enable, was causing minor issues. * Made sure we don't have transparent behaviour when shader is set to opaque. * Minor changes. * Tweaks on transparency behaviour. * Updated changelog. * Added path-tracing specific payload. * Added support for iridescence. * Updated Changelog. * Added multiple scattering compensation for specular. * Added Path tracing test. * PT test part 2. * Updated Changelog. * Added proper area light range attenuation. * Fixed issue with alpha clipping in ray-tracing. * Cosmetic. * Fix on the rect area light range. * In the editor, dragging manipulators around now resets accumulation. * Added material dirtiness tracking. * Does not apply intensity clamping to camera rays. * Reste PT iteration when saving a shader graph. * Added dirtiness tracking for acceleration structure and lights. * Added support for bg color. * Minor change to progress bar display. * Minor change to iteration counter, so that it never goes over the max. * Updated path tracing test. * Added finer estimates of lights during global pdf computation. * Refined light estimates during light list creation. * Updated PT test after changes to light sampling. * Minor change on samples count dirtiness handling. * Cosmetic, plus include guards. * Separated the path intersection structure from the ray tracing one. * Cosmetic, plus taking SSS weight into account to reduce diffuse. * Added SSS support for path tracing, and made some minor changes to the ray-traced version. * Minor code refactor. * ... * ... * Post-merge cleansing. * Fixed minor issues in CreateMaterialData(). * Fixed issue with test framework and resolution change. * Avoid error msg on null instance in PathTracing.cs. * Pathtracer new automated scenes (#6053) * Add global GI automated test scene * Adding transparency test scene * Update max samples of transparency scene to 32 * Added area light test scene / Updating reference image * Transparency scene settings + ref image * Scene added to build (Editor build settings) * Update tranparency image ref * Updating scene to 1 spp and ref image Also moving the asset to common assets folder * Re-added support for unlit shader graph. Co-authored-by: remi-chapelain <57442369+remi-chapelain@users.noreply.github.com> * Update RTSSS Screenshots (#6177) * Fix DX12 and DXR Player build and Updating the test screenshots for DXR player tests (#6130) * Fix DX12 and DXR Player build Updating the test screenshots for DXR player tests * fix shader graph case Co-authored-by: sebastienlagarde * Update CHANGELOG.md * Fix shader compilation issue with Vulkan and Raytracing (#6181) * update path tracing and 1219 test * Fix hdasset migration code not being called after a package upgrade (#6179) * Fix the HDRP asset migration code not being called after a package upgrade * Updated changelog Co-authored-by: sebastienlagarde * Fix custom pass out of bounds (#6176) * Fix draw renderers custom pass out of bound exception * Updated changelog Co-authored-by: sebastienlagarde * Fix PBR master node (#6182) * Fix PBR shader render states * Updated changelog * Fix some typos in the debug menu (#6097) * fix some typos * Revert typo fix that break public API * Changelog * Add regenerated shader includes Co-authored-by: sebastienlagarde * Fixed ray traced point and spot lights shadows not rejecting history when semi-transparent or colored. (#6108) * Fixed ray traced point and spot lights shadows not rejecting history when semi-transparent or colored. * Removing unwanted skip closest hit Co-authored-by: sebastienlagarde * Diffuse Shadow Denoiser Improvement. (#5851) * - Added a new mode that improves the filtering of ray traced shadows (directional, point and spot) based on the distance to the occluder. Added new test scenes to test the denoiser improvement * Update changelog * Fix an issue with the shadow denoiser grabiing data outside of the screen * changing light parameter to internal * Fixed a warning due to StaticLightingSky when reloading domain in some cases. (#6193) * Fixed the MaxLightCount being display when the light volume debug menu is on ColorAndEdge. (#6211) * Fixed the MaxLightCount being display when the light volume debug menu is on ColorAndEdge. * Update com.unity.render-pipelines.high-definition/CHANGELOG.md Co-Authored-By: Motiejus Viltrakis <36502659+iM0ve@users.noreply.github.com> Co-authored-by: sebastienlagarde Co-authored-by: Motiejus Viltrakis <36502659+iM0ve@users.noreply.github.com> * Update documentation to mention more explicitely the lack of support of vertex animation (#6207) * Update documentation to mention more explicitely the lack of support of vertex animation * Update Ray-Tracing-Getting-Started.md Co-authored-by: sebastienlagarde * Make subsection in decal debug menu to specify "affect transparents" (#6200) * Make subsection in decal debug menu * changelog Co-authored-by: sebastienlagarde * Added coverage for Enabled GPU Instanced material (#6183) For light layers automated test * Support cookie on light backing for Disc Area Light (#6138) * Added support for light cookies in the baking backends. * Updated light conversion script to reflect the latest changes made to the API. * Added support for directional light cookie sizes. * Added support for cookies on rectangular area lights. * Enable Area::Disc Light on backing with cookie * Update ChangeLog * Update CHANGELOG.md Co-authored-by: uygar Co-authored-by: sebastienlagarde * Hdrp /lookdev/fix crash on adding volume as viewed game object (#6129) * Update Volume's Layer when moving them to LookDev's stage * Update CHANGELOG.md Co-authored-by: sebastienlagarde * Add smoothness remark (#6226) * Removed unexpected file * Removed legacy VR code from HDRP (#5923) * Removed legacy VR code * do not set CullingOptions.Stereo with xrsdk * re-add and tag previous function signature as obsolete Co-authored-by: sebastienlagarde * Improve light clipping and culling #2 (#4711) * Improve area light culling * Simplify * Clip box lights at the attenuation range * Save 1x ALU * Add missing feature flags * Chanelog Co-authored-by: EvgeniiG <7ee2cc898cca1b5fc49df740c2081dfc681e0a28> Co-authored-by: Sebastien Lagarde * Hdrp/fix/decal material ui errors (#6225) * Fixed error in the console when switching shader to decal in the material UI * Updated changelog Co-authored-by: sebastienlagarde * Fix z-fighting in sceneview when scene lighting is off (#6213) * Do not override the depth state of transparent materials in RenderDebugView * Changelog * Changelog - add case number Co-authored-by: sebastienlagarde * Mention default post processing in default volumes. (#6232) * Fix cubemap inspector so that thumbnail for cubemap work (#6231) * Fix for missing thumbnail on cubemaps * Changelog * Better default angles Co-authored-by: sebastienlagarde * fix ray tracing with VR single-pass (#6242) * - Fix an exception in ray tracing that happens if two LOD levels are using the same mesh renderer. (#6198) Co-authored-by: sebastienlagarde * update location of reference screenshots after merge * Added debug exposure to light hierarchy debug. (#6215) Co-authored-by: sebastienlagarde * - Rejecting history for ray traced reflections based on a threshold evaluated on the neighborhood of the sampled history. (#6251) Co-authored-by: sebastienlagarde * Hdrp/pt9 (#6184) * Added support for anisotropy. * Tidied the code up, plus moved to correlated G term for aniso GGX. * Added anisotropic refractive sampling. * Disable path tracing for the shading graph preview camera. * Added support for alpha culling. * Fixed issue with transmission rays. * Updated Changelog. * Added support for punctual and directional light cookies. * Updated Changelog. * Added support for area light cookies. * Fixed bug with area cookies atlas not being properly generated when rebuilding library. * Made sure maxDepth > minDepth always, and added support for AO from mask. * Added support for transparent shadows. * Updated Changelog. * Toggling path tracing on/off does not reset iteration anymore. * Reverted change on enable, was causing minor issues. * Made sure we don't have transparent behaviour when shader is set to opaque. * Minor changes. * Tweaks on transparency behaviour. * Updated changelog. * Added path-tracing specific payload. * Added support for iridescence. * Updated Changelog. * Added multiple scattering compensation for specular. * Added Path tracing test. * PT test part 2. * Updated Changelog. * Added proper area light range attenuation. * Fixed issue with alpha clipping in ray-tracing. * Cosmetic. * Fix on the rect area light range. * In the editor, dragging manipulators around now resets accumulation. * Added material dirtiness tracking. * Does not apply intensity clamping to camera rays. * Reste PT iteration when saving a shader graph. * Added dirtiness tracking for acceleration structure and lights. * Added support for bg color. * Minor change to progress bar display. * Minor change to iteration counter, so that it never goes over the max. * Updated path tracing test. * Added finer estimates of lights during global pdf computation. * Refined light estimates during light list creation. * Updated PT test after changes to light sampling. * Minor change on samples count dirtiness handling. * Cosmetic, plus include guards. * Separated the path intersection structure from the ray tracing one. * Cosmetic, plus taking SSS weight into account to reduce diffuse. * Added SSS support for path tracing, and made some minor changes to the ray-traced version. * Minor code refactor. * ... * ... * Post-merge cleansing. * Fixed minor issues in CreateMaterialData(). * Fixed issue with test framework and resolution change. * Avoid error msg on null instance in PathTracing.cs. * Pathtracer new automated scenes (#6053) * Add global GI automated test scene * Adding transparency test scene * Update max samples of transparency scene to 32 * Added area light test scene / Updating reference image * Transparency scene settings + ref image * Scene added to build (Editor build settings) * Update tranparency image ref * Updating scene to 1 spp and ref image Also moving the asset to common assets folder * Fog support WIP... * Added support for fog attenuation. * Cosmetic. * Set a maxSampleCount to 1 for tests only in play mode. * Updated Changelog. * Cosmetic. * Take min and max depth into account for fog color. * Make sure we are inside the light cluster when buidling light list. * Simplified signature of RenderPathTracing() func, replaced RaytracingFrameIndex with RaytracingSampleIndex. * Taking max fog distance into account. * Fog max dist part2. * Added a new test scene for the fog * move reference screenshots Co-authored-by: remi-chapelain <57442369+remi-chapelain@users.noreply.github.com> Co-authored-by: Remi Chapelain Co-authored-by: Sebastien Lagarde * Hdrp/volume debug (#6058) * New widget DebugUI.Table * Opened some Volume related API * New volume debug panel * Fixed a bug when debugging editor cameras * Fixed table border color. Updated documentation * Handles inactive and removed components * Don't show deprecated volume components. Sort by name * Revert unwanted modification * Handle disabled volumes * Hides volumes that don't affect the final value * Code documentation * Add range check * Fix player build * Fix volume influence detection * Refresh display when components changes * Fix error on player build * Reduce popping * Use editor camera as anchor point * Select all layers for the scene camera * Un-open profileRef API * Remove ref to profileRef * Proper component name, show text for non supported parameters * Fix profile duplication when using volume debug menu * Updated unsupported parameters message. Show a name as fallback if it exists Co-authored-by: sebastienlagarde * Fixing HDRP_DXR_TEST not having local package at right location (#6107) * Clearer naming of tile and cluster categories for environment lights (#6227) * Rename Environment to Probes * changelog Co-authored-by: sebastienlagarde * Fixed an issue with refraction model and ray traced recursive rendering (case 1198578). (#6267) Co-authored-by: sebastienlagarde * fix for Fogbugz 1214609 - HDRP Wizard addively increases the Light Intesity instead of setting it (#6266) * Fixed an issue where a dynamic sky changing any frame may not update the ambient probe. (#6235) * Fixed an issue where a dynamic sky changing any frame may not update the ambient probe. * Update changelog Co-authored-by: sebastienlagarde * Add XR setting to control camera jitter for temporal effects (#6259) * add XR setting to control camera jitter for temporal effects * cleanup unused code path * revert changes to scenes * Deprecate Utilities namespace (#6219) * (case 1204677) Copied namespace Utility to UnityEngine.Rendering and made it obsolete. * Updated changelog * Updated comment * Updated comment Co-authored-by: sebastienlagarde * Remove deprecated namespace Utilities. [Requires #6219] (#6220) * (case 1204677) Copied namespace Utility to UnityEngine.Rendering and made it obsolete. * Updated changelog * Updated comment * Removal of deprecated API * Updated changelog * Remove deprecated api Co-authored-by: Sebastien Lagarde * Fix issue on thumbnail generation so that no error on new project and thumbnail are generated at first import (#6265) * Fix issue with static preview for cubemap being called without a material initialized * Fix the issue preventing thumbnail to be preserved upon reimport on load * Comment * changelog * Change asset swap to legacy method * comment and white line removal * Fix for baked probe import cycle * Added comment * Oops missing a file Co-authored-by: sebastienlagarde * Add custom pass opaque rendering error message (#6330) * Added an error message when rendering opaque objects with an HDRP asset in DeferredOnly mode * Updated custom pass doc * Updated changelog * Fix issue of debug display variant with shader graph not compiling (#6325) * move #define DEBUG_DISPLAY into debugdisplay.hlsl * fix builtindata * fix includes * fix shader * fix XR culling with multiple cameras (#6314) Co-authored-by: sebastienlagarde * fix XR single-pass with Mock HMD plugin (#6313) Co-authored-by: sebastienlagarde * fix sRGB mismatch with XR SDK (#6311) Co-authored-by: sebastienlagarde * Partial fix LookDev opened when CoreRP package reimported (#6291) * Fix null texture usage happening on CoreRP upgrade * Partially fix garbage collected stylesheet issue. (Need more work on UIElement side, see case 1228706 ) * Update CHANGELOG.md * Clean log Co-authored-by: sebastienlagarde * Hdrp/fix default volume switch (#6250) * Fixed an issue where default volume would not update when switching profile. * Update changelog * Fixed an issue when setting the default volume for the first time where the hdrp asset would not be dirtied Co-authored-by: sebastienlagarde * Reflection probe cameras are now created with the correct type (#6245) Co-authored-by: sebastienlagarde * Fixed an issue where AO override would not override specular occlusion. (#6222) * Fixed an issue where AO override would not override specular occlusion. * Update changelog Co-authored-by: sebastienlagarde * Fixed an issue where Volume inspector might not refresh correctly in some cases. (#6252) * Fixed an issue where Volume inspector might not refresh correctly in some cases. * Update changelog Co-authored-by: sebastienlagarde * render XR mirror view only for camera with no RT (#6306) Co-authored-by: sebastienlagarde * Split set rendering feature set and API validity check (#6301) * Split set rendering feature set and API validity check * changelog Co-authored-by: sebastienlagarde * Hdrp/probe scale 1219246 (#6288) * Fix when scale down < 0 all direction of box Influence Volume * Update Change log * Hdrp/fix/particle light shadows (#6111) * Tried to fix particle light shadows * Fixed particle shadows * Updated changelog Co-authored-by: sebastienlagarde * Recording of accumulation motion blur and path tracing (#6114) * Pt and accumulation motion blur recording Fix merge issues Fix merge issues #2 Bugfix: accumulation with one sample Chengelog Don't set the fixed-time in the subframe manager - should be set in the recorder Properly set and reset the fixed time Updated documentation Small fix to make physics simulation work with scaled time / accumulation mb Post rebase fixes and disable accumulation when using only one sub-frame * Fix post merge issues * hdrp resources asset file * remove duplicate code * Move most compute shaders to use multi_compile API (#6307) * Squashed commit of the following: commit ed9e485efc69a7949e34f0512666d522470dc73e Author: FrancescoC-Unity Date: Fri Mar 20 11:47:59 2020 +0100 Revert "Squashed commit of the following:" This reverts commit 0dd46577be82abeaefc839cbcd9f3875b05d48e6. commit 0dd46577be82abeaefc839cbcd9f3875b05d48e6 Author: FrancescoC-Unity Date: Fri Mar 20 10:39:28 2020 +0100 Squashed commit of the following: commit 0e1815814ce8204cfa42ae3050ba655fe769c550 Merge: ac6809ec032 2b018dfe8a9 Author: Sebastien Lagarde Date: Thu Mar 19 18:19:45 2020 +0100 Merge branch 'master' into HDRP/staging commit 2b018dfe8a9f5f304e4b95d6279dda60f632c9dc Author: sebastienlagarde Date: Thu Mar 19 18:19:02 2020 +0100 Merge Hdrp/staging (#6293) * Custom pass cleanup (#5507) * Fix custom pass cleanup issue with multiple volumes * Updated changelog * Delay discard of fragments during decal projection (#5283) * Delay discard of fragments during decal projection Metal Shading Language declares that fragment discard invalidates derivatives for the rest of the quad, so we need to reorder when we discard during decal projection, or we get artifacts along the edges of the projection (any partial quads get bad partial derivatives regardless of whether they are computed implicitly or explicitly). * Better re-arrangement of decal code * Update TerrainLitPasses.hlsl * Update TerrainLitPasses.hlsl * Update TerrainLitPasses.hlsl * Update ShaderPassDecal.hlsl Co-authored-by: sebastienlagarde * Fixing unnecessary memory allocations in the ray tracing cluster build and Updating the screen shots for the ray tracing tests (#5465) * Fixing unnecessary memory allocations in the ray tracing cluster build Updating the screen shots for the ray tracing tests * Update test scene and screenshots * - Discarding the ray tracing history for AO, reflection, diffuse shadows and GI when the viewport size changes. - Update and disable some tests that still need to be updated * Add a counter for ray tracing frame index and update screenshots * Fixing the Area Shadows Denoiser Test Co-authored-by: sebastienlagarde * Change the default volume used by the ray tracing tests to make them work again (#5510) * Change the default volume used for the ray tracing tests, fixes the tests back. … * fixed stereo singlepass shaders * Fixes * stereo fix * Revert "Squashed commit of the following:" This reverts commit 3c5736023539453627dc1e7e3cf6682bab050073. * Updated scene with black BG, and added missing Meta files for other test images * tweaked test to avoid non-clearing from previous test # Conflicts: # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_DynamicScaling_DOF.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_DynamicScaling_DOF.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/015_CameraMulti_FPSCam.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/077_GradingChannelMixerLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/079_GradingColorAdjustmentsLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/081_GradingColorCurvesLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/083_GradingLiftGammaGainLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/085_GradingShadowsMidtonesHighlightsLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/087_GradingSplitToningLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/089_GradingWhiteBalanceLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/091_TonemappingNeutralLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/015_CameraMulti_FPSCam.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/077_GradingChannelMixerLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/079_GradingColorAdjustmentsLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/081_GradingColorCurvesLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/083_GradingLiftGammaGainLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/085_GradingShadowsMidtonesHighlightsLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/087_GradingSplitToningLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/089_GradingWhiteBalanceLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/091_TonemappingNeutralLDR.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/109_URPShadersAlphaOutput.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/119_CameraToRTWithViewportRect.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/120_RenderUICustomRendererNoPP.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/121_RenderUICustomRendererNoAA.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/122_RenderUICustomRendererFXAA.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/125_CameraStackingVolumes.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/126_RendererFeatureActive.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_DynamicScaling_DOF.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_DynamicScaling_DOF.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_DynamicScaling_DOF.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_DynamicScaling_DOF.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_DynamicScaling_DOF.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_DynamicScaling_DOF.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_DynamicScaling_DOF.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_DynamicScaling_DOF.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_DynamicScaling_DOF.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_DynamicScaling_DOF.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/041_Lighting_BasicArea.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_DynamicScaling_DOF.png # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_DynamicScaling_DOF.png.meta # com.unity.render-pipelines.universal/CHANGELOG.md --- .../109_URPShadersAlphaOutput.png.meta | 2 +- .../119_CameraToRTWithViewportRect.png.meta | 2 +- .../120_RenderUICustomRendererNoPP.png.meta | 2 +- .../121_RenderUICustomRendererNoAA.png.meta | 2 +- .../122_RenderUICustomRendererFXAA.png.meta | 2 +- .../125_CameraStackingVolumes.png.meta | 2 +- .../126_RendererFeatureActive.png.meta | 2 +- .../Vulkan/None/127_DynamicScaling_DOF.png | 3 + .../None/127_DynamicScaling_DOF.png.meta | 94 +++ .../None/127_DynamicScaling_DOF.png | 3 + .../None/127_DynamicScaling_DOF.png.meta | 94 +++ .../Vulkan/None/127_DynamicScaling_DOF.png | 3 + .../None/127_DynamicScaling_DOF.png.meta | 94 +++ .../Metal/127_DynamicScaling_DOF.png | 3 + .../Metal/127_DynamicScaling_DOF.png.meta | 94 +++ .../Metal/None/127_DynamicScaling_DOF.png | 3 + .../None/127_DynamicScaling_DOF.png.meta | 94 +++ .../Vulkan/None/127_DynamicScaling_DOF.png | 3 + .../None/127_DynamicScaling_DOF.png.meta | 94 +++ .../Assets/Scenes/127_DynamicScaling_DOF.meta | 8 + .../Scenes/127_DynamicScaling_DOF.unity | 736 ++++++++++++++++++ .../Scenes/127_DynamicScaling_DOF.unity.meta | 7 + .../DynamicResSetter.cs | 30 + .../DynamicResSetter.cs.meta | 11 + .../Global Volume Profile.asset | 86 ++ .../Global Volume Profile.asset.meta | 8 + .../127_DynamicScaling_DOF/LightingData.asset | Bin 0 -> 18208 bytes .../LightingData.asset.meta | 8 + .../New Lighting Settings.lighting | 63 ++ .../New Lighting Settings.lighting.meta | 8 + .../ReflectionProbe-0.exr | Bin 0 -> 163864 bytes .../ReflectionProbe-0.exr.meta | 94 +++ .../ProjectSettings/EditorBuildSettings.asset | 3 + .../CHANGELOG.md | 1 + .../PostProcessing/BokehDepthOfField.shader | 13 +- 35 files changed, 1663 insertions(+), 9 deletions(-) create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting.meta create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr create mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png.meta index 754c6b8eada..bfed954ef7b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 02e9224ec20390246b12f6de52d98885 +guid: 0e10c4b85225e404d85ac0e823ba13c4 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/119_CameraToRTWithViewportRect.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/119_CameraToRTWithViewportRect.png.meta index 4dbcc3db0fb..66512deabd0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/119_CameraToRTWithViewportRect.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/119_CameraToRTWithViewportRect.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 66971b5d763e1204ab7c1194944ceb38 +guid: 3f573f92f3d439e4b8ef7fcee531811b TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/120_RenderUICustomRendererNoPP.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/120_RenderUICustomRendererNoPP.png.meta index 3604d51759e..3745572af2d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/120_RenderUICustomRendererNoPP.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/120_RenderUICustomRendererNoPP.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 986db811d0d1ffd4dab19c47acd608dc +guid: 0caf8c860195c58458a060c02aab6763 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/121_RenderUICustomRendererNoAA.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/121_RenderUICustomRendererNoAA.png.meta index 3582a479b75..913ae611dd3 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/121_RenderUICustomRendererNoAA.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/121_RenderUICustomRendererNoAA.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 76e76b6c5df29b54ca2fd2e1736d8af7 +guid: 1b9a167c898411d4e945d670a05bb8cf TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/122_RenderUICustomRendererFXAA.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/122_RenderUICustomRendererFXAA.png.meta index d384920e64d..05f55c07059 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/122_RenderUICustomRendererFXAA.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/122_RenderUICustomRendererFXAA.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 24916844a84f4084cb7143e8c09c7a0b +guid: 50f9437533e06664bbc1e79ff36cb116 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/125_CameraStackingVolumes.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/125_CameraStackingVolumes.png.meta index bddd9556d2a..c0c473eb83e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/125_CameraStackingVolumes.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/125_CameraStackingVolumes.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 46d8011636d095b47a2d7f236eafcf60 +guid: d8a81dfc17f8fa54fbb92335416a447f TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/126_RendererFeatureActive.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/126_RendererFeatureActive.png.meta index bb3af5cf785..9e39c7f4bb3 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/126_RendererFeatureActive.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/126_RendererFeatureActive.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ed11a572661d6449ab7d2e743beb0dca +guid: cb8a60a79fda59f47a8ee9d2c7a3c8e2 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png new file mode 100644 index 00000000000..059e37289e6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ab4eac30c0aa63429ae5324a7f1ad857e5f75cba7064c39ee48b80dfacde6a +size 232450 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png.meta new file mode 100644 index 00000000000..38bf8870b98 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: ffb7ca7d7a8dff74b97724992a250c6b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png new file mode 100644 index 00000000000..64f337d2709 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19450d3c17b7d9610f4c49e8fa42923c7d09bdd245ebf17a833e6238689c63f1 +size 221990 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png.meta new file mode 100644 index 00000000000..5c83c62dd0b --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: b52bd8db5de4a3348a84737711422b11 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png new file mode 100644 index 00000000000..059e37289e6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ab4eac30c0aa63429ae5324a7f1ad857e5f75cba7064c39ee48b80dfacde6a +size 232450 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta new file mode 100644 index 00000000000..889f478b624 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 6bde122f0bc06cf43932c4771af6a9f6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png new file mode 100644 index 00000000000..c882607c648 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d68fdd496e50ace722b78693ac1b4a9f2d76c41cae9aee97071df3c656f2c81b +size 127849 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png.meta new file mode 100644 index 00000000000..0e30607a0c7 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: ce6f43f75fee8054ba5b59ceed79c7f2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png new file mode 100644 index 00000000000..059e37289e6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ab4eac30c0aa63429ae5324a7f1ad857e5f75cba7064c39ee48b80dfacde6a +size 232450 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png.meta new file mode 100644 index 00000000000..5af604247e8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 0f9d951cc92af7941a0550698a0a5a74 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png new file mode 100644 index 00000000000..059e37289e6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ab4eac30c0aa63429ae5324a7f1ad857e5f75cba7064c39ee48b80dfacde6a +size 232450 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta new file mode 100644 index 00000000000..a6a69b769e8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 86e260cea4b4dd04e9b00db816ea0a92 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.meta new file mode 100644 index 00000000000..20789c773cf --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fd32c3006339c14f885dff42eb360c9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity new file mode 100644 index 00000000000..b8432dc6880 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity @@ -0,0 +1,736 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 112000000, guid: 977e4515d6b86054e957cb447ec7419a, + type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: ccc71b1229998a844a0cb431f90a2b67, + type: 2} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1001 &131927988 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 406555286357417593, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_Name + value: ENV + objectReference: {fileID: 0} + - target: {fileID: 406555286357417593, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286369488657, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286420914205, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286482225736, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286517727058, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286531528639, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286585198031, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286651556416, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286656332909, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286793263395, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286803363846, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286828207137, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286829790726, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286843191160, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286870497407, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286915550901, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286930118864, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286942275642, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287015210621, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287022671624, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287060983945, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287131895727, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287138334754, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287163165996, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287211997004, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287280814547, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287305899989, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287321396956, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287362919030, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287381448375, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287385598932, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287388888290, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287395552840, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287471676073, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287478225023, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287527405171, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287638453531, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287816160547, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287878996711, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287879935821, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288039026065, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288178953099, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288268076440, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288282578227, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288312568594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288323522207, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288404637940, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288425260372, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288442045027, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288444772179, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2209787132fab4b269a07531ec1e19fe, type: 3} +--- !u!1 &1649979578 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1649979580} + - component: {fileID: 1649979579} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1649979579 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649979578} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 4 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1649979580 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649979578} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1987455871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1987455873} + - component: {fileID: 1987455872} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1987455872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987455871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + isGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: db24ed36a74e0af49a6e696caae9f6fc, type: 2} +--- !u!4 &1987455873 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987455871} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.13150191, y: -0.061539173, z: -0.06098199} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1993633423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1993633427} + - component: {fileID: 1993633426} + - component: {fileID: 1993633425} + - component: {fileID: 1993633424} + - component: {fileID: 1993633428} + - component: {fileID: 1993633429} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1993633424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 1 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &1993633425 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_Enabled: 1 +--- !u!20 &1993633426 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 37 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 1 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1993633427 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_LocalRotation: {x: -0.295975, y: -0.29656836, z: 0.097230785, w: -0.9027692} + m_LocalPosition: {x: -5.488637, y: 6.5752234, z: -7.3347425} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1993633428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8fe3a3cc5fb7ae49abbc22ba3a69695, type: 3} + m_Name: + m_EditorClassIdentifier: + m_camera: {fileID: 1993633426} + scale: 0.5 +--- !u!114 &1993633429 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} + m_Name: + m_EditorClassIdentifier: + ImageComparisonSettings: + TargetWidth: 640 + TargetHeight: 480 + PerPixelCorrectnessThreshold: 0.001 + AverageCorrectnessThreshold: 0.005 + UseHDR: 0 + WaitFrames: 0 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity.meta new file mode 100644 index 00000000000..e024773fca6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 069f595c511c463418479db2f730eec1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs new file mode 100644 index 00000000000..aa1fad6c8a8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs @@ -0,0 +1,30 @@ +using System; +using UnityEngine; + +[ExecuteAlways] +public class DynamicResSetter : MonoBehaviour +{ + + public Camera m_camera; + + [Range(0.01f, 1f)] + public float scale = 1; + + private void OnValidate() + { + UpdateCamera(); + } + + void Update() + { + UpdateCamera(); + } + + void UpdateCamera() + { + if (m_camera) + { + ScalableBufferManager.ResizeBuffers(scale, scale); + } + } +} diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs.meta new file mode 100644 index 00000000000..5300eb5a3a4 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f8fe3a3cc5fb7ae49abbc22ba3a69695 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset new file mode 100644 index 00000000000..f090d07b650 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset @@ -0,0 +1,86 @@ +%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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: + - {fileID: 4353722282301515956} +--- !u!114 &4353722282301515956 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + mode: + m_OverrideState: 1 + m_Value: 2 + gaussianStart: + m_OverrideState: 0 + m_Value: 10 + min: 0 + gaussianEnd: + m_OverrideState: 0 + m_Value: 30 + min: 0 + gaussianMaxRadius: + m_OverrideState: 0 + m_Value: 1 + min: 0.5 + max: 1.5 + highQualitySampling: + m_OverrideState: 0 + m_Value: 0 + focusDistance: + m_OverrideState: 1 + m_Value: 10.35 + min: 0.1 + aperture: + m_OverrideState: 1 + m_Value: 2.4 + min: 1 + max: 32 + focalLength: + m_OverrideState: 1 + m_Value: 300 + min: 1 + max: 300 + bladeCount: + m_OverrideState: 0 + m_Value: 5 + min: 3 + max: 9 + bladeCurvature: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 1 + bladeRotation: + m_OverrideState: 0 + m_Value: 0 + min: -180 + max: 180 + constantSize: + m_OverrideState: 0 + m_Value: 0 + maxBlurSize: + m_OverrideState: 0 + m_Value: 2 + min: 0.25 + max: 4 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset.meta new file mode 100644 index 00000000000..7f47645e88c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db24ed36a74e0af49a6e696caae9f6fc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset new file mode 100644 index 0000000000000000000000000000000000000000..68ddfb9528bd4cc16e277d4690699bb44fc1c422 GIT binary patch literal 18208 zcmdU%d7PBRna8V{0TfZZI6P?(kVBAe4iSd2xfu=_nE}Bg&@=rG(=gLBcK65(9yBIG zjA%SC8}V4i-KdFi)vVEkjA%5P-GJF79=p1U84D2X*sc(U)$0SIMKP0H5;ey~?KpzRr^csFiA|Z> z5L2HXK72URkMcHFQgrxmeb4%dUCY0@>)H!Gyz=8AcSq(#l={{Hr9ctRQK~>i4(pSG zj&&4K5p{2cDtsfN3b>Yv=^tMKemtEls#Jx+bVQZ7hC_sMUL)D#DFfvz=trU`HUWGJ z$w!}#pr5IuU?9biKbww8E5E!K3O#|{?pW{3pQ7=*3nkgUsgDyl06xmSTzY{1wl34pw%dOre>der z{z;lsWCO~F_4{PXcgwr-Pw}{sznAhM|5VK>vY}l5X_ViW{L?*d=I1`j$NY>0FHmGd z`TRsFzpwcj1#ZjYfceAtV}8*7(K-*r1k6u(e9oY3xBZpQ_+yS;ZrcAS<)i&$!3z}G zP~QG=lplGDDP+0&btZTTYYzKF`yqckc%gIwwcoMN3E+t^H}lW-IT5^sDc#?(&q*GS zs2@&QJb1k1H@Py^l1-``c83I4w@|gl(V>zvJy|(`n%V!C^ z(eiTzzS(lDRg^3S%uhFs-({B15qPKNRRZ5``CNhTw7gp2H&}k2!1q|55cnOI&lC7P zmd_XXS1n&4@P{p5DDcNEUnKAYmM<3gvz9Lr_#w-e3j77jYXttP<;w*Ay5-9~Zv5Mu z#NmHdfEOsTq1?Z%qYa4xLV6{;WIlx-#*+(_rR7jSu{8bbVJ`oaIydfZ*# z=w5@$7brHNeEnQa*)FeC?~s2TMe=cPQKxy7ViQolo7y&=IQ&aJ{UR!ApiUb;)ABU} zpJn-4fzP)5LXVsFRS`$~)_L4*-+F;_`z{hVx9?(sbNepwc%{0Y#;=~*M}O*4%_*`0 z>nnJJ<)5Ma^7+O1Z?*l~pn24m#iX|1!An^46v>AF zhJU)s zFw*3oaR15o$Dh@CF8?9PM*k9&{W*{KS6%dc@fKZ!_32uV4{)9@c4}Ur*o250;M^bY zqHK44>aW+Q_enm+_w$-ZDK-J+yQyuwK3zxIu75C`{m&N!&i?0mfwTYF?QygI9z%;G z*2fz(r^p8QANZ%?1kwH*>F4Ut0LMRlQQ+*KZW1{Ar<(=N{^=Hhvwyl(;Ow9F2%P=X zZ31Wi^d*6_fBFl7vw!-sz}Y|DE^ziwdj-z^=?;Ojf4WoP?4RxuIQyr&J#O@4jMb07 z)Vx5k3DEEG`n8X;UHdSc^@D7oSI+uzkHA?!{z~AiAAc=y){n0Uob}^gfwO+xCvet} z`vuPW@l}Ddetb>ftRD{uob}`D0%!erP~fZ|e+$}2e|arkLx1W~fu}70W-lD;%Vm~7Ch#jQ ze_Y_#S^lkFIQ;9Eh{L~r+vBeN>=!uO&vyjQ_R}M9wx1^i&h~Ra;A}rn3Y_idDS@;7 zd{^LXKTivs?dKVRv;BNe;A}t73Y_idIf1kNd|%*fKYu51wx7TExbd&|TK)Ke$6ft6 zC~($~Ljq_0cwXSFA3qd0>&HI`ob}^J0%!gBvA|hBej;$zj~4{a`thQ`SwCJ9IP1sD z0%!gBM}f0`{FA_0KVA_y>&L4eH~w`$=?DDlKZ6%2vZ36+{*?0j@~=Mw=fXN|o=@Rl z;h)GCmT~v_^j`$d`uB5zv;MsSdA*{To5&|KV}-{PF=^Lx1W&d*N7L=`lvHukU-@^`E~JIP32R0%!gGFM+fE zekgF(-;V^&`unlKS%3dq;Hu*HhtiSyP z&iY#+aMs^Sj~o3NMEU{!>F;r)-y?{_zYYK|(1kXX>-RwL1XJ|Yy?;HzlV7RElWges zU@CT`$KCb~68JLP{-Xqbq2+@;ZuXZ_#L>T_!3*K`yWbBS1D*(TcYg`*`RK10Xna(7 zf9Y6{yZcMW37q$rj`z4}|1R796Tl0_>ZvVm`%eTqhhCe@{N8zPS-&HPb(|W`uiixPw$1l zLF@zi9YN(sdfe#mzyU^nRNx~lALa2%wSw9{kvJhW8azP>8}NSlCE7oX6Nmnu0bXE= zGVc730e>pY-T5C2Uc!{F(BIc!{2+gvC*OU4eb>@#1D*(T zcl>90@+Xz zs&(nwY+FN+L*1cMK0^yuwxt49*WMgt(~ZfNrO9k-TPEF@TM?&=<|nrVsd=pp=^&HW zf@(4=(wQKcRk`Miqf;-{hnP9U&0(53OgD!a<}lM7&M}8s=5Ve)#Eg`fkrFdfVn#~L zNQoIKF(V~rq{NJrn2{1UQsPER+(?NVDRCnuZluIXN@@JtgVgFElM1pyR!@L)q9=7_ zkZZ119hc*%@Q$%eQrpy4MhludGF!sD1v*9JTtl^VD(B2z zR?H-6%S-r)CGCutA?(8kh_@rZW7dclc4^a1dV`6&={Bm zje<$gIG6;Dr%BL=ngorhNnmnpswf*%Wb=yBF;O;;ttz7dTyb4` zTcDEpmSoQ4>*T7YCh|J#Ouji;Pt~_~6Lu23F1B5mhE9v;Dfc@R#% zpfpmttvWm0K3#LEIl7LfbT((}qycE%P;V4pYj;SZlO2|s>1Z|A)@0VH(8+pf=8AJf zDq{7gm>@4ibH1u0Pvc-6W;jc=qwA|08(TWyp7l(cF>T{KxXlI4$xJ3_DLP#EHtqY^ z=6cPj?`jWJYq~Q?X}Q!6T_&Bw)fgFlTpcvEkU~@KdKwmVGz4VwA%EQGb?9hsVvt{) zJi9(P=WBy3daRc>Jj>Bd+otE&9zXx;J0HAy^4MqIe)aHccm?-JMQIs4hn7Fwdg(F+ z9qR~7;~)BT9FJ6g=+p7hbPbkPs*)rYC^iAFrg3XCiB55Ai)&mSQF!H$w4Zj<9We1y zKzS_PET2~JvhuF{fgbU{+9} zPbGGm#|P?98}P`A@}~uB+Hk2+~{|lIP@E9X(3^jM3}oYdPu&2QJ@jd21L_n)&^f zn}@#AMa&7sJ`-U*ZlbJxCim5@%s zzBiC;*f->V-s6>u+Fr=n`mghNf5*Rk!Q7dYz2{OtC)ssBb>{|z2@>%Yn_#dwSrZA*5^b`HxYwN$+<8J-8c-*c3)?WAwl8^c$#P*bNy}M@iF#m5a zT}p!Nj+s7a$+T-;Pg}Ri<{*_#wxqY2onUNk_L-@QoVME1nN+&b?74H2cE&kLTjQLh zz41&yo5~GsS-nGFI-%=JCsd+zLS7H{(;^T*afHkPwbPP-+aeJEz=B1R!vHxzSe*ox`!HahH=)?#AnTmG=m z&FS@swqgACJzrYmmeKi|480Oste?9E&Y03Ur8E3L%veddZV>&j!-9|O5cXj?qHwy3 d=zma*H0}Oa3tHMT!Gu1q{vTPA6bJwS literal 0 HcmV?d00001 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset.meta new file mode 100644 index 00000000000..0a3c3f5f491 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 977e4515d6b86054e957cb447ec7419a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting new file mode 100644 index 00000000000..1d780ee2c06 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Lighting Settings + serializedVersion: 2 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 5 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 0 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRRussianRouletteStartBounce: 2 + m_PVREnvironmentMIS: 1 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting.meta new file mode 100644 index 00000000000..7b9e1388307 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ccc71b1229998a844a0cb431f90a2b67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr new file mode 100644 index 0000000000000000000000000000000000000000..f38e702271bdeaeada94347ac0ba7616f66eff97 GIT binary patch literal 163864 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
d7$kXh%(BRID-a!dmJy z8Iwf1M(>T};s_#V6{u%4#N?n2OxjDr3Jl)*A3S+gLKT&?$7J^Jh|YeE0(h?J?DpBv zd#X%rQT(uMcICX~LSK!ZT%p%XzaXlDPV;BNWjT=yNT;gbf136; zxe@OxtS*(CZj?}ss$P#CSdT`=<6fx&EQVCYcTUR7$X&jDN=e4-<0#AhSYa`@`>~@V zKn4++>qL*9%O8=JFwF4W9@ySb+J%*U+tZ;-giB{U-X2)~00 zJ|MUQj%z+T+4?suVh}NC^08z@?tKAQH8#}Z1E^pQjH4OvOTH*|?ilf&ytFU+GrG6L z^yEdDd{4(OZ-Ah305DFN?id@_M1Nul$Ub`m*iWaG?js_N0D#zOE0O_D5bVniFdh(A z#4<(@KJ1#~;}yOXzYtJ?y4N=8L?P&88YII~3#V1H?oiEnUy_tiT_%pXl#+bu=hL&Q z`%qPel%wQVosyA{6IC0AQ8t^ zwLoLomri!hGs$`W#PCGeS&jOCN6(`bF?EU&ErvjWkrxYtwX=c*+(2NFSLL_tbjCogOcWT84OM*PIc7kDbYf^T=-_ZFWuu@JAfpx=A?qE*GRx5pQw0)QLVYot@n>ZI&nTeb8Zi{gat3$SwVOA7 ziQ&NW_pft$K_*KWQ;cM1iGS$HoeZvv1IG8|=r?$eoMyv&e0or4l@B>txWZVw_eHz* zsh&%B0q4T1L%=Hk^ngK4gi|Jx^oyONrg^M;%j_=$9d==`_avO zZ4JeI`+D8j)1VzBUwYzYKhfQ+wdVp%H!gq~26!Mx`pTJiKaSo3GvyT+j^4e+djt8= z94<^ndLrIV_Zd7XU_H`KU(qT% hn>reclYwo=$2a6HXVTA|~PZJqSK6a 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�SNDAKT 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­)Xg8$I{8Yh)SWmxemd%QJEBIKT~sYD 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 literal 0 HcmV?d00001 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr.meta new file mode 100644 index 00000000000..351c7d3c4b5 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: fb3ea07c74ccd9746bc22e6d0f45b6bc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset b/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset index 959cf9a4727..d147dba5bcc 100644 --- a/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset @@ -248,4 +248,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/127_ClearRenderTexture.unity guid: ecb4f57b7a1788b4b85f618d4cbc6677 + - enabled: 1 + path: Assets/Scenes/127_DynamicScaling_DOF.unity + guid: 069f595c511c463418479db2f730eec1 m_configObjects: {} diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 38c13260731..a92584b190c 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Metallic slider on the Lit shader is now linear meaning correct values are used for PBR. - Fixed an issue with shadows not being correctly calculated in some shaders. - URP shaders that contain a priority slider now no longer have an offset of 50 by default. +- Fixed issue where using DOF at the same time as Dynamic Scaling, the depth buffer was smapled with incorrect UVs. [case 1225467](https://issuetracker.unity3d.com/product/unity/issues/guid/1225467/) ## [7.3.0] - 2020-03-11 diff --git a/com.unity.render-pipelines.universal/Shaders/PostProcessing/BokehDepthOfField.shader b/com.unity.render-pipelines.universal/Shaders/PostProcessing/BokehDepthOfField.shader index 4c2b83a0850..d24448e009c 100644 --- a/com.unity.render-pipelines.universal/Shaders/PostProcessing/BokehDepthOfField.shader +++ b/com.unity.render-pipelines.universal/Shaders/PostProcessing/BokehDepthOfField.shader @@ -39,8 +39,17 @@ Shader "Hidden/Universal Render Pipeline/BokehDepthOfField" { UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); + uint w; + uint h; +#if defined(UNITY_STEREO_INSTANCING_ENABLED) || defined(UNITY_STEREO_MULTIVIEW_ENABLED) + uint x; + _CameraDepthTexture.GetDimensions(w, h, x); +#else + _CameraDepthTexture.GetDimensions(w, h); +#endif + float2 uv = UnityStereoTransformScreenSpaceTex(input.uv); - float depth = LOAD_TEXTURE2D_X(_CameraDepthTexture, _MainTex_TexelSize.zw * uv).x; + float depth = LOAD_TEXTURE2D_X(_CameraDepthTexture, float2(w, h) * uv).x; float linearEyeDepth = LinearEyeDepth(depth, _ZBufferParams); half coc = (1.0 - FocusDist / linearEyeDepth) * MaxCoC; @@ -293,7 +302,7 @@ Shader "Hidden/Universal Render Pipeline/BokehDepthOfField" ENDHLSL } } - + // SM3.5 fallbacks - needed because of the use of Gather SubShader { From 4cc604674c33034c8697fa77747260624f8971ed Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Tue, 31 Mar 2020 14:53:36 +0200 Subject: [PATCH 20/28] Fix Editor Gizmos/Grid not working. (#6443) * Fixed CopyDepthPass compilation error. * fix copy depth for editor to display grid properly * Make shader property Id internal # Conflicts: # com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs # com.unity.render-pipelines.universal/Shaders/Utils/CopyDepthPass.hlsl --- .../Runtime/Passes/SceneViewDepthCopy.cs | 18 +++++++++++++- .../Runtime/UniversalRenderPipelineCore.cs | 24 +++++++++++++++++++ .../Shaders/Utils/CopyDepthPass.hlsl | 20 ++++++++++------ 3 files changed, 54 insertions(+), 8 deletions(-) diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/SceneViewDepthCopy.cs b/com.unity.render-pipelines.universal/Runtime/Passes/SceneViewDepthCopy.cs index e134469ffbd..52278a27f03 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/SceneViewDepthCopy.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/SceneViewDepthCopy.cs @@ -6,6 +6,8 @@ internal class SceneViewDepthCopyPass : ScriptableRenderPass Material m_CopyDepthMaterial; const string m_ProfilerTag = "Copy Depth for Scene View"; + int m_ScaleBiasId = Shader.PropertyToID("_ScaleBiasRT"); + public SceneViewDepthCopyPass(RenderPassEvent evt, Material copyDepthMaterial) { @@ -35,7 +37,21 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData cmd.EnableShaderKeyword(ShaderKeywordStrings.DepthNoMsaa); cmd.DisableShaderKeyword(ShaderKeywordStrings.DepthMsaa2); cmd.DisableShaderKeyword(ShaderKeywordStrings.DepthMsaa4); - cmd.Blit(source.Identifier(), BuiltinRenderTextureType.CameraTarget, m_CopyDepthMaterial); + cmd.DisableShaderKeyword(ShaderKeywordStrings.DepthMsaa8); + // Blit has logic to flip projection matrix when rendering to render texture. + // Currently the y-flip is handled in CopyDepthPass.hlsl by checking _ProjectionParams.x + // If you replace this Blit with a Draw* that sets projection matrix double check + // to also update shader. + // scaleBias.x = flipSign + // scaleBias.y = scale + // scaleBias.z = bias + // scaleBias.w = unused + ref CameraData cameraData = ref renderingData.cameraData; + float flipSign = (cameraData.IsCameraProjectionMatrixFlipped()) ? -1.0f : 1.0f; + Vector4 scaleBias = (flipSign < 0.0f) ? new Vector4(flipSign, 1.0f, -1.0f, 1.0f) : new Vector4(flipSign, 0.0f, 1.0f, 1.0f); + cmd.SetGlobalVector(m_ScaleBiasId, scaleBias); + + cmd.DrawMesh(RenderingUtils.fullscreenMesh, Matrix4x4.identity, m_CopyDepthMaterial); context.ExecuteCommandBuffer(cmd); CommandBufferPool.Release(cmd); } diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs index 675e3e9eb37..4eae855920f 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs @@ -109,6 +109,30 @@ namespace UnityEngine.Rendering.Universal public List bias; } + internal static class ShaderPropertyId + { + public static readonly int scaledScreenParams = Shader.PropertyToID("_ScaledScreenParams"); + public static readonly int worldSpaceCameraPos = Shader.PropertyToID("_WorldSpaceCameraPos"); + public static readonly int screenParams = Shader.PropertyToID("_ScreenParams"); + public static readonly int projectionParams = Shader.PropertyToID("_ProjectionParams"); + public static readonly int zBufferParams = Shader.PropertyToID("_ZBufferParams"); + public static readonly int orthoParams = Shader.PropertyToID("unity_OrthoParams"); + + public static readonly int viewMatrix = Shader.PropertyToID("unity_MatrixV"); + public static readonly int projectionMatrix = Shader.PropertyToID("glstate_matrix_projection"); + public static readonly int viewAndProjectionMatrix = Shader.PropertyToID("unity_MatrixVP"); + + public static readonly int inverseViewMatrix = Shader.PropertyToID("unity_MatrixInvV"); + // Undefined: + // public static readonly int inverseProjectionMatrix = Shader.PropertyToID("unity_MatrixInvP"); + public static readonly int inverseViewAndProjectionMatrix = Shader.PropertyToID("unity_MatrixInvVP"); + + public static readonly int cameraProjectionMatrix = Shader.PropertyToID("unity_CameraProjection"); + public static readonly int inverseCameraProjectionMatrix = Shader.PropertyToID("unity_CameraInvProjection"); + public static readonly int worldToCameraMatrix = Shader.PropertyToID("unity_WorldToCamera"); + public static readonly int cameraToWorldMatrix = Shader.PropertyToID("unity_CameraToWorld"); + } + public struct PostProcessingData { public ColorGradingMode gradingMode; diff --git a/com.unity.render-pipelines.universal/Shaders/Utils/CopyDepthPass.hlsl b/com.unity.render-pipelines.universal/Shaders/Utils/CopyDepthPass.hlsl index 4cebe1a2705..b53798310e5 100644 --- a/com.unity.render-pipelines.universal/Shaders/Utils/CopyDepthPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Utils/CopyDepthPass.hlsl @@ -3,6 +3,18 @@ #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" +#if defined(_DEPTH_MSAA_2) + #define MSAA_SAMPLES 2 +#elif defined(_DEPTH_MSAA_4) + #define MSAA_SAMPLES 4 +#elif defined(_DEPTH_MSAA_8) + #define MSAA_SAMPLES 8 +#else + #define MSAA_SAMPLES 1 +#endif + +half4 _ScaleBiasRT; + struct Attributes { float4 positionOS : POSITION; @@ -41,13 +53,7 @@ Varyings vert(Attributes input) #define SAMPLE(uv) SAMPLE_DEPTH_TEXTURE(_CameraDepthAttachment, sampler_CameraDepthAttachment, uv) #endif -#ifdef _DEPTH_MSAA_2 - #define MSAA_SAMPLES 2 -#elif _DEPTH_MSAA_4 - #define MSAA_SAMPLES 4 -#endif - -#ifdef _DEPTH_NO_MSAA +#if MSAA_SAMPLES == 1 DEPTH_TEXTURE(_CameraDepthAttachment); SAMPLER(sampler_CameraDepthAttachment); #else From 92d981189516beccfe194814bfff9a28220d18b3 Mon Sep 17 00:00:00 2001 From: Oleksandr Kokoshyn Date: Mon, 30 Mar 2020 20:23:45 +0200 Subject: [PATCH 21/28] case-1231157 Put the correct JSON brackets. Solved this case https://fogbugz.unity3d.com/f/cases/1231157 (#6444) --- .../Documentation~/upgrade-lwrp-to-urp.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/com.unity.render-pipelines.universal/Documentation~/upgrade-lwrp-to-urp.md b/com.unity.render-pipelines.universal/Documentation~/upgrade-lwrp-to-urp.md index 812cd0e3d98..1fb7494af85 100644 --- a/com.unity.render-pipelines.universal/Documentation~/upgrade-lwrp-to-urp.md +++ b/com.unity.render-pipelines.universal/Documentation~/upgrade-lwrp-to-urp.md @@ -78,18 +78,22 @@ To install URP as a dependency of the Project: * Open the Project Manifest file using a text editor. * At the top of the dependencies section, add the following entry: -`com.unity.render-pipelines.universal`: `[Version number you noted earlier]`, +```json +"com.unity.render-pipelines.universal": "[Version number you noted earlier]" +``` So, for example, if the version of URP was 7.1.1, your dependencies section would look like this: -`dependencies`: { - `com.unity.render-pipelines.universal`: `7.1.1`, - … -}, +```json +"dependencies": { + "com.unity.render-pipelines.universal": "7.1.1", + ... +} +``` This marks the version of URP that you have installed as a dependency of the Project. You can now safely remove LWRP. * Open your Project in Unity. * Open the Package Manager Window. * Locate **Lightweight RP** and select it. -* In the bottom right of the Package Manager window, click Remove. Unity completely removes the LWRP package from the Project. \ No newline at end of file +* In the bottom right of the Package Manager window, click Remove. Unity completely removes the LWRP package from the Project. From 96c7882b5cdd7c554c3c29d018b54d14d5bc0a98 Mon Sep 17 00:00:00 2001 From: Oleksandr Kokoshyn Date: Mon, 30 Mar 2020 20:39:25 +0200 Subject: [PATCH 22/28] case-1228870 Added OpenVR to the Post-processing list. (#6450) --- .../Documentation~/universalrp-builtin-feature-comparison.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md b/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md index 0b390a5ceb8..1f63d78c940 100644 --- a/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md +++ b/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md @@ -162,7 +162,7 @@ This table provides an overview of the current features supported in the Univers | Mutipass | Yes | In research | | Single Pass | Yes | Yes | | Single Pass Instanced | Yes | Yes | -| *Post-processing*
Oculus Rift
Oculus Quest
Oculus Go
Gear VR
PSVR
HoloLens
WMR
Magic Leap One|
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes |
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes | +| *Post-processing*
Oculus Rift
Oculus Quest
Oculus Go
Gear VR
PSVR
HoloLens
WMR
Magic Leap One
OpenVR|
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes |
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes
No | | ***AR*** | | | | AR Foundation | No | Yes | | ***Debug*** | | | From cc7fbd9d74f0d85eb23f9a7c6326729a83e1ae43 Mon Sep 17 00:00:00 2001 From: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Date: Fri, 3 Apr 2020 08:40:32 +0100 Subject: [PATCH 23/28] Fix TransformWorldToHClipDir (#6503) Co-authored-by: Felipe Lira # Conflicts: # com.unity.render-pipelines.core/CHANGELOG.md --- com.unity.render-pipelines.core/CHANGELOG.md | 1 + .../ShaderLibrary/SpaceTransforms.hlsl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md index 094071bc882..b60f46dd61a 100644 --- a/com.unity.render-pipelines.core/CHANGELOG.md +++ b/com.unity.render-pipelines.core/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed copy/pasting of Volume Components when loading a new scene - Fix LookDev's camera button layout. - Fix LookDev's layout vanishing on domain reload. +- Fixed issue with the shader TransformWorldToHClipDir function computing the wrong result. ## [7.3.0] - 2020-03-11 diff --git a/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl index 90f8da1c54f..d1c09a9e321 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl @@ -119,7 +119,7 @@ real3 TransformWorldToViewDir(real3 dirWS, bool doNormalize = false) // Tranforms vector from world space to homogenous space real3 TransformWorldToHClipDir(real3 directionWS, bool doNormalize = false) { - float dirHCS = mul((real3x3)GetWorldToHClipMatrix(), directionWS); + float3 dirHCS = mul((real3x3)GetWorldToHClipMatrix(), directionWS).xyz; if (doNormalize) return normalize(dirHCS); From f306c92f7da2b393c0860f17288d98555a2fbfe2 Mon Sep 17 00:00:00 2001 From: Andre McGrail Date: Fri, 3 Apr 2020 12:38:29 +0200 Subject: [PATCH 24/28] fix line endings --- .../Scenes/105_MRT/CopyToViewport.shader | 16 +++++++-------- .../Scenes/105_MRT/OutputColorsToMRTs.shader | 20 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/CopyToViewport.shader b/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/CopyToViewport.shader index 290673f88ef..47b5ccfb4ca 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/CopyToViewport.shader +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/CopyToViewport.shader @@ -9,10 +9,10 @@ Shader "Test/CopyToViewport" Cull Off ZWrite Off ZTest Always Pass - { - HLSLPROGRAM - #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl" - + { + HLSLPROGRAM + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl" + TEXTURE2D(_SrcTex); SAMPLER(sampler_SrcTex); @@ -27,10 +27,10 @@ Shader "Test/CopyToViewport" float2 uv : TEXCOORD0; float4 vertex : SV_POSITION; }; - + Varyings vert(Attributes input) { - Varyings output = (Varyings)0; + Varyings output = (Varyings)0; VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz); output.vertex = vertexInput.positionCS; output.uv = input.uv; @@ -39,14 +39,14 @@ Shader "Test/CopyToViewport" half4 frag(Varyings input) : SV_Target { - half4 col = SAMPLE_TEXTURE2D(_SrcTex, sampler_SrcTex, input.uv); + half4 col = SAMPLE_TEXTURE2D(_SrcTex, sampler_SrcTex, input.uv); return col; } #pragma vertex vert #pragma fragment frag - ENDHLSL + ENDHLSL } } } diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader b/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader index 450c89afc6b..65557f5acf6 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader @@ -9,10 +9,10 @@ Shader "Test/OutputColorsToMRTs" Cull Off ZWrite Off ZTest Always Pass - { - HLSLPROGRAM - #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl" - + { + HLSLPROGRAM + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl" + struct Attributes { float4 positionOS : POSITION; @@ -22,16 +22,16 @@ Shader "Test/OutputColorsToMRTs" { float4 vertex : SV_POSITION; }; - + struct FragmentOutput { half4 dest0 : SV_Target0; half4 dest1 : SV_Target1; - }; + }; Varyings vert(Attributes input) { - Varyings output = (Varyings)0; + Varyings output = (Varyings)0; VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz); output.vertex = vertexInput.positionCS; return output; @@ -40,15 +40,15 @@ Shader "Test/OutputColorsToMRTs" FragmentOutput frag(Varyings input) : SV_Target { FragmentOutput o; - o.dest0 = half4(0, 0, 1, 1); - o.dest1 = half4(1, 0, 0, 1); + o.dest0 = half4(0, 0, 1, 1); + o.dest1 = half4(1, 0, 0, 1); return o; } #pragma vertex vert #pragma fragment frag - ENDHLSL + ENDHLSL } } } From 4a60edb8102235f7883852c18263ba4fe44f49b3 Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Wed, 27 May 2020 16:55:26 +0200 Subject: [PATCH 25/28] Merge branch '7.x.x/release' into 7.x.x/universal/mass-backports # Conflicts: # TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/Smooth.mat # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/119_CameraToRTWithViewportRect.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/120_RenderUICustomRendererNoPP.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/121_RenderUICustomRendererNoAA.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/122_RenderUICustomRendererFXAA.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/125_CameraStackingVolumes.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/126_RendererFeatureActive.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_ClearRenderTexture.png.meta # TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/108_MoveCamera.png.meta # TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTests.cs # TestProjects/UniversalGraphicsTest/ProjectSettings/ProjectSettings.asset # com.unity.render-pipelines.core/CHANGELOG.md # com.unity.render-pipelines.universal/CHANGELOG.md # com.unity.render-pipelines.universal/Documentation~/requirements.md # com.unity.render-pipelines.universal/Editor/RendererFeatures/RenderObjectsPassFeatureEditor.cs # com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs # com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs # com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs # com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs # com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7BillboardPasses.hlsl --- .../Scenes/126_SampleDepthSettings.lighting | 63 ------------------ .../126_SampleDepthSettings.lighting.meta | 8 --- .../127_ClearRenderTextureSettings.lighting | 63 ------------------ ...7_ClearRenderTextureSettings.lighting.meta | 8 --- .../127_DynamicScaling_DOF/LightingData.asset | Bin 18208 -> 0 bytes .../LightingData.asset.meta | 8 --- .../New Lighting Settings.lighting | 63 ------------------ .../New Lighting Settings.lighting.meta | 8 --- 8 files changed, 221 deletions(-) delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting.meta delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting.meta delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset.meta delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting b/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting deleted file mode 100644 index ba61743ed45..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting +++ /dev/null @@ -1,63 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!850595691 &4890085278179872738 -LightingSettings: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 126_SampleDepthSettings - serializedVersion: 2 - m_GIWorkflowMode: 1 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_RealtimeEnvironmentLighting: 1 - m_BounceScale: 1 - m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 - m_BakeBackend: 1 - m_LightmapMaxSize: 1024 - m_BakeResolution: 40 - m_Padding: 2 - m_TextureCompression: 1 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAO: 0 - m_MixedBakeMode: 2 - m_LightmapsBakeMode: 1 - m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_RealtimeResolution: 2 - m_ForceWhiteAlbedo: 0 - m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 - m_PVRCulling: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVREnvironmentSampleCount: 500 - m_PVREnvironmentReferencePointCount: 2048 - m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 - m_PVRRussianRouletteStartBounce: 2 - m_PVREnvironmentMIS: 0 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting.meta deleted file mode 100644 index c3556396573..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a9044a455553948649a2fc8ab48924e8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting deleted file mode 100644 index a882e00357f..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting +++ /dev/null @@ -1,63 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!850595691 &4890085278179872738 -LightingSettings: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 127_ClearRenderTextureSettings - serializedVersion: 2 - m_GIWorkflowMode: 1 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_RealtimeEnvironmentLighting: 1 - m_BounceScale: 1 - m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 - m_BakeBackend: 1 - m_LightmapMaxSize: 1024 - m_BakeResolution: 40 - m_Padding: 2 - m_TextureCompression: 1 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAO: 0 - m_MixedBakeMode: 2 - m_LightmapsBakeMode: 1 - m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_RealtimeResolution: 2 - m_ForceWhiteAlbedo: 0 - m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 - m_PVRCulling: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 - m_PVRRussianRouletteStartBounce: 2 - m_PVREnvironmentMIS: 1 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting.meta deleted file mode 100644 index 4df36150178..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 286db413b8f862a4596678a63e43e1ea -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset deleted file mode 100644 index 68ddfb9528bd4cc16e277d4690699bb44fc1c422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18208 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 d=zma*H0}Oa3tHMT!Gu1q{vTPA6bJwS diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset.meta deleted file mode 100644 index 0a3c3f5f491..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/LightingData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 977e4515d6b86054e957cb447ec7419a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting deleted file mode 100644 index 1d780ee2c06..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting +++ /dev/null @@ -1,63 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!850595691 &4890085278179872738 -LightingSettings: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New Lighting Settings - serializedVersion: 2 - m_GIWorkflowMode: 1 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_RealtimeEnvironmentLighting: 1 - m_BounceScale: 1 - m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 - m_UsingShadowmask: 0 - m_BakeBackend: 1 - m_LightmapMaxSize: 1024 - m_BakeResolution: 5 - m_Padding: 2 - m_TextureCompression: 1 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAO: 0 - m_MixedBakeMode: 0 - m_LightmapsBakeMode: 1 - m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_RealtimeResolution: 2 - m_ForceWhiteAlbedo: 0 - m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 - m_PVRCulling: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 - m_PVRRussianRouletteStartBounce: 2 - m_PVREnvironmentMIS: 1 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting.meta deleted file mode 100644 index 7b9e1388307..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/New Lighting Settings.lighting.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ccc71b1229998a844a0cb431f90a2b67 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: From add18378afd7490c1664e80e4024dfe813535963 Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Wed, 27 May 2020 16:55:38 +0200 Subject: [PATCH 26/28] fix particle shader merge issue --- .../Shaders/Particles/ParticlesUnlitForwardPass.hlsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl index 92db9900a99..39f41471245 100644 --- a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl @@ -155,9 +155,9 @@ half4 fragParticleUnlit(VaryingsParticle input) : SV_Target half3 result = albedo.rgb + emission; half fogFactor = input.positionWS.w; result = MixFogColor(result, half3(0, 0, 0), fogFactor); - alpha = OutputAlpha(alpha); + albedo.a = OutputAlpha(albedo.a); - return half4(result, alpha); + return half4(result, albedo.a); } #endif // UNIVERSAL_PARTICLES_UNLIT_FORWARD_PASS_INCLUDED From c48197e2f7bc7063f190a68f9d938dc4198f8922 Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Wed, 27 May 2020 17:12:18 +0200 Subject: [PATCH 27/28] updated reference images an build settings --- .../{ => None}/109_URPShadersAlphaOutput.png | 0 .../109_URPShadersAlphaOutput.png.meta | 0 .../{ => None}/109_URPShadersAlphaOutput.png | 0 .../109_URPShadersAlphaOutput.png.meta | 0 .../{ => None}/109_URPShadersAlphaOutput.png | 0 .../109_URPShadersAlphaOutput.png.meta | 0 .../OpenGLCore/127_ClearRenderTexture.png | 3 - .../127_ClearRenderTexture.png.meta | 93 ------------------ .../{ => None}/109_URPShadersAlphaOutput.png | 0 .../109_URPShadersAlphaOutput.png.meta | 0 .../Metal/127_ClearRenderTexture.png | 3 - .../Metal/127_ClearRenderTexture.png.meta | 93 ------------------ .../Metal/127_DynamicScaling_DOF.png | 3 - .../Metal/127_DynamicScaling_DOF.png.meta | 94 ------------------- .../{ => None}/109_URPShadersAlphaOutput.png | 0 .../109_URPShadersAlphaOutput.png.meta | 0 .../OpenGLCore/127_ClearRenderTexture.png | 3 - .../127_ClearRenderTexture.png.meta | 93 ------------------ .../{ => None}/109_URPShadersAlphaOutput.png | 0 .../109_URPShadersAlphaOutput.png.meta | 0 .../Direct3D11/127_ClearRenderTexture.png | 3 - .../127_ClearRenderTexture.png.meta | 93 ------------------ .../{ => None}/109_URPShadersAlphaOutput.png | 0 .../109_URPShadersAlphaOutput.png.meta | 0 .../Linear/WindowsEditor/Vulkan.meta | 8 ++ .../{ => None}/109_URPShadersAlphaOutput.png | 0 .../109_URPShadersAlphaOutput.png.meta | 0 .../Direct3D11/127_ClearRenderTexture.png | 3 - .../127_ClearRenderTexture.png.meta | 93 ------------------ .../{ => None}/109_URPShadersAlphaOutput.png | 0 .../109_URPShadersAlphaOutput.png.meta | 0 .../Vulkan/127_ClearRenderTexture.png | 3 - .../Vulkan/127_ClearRenderTexture.png.meta | 93 ------------------ .../{ => None}/109_URPShadersAlphaOutput.png | 0 .../109_URPShadersAlphaOutput.png.meta | 0 .../ProjectSettings/EditorBuildSettings.asset | 20 +--- 36 files changed, 12 insertions(+), 689 deletions(-) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/{ => None}/109_URPShadersAlphaOutput.png (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/{ => None}/109_URPShadersAlphaOutput.png.meta (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/{ => None}/109_URPShadersAlphaOutput.png (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/{ => None}/109_URPShadersAlphaOutput.png.meta (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/{ => None}/109_URPShadersAlphaOutput.png (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/{ => None}/109_URPShadersAlphaOutput.png.meta (100%) delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png.meta rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/{ => None}/109_URPShadersAlphaOutput.png (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/{ => None}/109_URPShadersAlphaOutput.png.meta (100%) delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png.meta delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png.meta rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/{ => None}/109_URPShadersAlphaOutput.png (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/{ => None}/109_URPShadersAlphaOutput.png.meta (100%) delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png.meta rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/{ => None}/109_URPShadersAlphaOutput.png (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/{ => None}/109_URPShadersAlphaOutput.png.meta (100%) delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png.meta rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/{ => None}/109_URPShadersAlphaOutput.png (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/{ => None}/109_URPShadersAlphaOutput.png.meta (100%) create mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/{ => None}/109_URPShadersAlphaOutput.png (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/{ => None}/109_URPShadersAlphaOutput.png.meta (100%) delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png.meta rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/{ => None}/109_URPShadersAlphaOutput.png (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/{ => None}/109_URPShadersAlphaOutput.png.meta (100%) delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png.meta rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/{ => None}/109_URPShadersAlphaOutput.png (100%) rename TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/{ => None}/109_URPShadersAlphaOutput.png.meta (100%) diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/109_URPShadersAlphaOutput.png similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/109_URPShadersAlphaOutput.png diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/109_URPShadersAlphaOutput.png.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/109_URPShadersAlphaOutput.png.meta rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/109_URPShadersAlphaOutput.png.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/109_URPShadersAlphaOutput.png similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/109_URPShadersAlphaOutput.png diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/109_URPShadersAlphaOutput.png.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/109_URPShadersAlphaOutput.png.meta rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/109_URPShadersAlphaOutput.png.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png deleted file mode 100644 index 69ea99aee08..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 -size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png.meta deleted file mode 100644 index 45593aecd79..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/127_ClearRenderTexture.png.meta +++ /dev/null @@ -1,93 +0,0 @@ -fileFormatVersion: 2 -guid: f5c2ace0a056e4ae08d30959ab053ae9 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/109_URPShadersAlphaOutput.png.meta rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png deleted file mode 100644 index 69ea99aee08..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 -size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png.meta deleted file mode 100644 index aa2d9b30cb2..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_ClearRenderTexture.png.meta +++ /dev/null @@ -1,93 +0,0 @@ -fileFormatVersion: 2 -guid: 0abfd71904ba14a09bdc46f764b65178 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png deleted file mode 100644 index c882607c648..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d68fdd496e50ace722b78693ac1b4a9f2d76c41cae9aee97071df3c656f2c81b -size 127849 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png.meta deleted file mode 100644 index 0e30607a0c7..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/127_DynamicScaling_DOF.png.meta +++ /dev/null @@ -1,94 +0,0 @@ -fileFormatVersion: 2 -guid: ce6f43f75fee8054ba5b59ceed79c7f2 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/109_URPShadersAlphaOutput.png similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/109_URPShadersAlphaOutput.png diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/109_URPShadersAlphaOutput.png.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/109_URPShadersAlphaOutput.png.meta rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/109_URPShadersAlphaOutput.png.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png deleted file mode 100644 index 69ea99aee08..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 -size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png.meta deleted file mode 100644 index 06eafdeff9d..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/127_ClearRenderTexture.png.meta +++ /dev/null @@ -1,93 +0,0 @@ -fileFormatVersion: 2 -guid: 728bc6ad9c1f74bceb2938e939f66b30 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/109_URPShadersAlphaOutput.png similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/109_URPShadersAlphaOutput.png diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/109_URPShadersAlphaOutput.png.meta rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png deleted file mode 100644 index 69ea99aee08..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 -size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png.meta deleted file mode 100644 index 102750c90fa..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/127_ClearRenderTexture.png.meta +++ /dev/null @@ -1,93 +0,0 @@ -fileFormatVersion: 2 -guid: 8b593cd34cd274831b7533b24d151bab -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/109_URPShadersAlphaOutput.png similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/109_URPShadersAlphaOutput.png diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/109_URPShadersAlphaOutput.png.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/109_URPShadersAlphaOutput.png.meta rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/109_URPShadersAlphaOutput.png.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta new file mode 100644 index 00000000000..665eb05664c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8985ddb931902e2499cd811a279cdf6c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/109_URPShadersAlphaOutput.png similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/109_URPShadersAlphaOutput.png diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/109_URPShadersAlphaOutput.png.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/109_URPShadersAlphaOutput.png.meta rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/109_URPShadersAlphaOutput.png.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png deleted file mode 100644 index 69ea99aee08..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 -size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png.meta deleted file mode 100644 index d17b30bb3d3..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/127_ClearRenderTexture.png.meta +++ /dev/null @@ -1,93 +0,0 @@ -fileFormatVersion: 2 -guid: 230054c7a409e4f0c9cfec069e37729b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/109_URPShadersAlphaOutput.png similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/109_URPShadersAlphaOutput.png diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/109_URPShadersAlphaOutput.png.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/109_URPShadersAlphaOutput.png.meta rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/109_URPShadersAlphaOutput.png.meta diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png deleted file mode 100644 index 69ea99aee08..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 -size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png.meta deleted file mode 100644 index 83c8f550a4c..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/127_ClearRenderTexture.png.meta +++ /dev/null @@ -1,93 +0,0 @@ -fileFormatVersion: 2 -guid: 6d62d4863f98347eba85a86f42f4df0f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/109_URPShadersAlphaOutput.png similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/109_URPShadersAlphaOutput.png diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/109_URPShadersAlphaOutput.png.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/109_URPShadersAlphaOutput.png.meta rename to TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/109_URPShadersAlphaOutput.png.meta diff --git a/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset b/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset index ed76c72b4ee..50118b68104 100644 --- a/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset @@ -213,14 +213,11 @@ EditorBuildSettings: path: Assets/Scenes/105_TransparentReceiveShadows.unity guid: 6d72a4ab29e211149914e8a46ba9d1cf - enabled: 1 - path: Assets/Scenes/106_PostProcessingRenderUICustomRenderer.unity + path: Assets/Scenes/122_RenderUICustomRendererFXAA.unity guid: 9fc0d4010bbf28b4594072e72b8655ab - - enabled: 0 - path: Assets/Scenes/107_DepthPrepass.unity - guid: 12bed04065c037743845d8a5970cb5d0 - enabled: 1 - path: Assets/Scenes/108_MoveCamera.unity - guid: 5365b5739a6ca3c40bd03dc1ee5cb3c6 + path: Assets/Scenes/109_URPShadersAlphaOutput.unity + guid: 0a89803a0d2352245a452c202f9a67d1 - enabled: 1 path: Assets/Scenes/119_CameraToRTWithViewportRect.unity guid: c7b61419ee9382545afe530714fda0c2 @@ -236,9 +233,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/122_RenderUICustomRendererFXAA.unity guid: 9fc0d4010bbf28b4594072e72b8655ab - - enabled: 0 - path: Assets/Scenes/125_CameraStackingVolumes.unity - guid: 9173c5ffc1365594aa9b927c4cd84c54 - enabled: 1 path: Assets/Scenes/123_CameraStackingClear.unity guid: 9aa9851df0da149c9a83a0f26072e234 @@ -251,24 +245,18 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/126_RendererFeatureActive.unity guid: 92276052d376244eb94e9548db46b27f - - enabled: 1 - path: Assets/Scenes/109_URPShadersAlphaOutput.unity - guid: 0a89803a0d2352245a452c202f9a67d1 - enabled: 1 path: Assets/Scenes/126_SampleDepth.unity guid: d66b74ae4e7264d62bdb2c4f56261030 - enabled: 1 path: Assets/Scenes/127_ClearRenderTexture.unity guid: ecb4f57b7a1788b4b85f618d4cbc6677 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/127_DynamicScaling_DOF.unity guid: 069f595c511c463418479db2f730eec1 - enabled: 1 path: Assets/Scenes/126_SampleDepth.unity guid: d66b74ae4e7264d62bdb2c4f56261030 - - enabled: 1 - path: Assets/Scenes/127_ClearRenderTexture.unity - guid: ecb4f57b7a1788b4b85f618d4cbc6677 - enabled: 1 path: Assets/Scenes/130_UnityMatrixIVP.unity guid: 716466bc92f8e4eeeb3c138524b04021 From 4908090a00c0154d0a42ed770a609e49e211fd94 Mon Sep 17 00:00:00 2001 From: Felipe Lira Date: Tue, 26 May 2020 11:53:09 +0200 Subject: [PATCH 28/28] Fixed performance problem of ShaderPreprocessor (#470) (#500) * Fixed performance problem of ShaderPreprocessor List.RemoveAt method would copy the elements around, doing so in a huge iteration breaks the performance * Added changlog for shader preprocessor fix * Improved the variant striping * Fixed typo Co-authored-by: liiir1985 # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md --- .../CHANGELOG.md | 1 + .../Editor/ShaderPreprocessor.cs | 21 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index b0a3c51fb45..d6d69cfb318 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -52,6 +52,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Metallic slider on the Lit shader is now linear meaning correct values are used for PBR. - URP shaders that contain a priority slider now no longer have an offset of 50 by default. - Fixed issue where using DOF at the same time as Dynamic Scaling, the depth buffer was smapled with incorrect UVs. [case 1225467](https://issuetracker.unity3d.com/product/unity/issues/guid/1225467/) +- Fixed a performance problem with ShaderPreprocessor with large amount of active shader variants in the project. ## [7.3.0] - 2020-03-11 diff --git a/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs b/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs index 8b52444f9f4..511c0f4ea8c 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs @@ -212,14 +212,23 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippetData, IList< int prevVariantCount = compilerDataList.Count; - - for (int i = 0; i < compilerDataList.Count; ++i) + + var inputShaderVariantCount = compilerDataList.Count; + for (int i = 0; i < inputShaderVariantCount;) { - if (StripUnused(ShaderBuildPreprocessor.supportedFeatures, shader, snippetData, compilerDataList[i])) - { + bool removeInput = StripUnused(ShaderBuildPreprocessor.supportedFeatures, shader, snippetData, compilerDataList[i]); + if (removeInput) + compilerDataList[i] = compilerDataList[--inputShaderVariantCount]; + else + ++i; + } + + if(compilerDataList is List inputDataList) + inputDataList.RemoveRange(inputShaderVariantCount, inputDataList.Count - inputShaderVariantCount); + else + { + for(int i = compilerDataList.Count -1; i >= inputShaderVariantCount; --i) compilerDataList.RemoveAt(i); - --i; - } } if (urpAsset.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled)