From 11e09126cac07b154fcda7777db4ba3b8c0dfbae Mon Sep 17 00:00:00 2001 From: Rasmus Roenn Nielsen Date: Mon, 16 Feb 2026 14:11:37 +0000 Subject: [PATCH 01/12] Fix typo in APV tool tip. [Backport] --- .../UniversalRenderPipelineAssetUI.Skin.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs b/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs index 11fb06097e8..8c8c427c044 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs @@ -55,8 +55,8 @@ internal static class Styles public static readonly GUIContent lightProbeSystemContent = EditorGUIUtility.TrTextContent("Light Probe System", "What system to use for Light Probes."); public static readonly GUIContent probeVolumeMemoryBudget = EditorGUIUtility.TrTextContent("Memory Budget", "Determines the width and height of the 3D textures used to store lighting data from probes. Depth is fixed."); public static readonly GUIContent probeVolumeBlendingMemoryBudget = EditorGUIUtility.TrTextContent("Blending Memory Budget", "Determines the width and height of the 3D textures used to store light scenario blending data from probes. Depth is fixed."); - public static readonly GUIContent supportProbeVolumeGPUStreaming = EditorGUIUtility.TrTextContent("Enable GPU Streaming", "Enable steaming of Cells for Adaptive Probe Volumes."); - public static readonly GUIContent supportProbeVolumeDiskStreaming = EditorGUIUtility.TrTextContent("Enable Disk Streaming", "Enable steaming of Cells from disk for Adaptive Probe Volumes."); + public static readonly GUIContent supportProbeVolumeGPUStreaming = EditorGUIUtility.TrTextContent("Enable GPU Streaming", "Enable streaming of Cells for Adaptive Probe Volumes."); + public static readonly GUIContent supportProbeVolumeDiskStreaming = EditorGUIUtility.TrTextContent("Enable Disk Streaming", "Enable streaming of Cells from disk for Adaptive Probe Volumes."); public static readonly GUIContent supportProbeVolumeScenarios = EditorGUIUtility.TrTextContent("Enable Lighting Scenarios", "Enable Lighting Scenario Baking for Adaptive Probe Volumes."); public static readonly GUIContent supportProbeVolumeScenarioBlending = EditorGUIUtility.TrTextContent("Enable Lighting Scenario Blending", "Enable Lighting Scenario Blending for Adaptive Probe Volumes.\nNote: Lighting Scenario Blending requires Compute Shader support."); public static readonly GUIContent probeVolumeSHBands = EditorGUIUtility.TrTextContent("SH Bands", "The number of Spherical Harmonic bands used by Adaptive Probe Volumes to store lighting data. Choosing L2 provides better quality but with higher memory and runtime costs."); From ec1d461b9b48f56c7a449b043224ed222c3dc447 Mon Sep 17 00:00:00 2001 From: Guillaume Levasseur Date: Tue, 17 Feb 2026 06:06:32 +0000 Subject: [PATCH 02/12] Upgrade SRPTests projects to GTF 9.0.0-exp.43, update test resolution to 1080p accordingly --- .../Editor/HDRP_TestSettings_Editor.cs | 11 +- .../Runtime/UniversalGraphicsTestSettings.cs | 3 +- .../Scripts/Runtime/UniversalGraphicsTests.cs | 32 +- .../Runtime/ConfigureMockHMD.cs | 10 +- .../local.gtf.references/package.json | 2 +- .../Assets/Tests/HDRP_DXR_Graphics_Tests.cs | 9 + .../Tests/HDRP_Runtime_Graphics_Tests.cs | 12 + .../GraphicTests/Tests/HDRP_Graphics_Tests.cs | 2 + .../LightBaker/InputExtractionMaterials.cs | 2 +- .../ProjectSettings/ProjectSettings.asset | 356 ++++++++++-------- .../Assets/Scenes/001_SimpleCube.unity | 157 ++++---- .../Assets/Scenes/350_VRS_CustomPass.unity | 80 ++-- .../ProjectSettings/ProjectSettings.asset | 34 +- .../ProjectSettings/ProjectSettings.asset | 201 +++++----- .../Scenes/071_ChromaticAberration.unity | 97 ++--- .../375_URP_Asset_HDROutput_FSR.asset | 11 +- .../ProjectSettings/ProjectSettings.asset | 199 +++++----- 17 files changed, 634 insertions(+), 584 deletions(-) diff --git a/Tests/SRPTests/Packages/com.unity.testing.hdrp/TestRunner/Editor/HDRP_TestSettings_Editor.cs b/Tests/SRPTests/Packages/com.unity.testing.hdrp/TestRunner/Editor/HDRP_TestSettings_Editor.cs index 6261a2c87cd..71d124a89fc 100644 --- a/Tests/SRPTests/Packages/com.unity.testing.hdrp/TestRunner/Editor/HDRP_TestSettings_Editor.cs +++ b/Tests/SRPTests/Packages/com.unity.testing.hdrp/TestRunner/Editor/HDRP_TestSettings_Editor.cs @@ -81,18 +81,23 @@ override public void OnInspectorGUI() EditorGUILayout.PropertyField(containsVFX); EditorGUILayout.PropertyField(doBeforeTest); - if(typedTarget.ImageComparisonSettings.UseBackBuffer) + string resolutionSource = ""; + + if (typedTarget.ImageComparisonSettings.UseBackBuffer) { - targetResolution = GetResolutionFromBackBufferResolutionEnum(typedTarget.ImageComparisonSettings.ImageResolution.ToString()); + // Default to 1080p when using backbuffer + targetResolution = new Vector2(1920, 1080); + resolutionSource = "Backbuffer Default (1920x1080)"; } else { targetResolution = new Vector2(typedTarget.ImageComparisonSettings.TargetWidth, typedTarget.ImageComparisonSettings.TargetHeight); + resolutionSource = $"Target {targetResolution.x}x{targetResolution.y}"; } liveViewSize = GUILayout.Toggle(liveViewSize, "When enabled, Game View resolution is updated live."); - if (GUILayout.Button("Set Game View Size") || liveViewSize && (prevWidth != targetResolution.x || prevHeight != targetResolution.y)) + if (GUILayout.Button($"Set Game View Size to {resolutionSource}") || liveViewSize && (prevWidth != targetResolution.x || prevHeight != targetResolution.y)) { prevWidth = (int)targetResolution.x; prevHeight = (int)targetResolution.y; diff --git a/Tests/SRPTests/Packages/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTestSettings.cs b/Tests/SRPTests/Packages/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTestSettings.cs index 7328ba0dd1d..70829ebabc1 100644 --- a/Tests/SRPTests/Packages/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTestSettings.cs +++ b/Tests/SRPTests/Packages/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTestSettings.cs @@ -1,3 +1,4 @@ +using UnityEngine; using UnityEngine.TestTools.Graphics; public class UniversalGraphicsTestSettings : GraphicsTestSettings @@ -16,7 +17,7 @@ public enum RenderBackendCompatibility } public RenderBackendCompatibility renderBackendCompatibility = RenderBackendCompatibility.RenderGraphAndNonRenderGraph; - [UnityEngine.Tooltip("If enabled, the back buffer resolution will be set to the value specified by Image Comparison Settings -> Image Resolution, before doing the back buffer capture.")] + [HideInInspector] public bool SetBackBufferResolution = false; public UniversalGraphicsTestSettings() diff --git a/Tests/SRPTests/Packages/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTests.cs b/Tests/SRPTests/Packages/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTests.cs index 1a2aa688fc1..33910b09037 100644 --- a/Tests/SRPTests/Packages/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTests.cs +++ b/Tests/SRPTests/Packages/com.unity.testing.urp/Scripts/Runtime/UniversalGraphicsTests.cs @@ -53,8 +53,6 @@ public static IEnumerator RunGraphicsTest(SceneGraphicsTestCase testCase) Watermark.showDeveloperWatermark = false; GraphicsTestLogger.Log( $"Running test case '{testCase}' with scene '{testCase.ScenePath}'."); - GlobalResolutionSetter.SetResolution(RuntimePlatform.Android, width: 1920, height: 1080); - GlobalResolutionSetter.SetResolution(RuntimePlatform.EmbeddedLinuxArm64, width: 1920, height: 1080); SceneManager.LoadScene(testCase.ScenePath); @@ -113,22 +111,20 @@ public static IEnumerator RunGraphicsTest(SceneGraphicsTestCase testCase) if (settings.SetBackBufferResolution) { - // Set screen/backbuffer resolution before doing the capture in ImageAssert.AreEqual. This will avoid doing - // any resizing/scaling of the rendered image when comparing with the reference image in ImageAssert.AreEqual. - // This has to be done before WaitForEndOfFrame, as the request will only be applied after the frame ends. - int targetWidth = settings.ImageComparisonSettings.TargetWidth; - int targetHeight = settings.ImageComparisonSettings.TargetHeight; - Screen.SetResolution(targetWidth, targetHeight, settings.ImageComparisonSettings.UseBackBuffer ? FullScreenMode.FullScreenWindow : Screen.fullScreenMode); - - // Yield once to finish the current frame (this code runs before the rendering in a frame) with the former - // resolution. - // Yield twice to finish the next frame with the new resolution taking effect. - // Note that once the yields finish and the test resumes after the next for loop, the rendering will be - // in the same frame where the new resolution first took place. For effects such as motion vector - // rendering it means if the aspect ratio changes after setting the resolution, the previous camera matrix - // will be reset, cancelling out all the camera-based motions. - // In this case (e.g. UniversalGraphicsTest_Terrain, test scene 300 and 301) increase the wait frame to 3 - // on the UniversalGraphicsTestSettings component. + //This option is disabled and we keep it only to keep the extra wait frames and preserve the existing + // reference image. + + // Changing resolution during a test run introduce instabilities. + // Decides of a resolution for a test run and leave it to that. The resolution for most + // test projects is set to a constant 1080p,except when running in XR compatibility mode. + + // XR compatibility mode changes resolution depending on the target size, because the image is + // always captured from the backbuffer. + + GraphicsTestLogger.Log(LogType.Log, "Set back buffer resolution is being deprecated and does not change the resolution anymore, it only introduces extra wait frames to the test."); + + // Removing this line causes a subset of tests to fail. Removing it would require to update images + // and revisit some tests. waitFrames = Mathf.Max(waitFrames, 2); } diff --git a/Tests/SRPTests/Packages/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs b/Tests/SRPTests/Packages/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs index 3b38248f9c3..b4944019cc7 100644 --- a/Tests/SRPTests/Packages/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs +++ b/Tests/SRPTests/Packages/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs @@ -33,7 +33,15 @@ static public int SetupTest(bool xrCompatible, int waitFrames, UnityEngine.TestT Unity.XR.MockHMD.MockHMD.SetRenderMode(Unity.XR.MockHMD.MockHMDBuildSettings.RenderMode.SinglePassInstanced); // Configure MockHMD to match the original settings from the test scene - UnityEngine.TestTools.Graphics.ImageAssert.GetImageResolution(settings, out int w, out int h); + int w = 1920; + int h = 1080; + + if(!settings.UseBackBuffer) + { + w = settings.TargetWidth; + h = settings.TargetHeight; + } + Unity.XR.MockHMD.MockHMD.SetEyeResolution(w, h); Unity.XR.MockHMD.MockHMD.SetMirrorViewCrop(0.0f); diff --git a/Tests/SRPTests/Packages/local.gtf.references/package.json b/Tests/SRPTests/Packages/local.gtf.references/package.json index 64f99bdc291..a5854e9f0e9 100644 --- a/Tests/SRPTests/Packages/local.gtf.references/package.json +++ b/Tests/SRPTests/Packages/local.gtf.references/package.json @@ -14,6 +14,6 @@ ], "category": "Libraries", "dependencies": { - "com.unity.testframework.graphics": "9.0.0-exp.33" + "com.unity.testframework.graphics": "9.0.0-exp.43" } } diff --git a/Tests/SRPTests/Projects/HDRP_DXR_Tests/Assets/Tests/HDRP_DXR_Graphics_Tests.cs b/Tests/SRPTests/Projects/HDRP_DXR_Tests/Assets/Tests/HDRP_DXR_Graphics_Tests.cs index af35a709bb8..2619fb621da 100644 --- a/Tests/SRPTests/Projects/HDRP_DXR_Tests/Assets/Tests/HDRP_DXR_Graphics_Tests.cs +++ b/Tests/SRPTests/Projects/HDRP_DXR_Tests/Assets/Tests/HDRP_DXR_Graphics_Tests.cs @@ -92,6 +92,13 @@ public IEnumerator Run(SceneGraphicsTestCase testCase) yield return HDRP_GraphicTestRunner.Run(testCase); } + [OneTimeSetUp] + public void OneTimeSetUp() + { + // Standard resolution for backbuffer capture is 1080p + Screen.SetResolution(1920, 1080, true); + } + #if UNITY_EDITOR public void Setup() @@ -143,6 +150,8 @@ public HDRP_GRD_DXR_Graphics_Tests(GpuResidentDrawerContext grdContext) [OneTimeSetUp] public void OneTimeSetUp() { + // Standard resolution for backbuffer capture is 1080p + Screen.SetResolution(1920, 1080, true); SceneManager.LoadScene("GraphicsTestTransitionScene", LoadSceneMode.Single); } diff --git a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Tests/HDRP_Runtime_Graphics_Tests.cs b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Tests/HDRP_Runtime_Graphics_Tests.cs index e563a836c6d..042766bacf5 100644 --- a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Tests/HDRP_Runtime_Graphics_Tests.cs +++ b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Tests/HDRP_Runtime_Graphics_Tests.cs @@ -13,6 +13,13 @@ public class HDRP_Runtime_Graphics_Tests : IPrebuildSetup #endif { + [OneTimeSetUp] + public void SetDefaultResolution() + { + // Standard resolution for backbuffer capture is 1080p + Screen.SetResolution(1920, 1080, true); + } + [UnityTest] [SceneGraphicsTest(@"Assets/Scenes/^[0-9]+")] [Timeout(450 * 1000)] // Set timeout to 450 sec. to handle complex scenes with many shaders (previous timeout was 300s) @@ -44,6 +51,11 @@ public class HDRP_Runtime_Graphics_Tests "", graphicsDeviceTypes: new GraphicsDeviceType[] { GraphicsDeviceType.Metal } )] + [IgnoreGraphicsTest( + "011-HighQualityLines", + "https://jira.unity3d.com/browse/UUM-132442", + runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch } + )] [IgnoreGraphicsTest( "004-CloudsFlaresDecals$", "Area with cloud-coverage is blue on Intel-based MacOS (CI).", diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Tests/HDRP_Graphics_Tests.cs b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Tests/HDRP_Graphics_Tests.cs index bb164e16613..be729336346 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Tests/HDRP_Graphics_Tests.cs +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Tests/HDRP_Graphics_Tests.cs @@ -54,6 +54,8 @@ public HDRP_Graphics_Tests(GpuResidentDrawerContext grdContext) [OneTimeSetUp] public void OneTimeSetUp() { + // Standard resolution for backbuffer capture is 1080p + Screen.SetResolution(1920, 1080, true); SceneManager.LoadScene("GraphicsTestTransitionScene", LoadSceneMode.Single); } diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/Tests/LightBaker/InputExtractionMaterials.cs b/Tests/SRPTests/Projects/HDRP_Tests/Assets/Tests/LightBaker/InputExtractionMaterials.cs index 2f365764adc..c17bbabac38 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/Tests/LightBaker/InputExtractionMaterials.cs +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/Tests/LightBaker/InputExtractionMaterials.cs @@ -163,7 +163,7 @@ Vector4[] textureData } }; - [Test, Category("Graphics"), GraphicsTest(TextureFormat = TextureFormat .RGBAHalf, Extension = "exr")] + [Test, Category("Graphics"), GraphicsTest(TextureFormat = TextureFormat .RGBAHalf, ImageExtension = ImageExtension.EXR)] public void MetaPassTemplateTests( GraphicsTestCase testCase, [ValueSource(nameof(metaPassTests))] MetaPassSceneTest metaPassTest diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/ProjectSettings/ProjectSettings.asset b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/ProjectSettings/ProjectSettings.asset index a961d1e30d5..2f8878b44f1 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/ProjectSettings/ProjectSettings.asset +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 25 + serializedVersion: 28 productGUID: 3d55fb3b8c70e604a84c55c7cb6a259b AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -41,17 +41,19 @@ PlayerSettings: height: 1 m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} - m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1920 defaultScreenHeight: 1080 - defaultScreenWidthWeb: 960 - defaultScreenHeightWeb: 600 + defaultScreenWidthWeb: 1920 + defaultScreenHeightWeb: 1080 m_StereoRenderingPath: 1 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 + m_SpriteBatchMaxVertexCount: 65535 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -67,24 +69,29 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 + androidDisplayOptions: 1 androidBlitType: 1 - androidResizableWindow: 0 + androidResizeableActivity: 0 androidDefaultWindowWidth: 1920 androidDefaultWindowHeight: 1080 androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 1 + androidApplicationEntry: 1 defaultIsNativeResolution: 0 macRetinaSupport: 1 runInBackground: 1 - captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -124,47 +131,51 @@ PlayerSettings: switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchMaxWorkerMultiple: 8 switchNVNGraphicsFirmwareMemory: 32 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 + switchGraphicsJobsSyncAfterKick: 1 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 - m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 1 vrSettings: enable360StereoCapture: 0 - isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 1 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 + androidMinAspectRatio: 1 applicationIdentifier: Android: com.DefaultCompany.GraphicsTests Standalone: com.unity.TestScenesOpenGLES2 buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 22 + AndroidMinSdkVersion: 25 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 + AndroidPreferredDataLocation: 1 aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 @@ -172,16 +183,20 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 13.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 15.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 13.0 + tvOSTargetOSVersionString: 15.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -206,7 +221,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -214,7 +228,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: iOSLaunchScreenCustomStoryboardPath: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] @@ -230,33 +243,40 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 shaderPrecisionModel: 0 clonedFromGUID: 00000000000000000000000000000000 - templatePackageId: - templateDefaultScene: + templatePackageId: + templateDefaultScene: useCustomMainManifest: 0 useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 0 useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 - AndroidTargetDevices: 0 + AndroidAllowedArchitectures: -1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' - AndroidKeyaliasName: + AndroidKeyaliasName: AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -266,11 +286,12 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - chromeosInputEmulation: 1 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 100 + AndroidReportGooglePlayAppDependencies: 1 + androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: - m_BuildTarget: tvOS @@ -279,37 +300,37 @@ PlayerSettings: m_Width: 1280 m_Height: 768 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 800 m_Height: 480 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 400 m_Height: 240 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 4640 m_Height: 1440 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 2320 m_Height: 720 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 3840 m_Height: 1440 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 1920 m_Height: 720 m_Kind: 1 - m_SubKind: + m_SubKind: - m_BuildTarget: iPhone m_Icons: - m_Textures: [] @@ -413,93 +434,94 @@ PlayerSettings: m_Width: 432 m_Height: 432 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 324 m_Height: 324 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 216 m_Height: 216 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 162 m_Height: 162 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 108 m_Height: 108 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 81 m_Height: 81 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 192 m_Height: 192 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 144 m_Height: 144 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 96 m_Height: 96 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 72 m_Height: 72 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 48 m_Height: 48 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 36 m_Height: 36 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 192 m_Height: 192 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 144 m_Height: 144 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 96 m_Height: 96 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 72 m_Height: 72 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 48 m_Height: 48 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 36 m_Height: 36 m_Kind: 0 - m_SubKind: + m_SubKind: m_BuildTargetBatching: [] + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -539,11 +561,16 @@ PlayerSettings: - m_BuildTarget: AndroidPlayer m_APIs: 0b000000 m_Automatic: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_APIs: 0200000012000000 + m_Automatic: 0 m_BuildTargetVRSettings: - m_BuildTarget: Standalone m_Enabled: 0 m_Devices: - MockHMD + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 1 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -561,6 +588,7 @@ PlayerSettings: playModeTestRunnerEnabled: 1 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 + editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 @@ -568,51 +596,51 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: - macOSTargetOSVersion: 10.13.0 + macOSTargetOSVersion: 12.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 - switchScreenResolutionBehavior: 2 + switchScreenResolutionBehavior: 0 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 - switchNSODependencies: - switchCompilerFlags: - switchTitleNames_0: - switchTitleNames_1: - switchTitleNames_2: - switchTitleNames_3: - switchTitleNames_4: - switchTitleNames_5: - switchTitleNames_6: - switchTitleNames_7: - switchTitleNames_8: - switchTitleNames_9: - switchTitleNames_10: - switchTitleNames_11: - switchTitleNames_12: - switchTitleNames_13: - switchTitleNames_14: - switchTitleNames_15: - switchPublisherNames_0: - switchPublisherNames_1: - switchPublisherNames_2: - switchPublisherNames_3: - switchPublisherNames_4: - switchPublisherNames_5: - switchPublisherNames_6: - switchPublisherNames_7: - switchPublisherNames_8: - switchPublisherNames_9: - switchPublisherNames_10: - switchPublisherNames_11: - switchPublisherNames_12: - switchPublisherNames_13: - switchPublisherNames_14: - switchPublisherNames_15: + switchNSODependencies: + switchCompilerFlags: + switchTitleNames_0: + switchTitleNames_1: + switchTitleNames_2: + switchTitleNames_3: + switchTitleNames_4: + switchTitleNames_5: + switchTitleNames_6: + switchTitleNames_7: + switchTitleNames_8: + switchTitleNames_9: + switchTitleNames_10: + switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: + switchTitleNames_15: + switchPublisherNames_0: + switchPublisherNames_1: + switchPublisherNames_2: + switchPublisherNames_3: + switchPublisherNames_4: + switchPublisherNames_5: + switchPublisherNames_6: + switchPublisherNames_7: + switchPublisherNames_8: + switchPublisherNames_9: + switchPublisherNames_10: + switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -645,19 +673,18 @@ PlayerSettings: switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} switchSmallIcons_15: {fileID: 0} - switchManualHTML: - switchAccessibleURLs: - switchLegalInformation: + switchManualHTML: + switchAccessibleURLs: + switchLegalInformation: switchMainThreadStackSize: 1048576 - switchPresenceGroupId: + switchPresenceGroupId: switchLogoHandling: 0 switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 - switchApplicationErrorCodeCategory: + switchApplicationErrorCodeCategory: switchUserAccountSaveDataSize: 0 switchUserAccountSaveDataJournalSize: 0 switchApplicationAttribute: 0 @@ -677,14 +704,14 @@ PlayerSettings: switchRatingsInt_10: 0 switchRatingsInt_11: 0 switchRatingsInt_12: 0 - switchLocalCommunicationIds_0: - switchLocalCommunicationIds_1: - switchLocalCommunicationIds_2: - switchLocalCommunicationIds_3: - switchLocalCommunicationIds_4: - switchLocalCommunicationIds_5: - switchLocalCommunicationIds_6: - switchLocalCommunicationIds_7: + switchLocalCommunicationIds_0: + switchLocalCommunicationIds_1: + switchLocalCommunicationIds_2: + switchLocalCommunicationIds_3: + switchLocalCommunicationIds_4: + switchLocalCommunicationIds_5: + switchLocalCommunicationIds_6: + switchLocalCommunicationIds_7: switchParentalControl: 0 switchAllowsScreenshot: 1 switchAllowsVideoCapturing: 1 @@ -696,6 +723,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -706,42 +734,44 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 + switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: 12 - ps4NPTitleSecret: - ps4NPTrophyPackPath: + ps4NPTitleSecret: + ps4NPTrophyPackPath: ps4ParentalLevel: 11 ps4ContentID: ED1633-NPXX51362_00-0000000000000000 ps4Category: 0 ps4MasterVersion: 01.00 ps4AppVersion: 01.00 ps4AppType: 0 - ps4ParamSfxPath: + ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 ps4VideoOutReprojectionRate: 60 - ps4PronunciationXMLPath: - ps4PronunciationSIGPath: - ps4BackgroundImagePath: - ps4StartupImagePath: - ps4StartupImagesFolder: - ps4IconImagesFolder: - ps4SaveDataImagePath: - ps4SdkOverride: - ps4BGMPath: - ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: - ps4ExtraSceSysFile: - ps4NPtitleDatPath: + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4StartupImagesFolder: + ps4IconImagesFolder: + ps4SaveDataImagePath: + ps4SdkOverride: + ps4BGMPath: + ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: + ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: + ps4RemotePlayKeyMappingDir: ps4PlayTogetherPlayerCount: 0 ps4EnterButtonAssignment: 2 ps4ApplicationParam1: 0 @@ -769,9 +799,9 @@ PlayerSettings: ps4ScriptOptimizationLevel: 2 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: ps4PatchDayOne: 0 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 @@ -787,19 +817,19 @@ PlayerSettings: ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 - monoEnv: + monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} blurSplashScreenBackground: 1 - spritePackerPolicy: + spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 - webGLEmscriptenArgs: - webGLModulesDirectory: + webGLEmscriptenArgs: + webGLModulesDirectory: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 @@ -815,6 +845,11 @@ PlayerSettings: webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 + webGLWebAssemblyTable: 0 + webGLWebAssemblyBigInt: 0 + webGLCloseOnQuit: 0 + webWasm2023: 0 + webEnableSubmoduleStrippingCompatibility: 0 scriptingDefineSymbols: Android: LWRP_DEBUG_STATIC_POSTFX Nintendo Switch: LWRP_DEBUG_STATIC_POSTFX @@ -827,29 +862,30 @@ PlayerSettings: tvOS: LWRP_DEBUG_STATIC_POSTFX additionalCompilerArguments: {} platformArchitecture: {} - scriptingBackend: {} + scriptingBackend: + Android: 0 il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} + il2cppStacktraceInformation: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} + editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: GraphicsTests metroPackageVersion: 1.0.0.0 - metroCertificatePath: - metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: + metroCertificatePath: + metroCertificatePassword: + metroCertificateSubject: + metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: GraphicsTests wsaImages: {} @@ -866,25 +902,26 @@ PlayerSettings: metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} - metroFTAName: + metroFTAName: metroFTAFileTypes: [] - metroProtocolName: - vcxProjDefaultLanguage: - XboxOneProductId: - XboxOneUpdateKey: - XboxOneSandboxId: - XboxOneContentId: - XboxOneTitleId: - XboxOneSCId: - XboxOneGameOsOverridePath: - XboxOnePackagingOverridePath: - XboxOneAppManifestOverridePath: + metroProtocolName: + vcxProjDefaultLanguage: + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 - XboxOneDescription: + XboxOneDescription: XboxOneLanguage: - enus XboxOneCapability: [] @@ -897,35 +934,44 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - XboxOneOverrideIdentityName: - XboxOneOverrideIdentityPublisher: + XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: vrEditorSettings: {} cloudServicesEnabled: {} luminIcon: - m_Name: - m_ModelFolderPath: - m_PortalFolderPath: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: luminCert: - m_CertPath: + m_CertPath: m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 - m_VersionName: - hmiPlayerDataPath: + m_VersionName: + hmiPlayerDataPath: hmiForceSRGBBlit: 1 embeddedLinuxEnableGamepadInput: 1 hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: apiCompatibilityLevel: 6 + captureStartupLogs: {} activeInputHandler: 0 windowsGamepadBackendHint: 0 - cloudProjectId: + cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] - projectName: - organizationId: + projectName: + organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 1 hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 insecureHttpOption: 0 + androidVulkanDenyFilterList: [] + androidVulkanAllowFilterList: [] + androidVulkanDeviceFilterListAsset: {fileID: 0} + d3d12DeviceFilterListAsset: {fileID: 0} + allowedHttpConnections: 3 diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube.unity b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube.unity index 60cb868156d..fd900c93636 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube.unity +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18029502, g: 0.22572649, b: 0.30692935, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -134,6 +133,7 @@ GameObject: - component: {fileID: 380492251} - component: {fileID: 380492250} - component: {fileID: 380492252} + - component: {fileID: 380492255} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -172,6 +172,7 @@ MonoBehaviour: ImageComparisonSettings: TargetWidth: 512 TargetHeight: 512 + TargetMSAASamples: 1 PerPixelCorrectnessThreshold: 0.005 PerPixelGammaThreshold: 0.003921569 PerPixelAlphaThreshold: 0.003921569 @@ -180,12 +181,14 @@ MonoBehaviour: IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 UseBackBuffer: 0 - ImageResolution: 0 ActiveImageTests: 1 ActivePixelTests: 7 WaitFrames: 0 XRCompatible: 1 + gpuDrivenCompatible: 1 CheckMemoryAllocation: 1 + renderBackendCompatibility: 2 + SetBackBufferResolution: 0 --- !u!20 &380492253 Camera: m_ObjectHideFlags: 0 @@ -244,14 +247,58 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 380492249} + serializedVersion: 2 m_LocalRotation: {x: 0.24609356, y: 0.36251447, z: -0.099864565, w: 0.89333546} m_LocalPosition: {x: -3.6031294, y: 2.2863412, z: 26.36942} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &380492255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 380492249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + 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_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &707831285 GameObject: m_ObjectHideFlags: 0 @@ -278,15 +325,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 707831285} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 13 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_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -330,8 +376,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 + m_ForceVisible: 0 + m_ShapeRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &707831287 Transform: m_ObjectHideFlags: 0 @@ -339,13 +389,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 707831285} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &707831288 MonoBehaviour: @@ -359,63 +409,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 ---- !u!1 &1159751076 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1159751078} - - component: {fileID: 1159751077} - m_Layer: 0 - m_Name: Resolution setter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1159751077 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159751076} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b7a791aa4ee448a7a269341301b2063, type: 3} - m_Name: - m_EditorClassIdentifier: - customResolutionSettings: {fileID: 11400000, guid: 73b21b64e959149e3a2168f1ef286e21, - type: 2} ---- !u!4 &1159751078 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159751076} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &1203640971 GameObject: m_ObjectHideFlags: 0 @@ -452,6 +462,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -473,9 +488,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1203640973 BoxCollider: @@ -513,13 +530,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1203640971} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.8925657, y: 0.82283884, z: 28.129997} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1396913726 GameObject: @@ -551,6 +568,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: qualityLevelIndex: 0 + callbacks: [] --- !u!4 &1396913728 Transform: m_ObjectHideFlags: 0 @@ -558,13 +576,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1396913726} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.5195698, y: 1.3765798, z: 0.5559635} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2119664221 GameObject: @@ -602,11 +620,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2119664221} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1396913728} + - {fileID: 380492254} + - {fileID: 707831287} + - {fileID: 1203640975} + - {fileID: 2119664223} diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/350_VRS_CustomPass.unity b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/350_VRS_CustomPass.unity index f00baf668a5..cecf2ee227a 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/350_VRS_CustomPass.unity +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/350_VRS_CustomPass.unity @@ -163,7 +163,6 @@ MonoBehaviour: IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 UseBackBuffer: 0 - ImageResolution: 3 ActiveImageTests: 1 ActivePixelTests: -1 WaitFrames: 0 @@ -274,7 +273,6 @@ MonoBehaviour: m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: m_Quality: 3 m_FrameInfluence: 0.1 @@ -282,6 +280,7 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &677415232 GameObject: m_ObjectHideFlags: 0 @@ -343,6 +342,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -364,9 +365,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &677415235 MeshFilter: @@ -417,14 +420,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 707831285} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 13 m_Type: 1 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_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -469,7 +472,7 @@ Light: m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 m_ForceVisible: 0 - m_ShadowRadius: 0 + m_ShapeRadius: 0 m_ShadowAngle: 0 m_LightUnit: 1 m_LuxAtDistance: 1 @@ -501,63 +504,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 ---- !u!1 &1159751076 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1159751078} - - component: {fileID: 1159751077} - m_Layer: 0 - m_Name: Resolution setter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1159751077 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159751076} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b7a791aa4ee448a7a269341301b2063, type: 3} - m_Name: - m_EditorClassIdentifier: - customResolutionSettings: {fileID: 11400000, guid: 73b21b64e959149e3a2168f1ef286e21, - type: 2} ---- !u!4 &1159751078 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159751076} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &1282555821 GameObject: m_ObjectHideFlags: 0 @@ -618,6 +581,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -639,9 +604,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1282555824 MeshFilter: @@ -764,6 +731,5 @@ SceneRoots: - {fileID: 380492254} - {fileID: 707831287} - {fileID: 2119664223} - - {fileID: 1159751078} - {fileID: 677415236} - {fileID: 1282555825} diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/ProjectSettings/ProjectSettings.asset b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/ProjectSettings/ProjectSettings.asset index a21a4d25463..d680005dfa2 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/ProjectSettings/ProjectSettings.asset +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/ProjectSettings/ProjectSettings.asset @@ -17,8 +17,8 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 1 - m_ShowUnitySplashLogo: 1 + m_ShowUnitySplashScreen: 0 + m_ShowUnitySplashLogo: 0 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 m_SplashScreenLogoStyle: 1 @@ -41,11 +41,10 @@ PlayerSettings: height: 1 m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} - m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1920 defaultScreenHeight: 1080 - defaultScreenWidthWeb: 960 - defaultScreenHeightWeb: 600 + defaultScreenWidthWeb: 1920 + defaultScreenHeightWeb: 1080 m_StereoRenderingPath: 1 m_ActiveColorSpace: 1 unsupportedMSAAFallback: 0 @@ -70,6 +69,7 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 + androidDisplayOptions: 1 androidBlitType: 0 androidResizeableActivity: 0 androidDefaultWindowWidth: 1920 @@ -95,7 +95,7 @@ PlayerSettings: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 @@ -107,7 +107,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 3 + fullscreenMode: 0 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 @@ -146,12 +146,10 @@ PlayerSettings: preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 - m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 1 vrSettings: enable360StereoCapture: 0 - isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 allowHDRDisplaySupport: 0 @@ -175,9 +173,10 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 23 + AndroidMinSdkVersion: 25 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 + AndroidPreferredDataLocation: 1 aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 @@ -192,11 +191,11 @@ PlayerSettings: VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 iOSSimulatorArchitecture: 0 - iOSTargetOSVersionString: 13.0 + iOSTargetOSVersionString: 15.0 tvOSSdkVersion: 0 tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 13.0 + tvOSTargetOSVersionString: 15.0 VisionOSSdkVersion: 0 VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 @@ -488,7 +487,7 @@ PlayerSettings: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 0 - m_DynamicBatching: 1 + m_DynamicBatching: 0 m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport @@ -549,7 +548,10 @@ PlayerSettings: m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] - m_BuildTargetDefaultTextureCompressionFormat: [] + m_BuildTargetDefaultTextureCompressionFormat: + - serializedVersion: 3 + m_BuildTarget: WebGL + m_Formats: 05000000 playModeTestRunnerEnabled: 1 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -561,7 +563,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: - macOSTargetOSVersion: 11.0 + macOSTargetOSVersion: 12.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -940,3 +942,5 @@ PlayerSettings: androidVulkanDenyFilterList: [] androidVulkanAllowFilterList: [] androidVulkanDeviceFilterListAsset: {fileID: 0} + d3d12DeviceFilterListAsset: {fileID: 0} + allowedHttpConnections: 3 diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_Lighting/ProjectSettings/ProjectSettings.asset b/Tests/SRPTests/Projects/UniversalGraphicsTest_Lighting/ProjectSettings/ProjectSettings.asset index 74dcbfd99cb..d268cc447ab 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_Lighting/ProjectSettings/ProjectSettings.asset +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_Lighting/ProjectSettings/ProjectSettings.asset @@ -41,11 +41,10 @@ PlayerSettings: height: 1 m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} - m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1920 defaultScreenHeight: 1080 - defaultScreenWidthWeb: 960 - defaultScreenHeightWeb: 600 + defaultScreenWidthWeb: 1920 + defaultScreenHeightWeb: 1080 m_StereoRenderingPath: 1 m_ActiveColorSpace: 1 unsupportedMSAAFallback: 0 @@ -141,12 +140,10 @@ PlayerSettings: preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 - m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 1 vrSettings: enable360StereoCapture: 0 - isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 allowHDRDisplaySupport: 0 @@ -173,7 +170,7 @@ PlayerSettings: AndroidMinSdkVersion: 23 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 - aotOptions: + aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 @@ -216,7 +213,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: + iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -224,9 +221,9 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSLaunchScreenCustomStoryboardPath: - iOSLaunchScreeniPadCustomStoryboardPath: + iOSLaunchScreeniPadCustomXibPath: + iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] macOSURLSchemes: [] @@ -237,10 +234,10 @@ PlayerSettings: metalCompileShaderBinary: 1 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 - appleDeveloperTeamID: - iOSManualSigningProvisioningProfileID: - tvOSManualSigningProvisioningProfileID: - bratwurstManualSigningProvisioningProfileID: + appleDeveloperTeamID: + iOSManualSigningProvisioningProfileID: + tvOSManualSigningProvisioningProfileID: + bratwurstManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 bratwurstManualSigningProvisioningProfileType: 0 @@ -250,8 +247,8 @@ PlayerSettings: appleEnableProMotion: 0 shaderPrecisionModel: 0 clonedFromGUID: 00000000000000000000000000000000 - templatePackageId: - templateDefaultScene: + templatePackageId: + templateDefaultScene: useCustomMainManifest: 0 useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 0 @@ -265,7 +262,7 @@ PlayerSettings: AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' - AndroidKeyaliasName: + AndroidKeyaliasName: AndroidEnableArmv9SecurityFeatures: 0 AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 @@ -391,92 +388,92 @@ PlayerSettings: m_Width: 432 m_Height: 432 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 324 m_Height: 324 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 216 m_Height: 216 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 162 m_Height: 162 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 108 m_Height: 108 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 81 m_Height: 81 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 192 m_Height: 192 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 144 m_Height: 144 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 96 m_Height: 96 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 72 m_Height: 72 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 48 m_Height: 48 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 36 m_Height: 36 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 192 m_Height: 192 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 144 m_Height: 144 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 96 m_Height: 96 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 72 m_Height: 72 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 48 m_Height: 48 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 36 m_Height: 36 m_Kind: 0 - m_SubKind: + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 0 @@ -554,23 +551,23 @@ PlayerSettings: enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 - cameraUsageDescription: - locationUsageDescription: - microphoneUsageDescription: - bluetoothUsageDescription: + cameraUsageDescription: + locationUsageDescription: + microphoneUsageDescription: + bluetoothUsageDescription: macOSTargetOSVersion: 10.13.0 - switchNMETAOverride: - switchNetLibKey: + switchNMETAOverride: + switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 - switchScreenResolutionBehavior: 2 + switchScreenResolutionBehavior: 0 switchUseCPUProfiler: 0 switchEnableFileSystemTrace: 0 switchUseGOLDLinker: 0 switchLTOSetting: 0 - switchNSODependencies: - switchCompilerFlags: + switchNSODependencies: + switchCompilerFlags: switchSupportedNpadStyles: 3 switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 @@ -594,35 +591,35 @@ PlayerSettings: switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 - ps4NPTitleSecret: - ps4NPTrophyPackPath: + ps4NPTitleSecret: + ps4NPTrophyPackPath: ps4ParentalLevel: 11 ps4ContentID: ED1633-NPXX51362_00-0000000000000000 ps4Category: 0 ps4MasterVersion: 01.00 ps4AppVersion: 01.00 ps4AppType: 0 - ps4ParamSfxPath: + ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 ps4VideoOutReprojectionRate: 60 - ps4PronunciationXMLPath: - ps4PronunciationSIGPath: - ps4BackgroundImagePath: - ps4StartupImagePath: - ps4StartupImagesFolder: - ps4IconImagesFolder: - ps4SaveDataImagePath: - ps4SdkOverride: - ps4BGMPath: - ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: - ps4ExtraSceSysFile: - ps4NPtitleDatPath: + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4StartupImagesFolder: + ps4IconImagesFolder: + ps4SaveDataImagePath: + ps4SdkOverride: + ps4BGMPath: + ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: + ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: + ps4RemotePlayKeyMappingDir: ps4PlayTogetherPlayerCount: 0 ps4EnterButtonAssignment: 2 ps4ApplicationParam1: 0 @@ -650,9 +647,9 @@ PlayerSettings: ps4ScriptOptimizationLevel: 2 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: ps4PatchDayOne: 0 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 @@ -668,19 +665,19 @@ PlayerSettings: ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 - monoEnv: + monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} blurSplashScreenBackground: 1 - spritePackerPolicy: + spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 - webGLEmscriptenArgs: - webGLModulesDirectory: + webGLEmscriptenArgs: + webGLModulesDirectory: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 @@ -724,7 +721,7 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - additionalIl2CppArgs: + additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 gcWBarrierValidation: 0 @@ -733,15 +730,15 @@ PlayerSettings: m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: GraphicsTests - metroPackageVersion: - metroCertificatePath: - metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: + metroPackageVersion: + metroCertificatePath: + metroCertificatePassword: + metroCertificateSubject: + metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: GraphicsTests wsaImages: {} - metroTileShortName: + metroTileShortName: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -756,23 +753,23 @@ PlayerSettings: metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} - metroFTAName: + metroFTAName: metroFTAFileTypes: [] - metroProtocolName: - vcxProjDefaultLanguage: - XboxOneProductId: - XboxOneUpdateKey: - XboxOneSandboxId: - XboxOneContentId: - XboxOneTitleId: - XboxOneSCId: - XboxOneGameOsOverridePath: - XboxOnePackagingOverridePath: - XboxOneAppManifestOverridePath: + metroProtocolName: + vcxProjDefaultLanguage: + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 - XboxOneDescription: + XboxOneDescription: XboxOneLanguage: - enus XboxOneCapability: [] @@ -785,36 +782,36 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - XboxOneOverrideIdentityName: - XboxOneOverrideIdentityPublisher: + XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: vrEditorSettings: {} cloudServicesEnabled: {} luminIcon: - m_Name: - m_ModelFolderPath: - m_PortalFolderPath: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: luminCert: - m_CertPath: + m_CertPath: m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 - m_VersionName: - hmiPlayerDataPath: + m_VersionName: + hmiPlayerDataPath: hmiForceSRGBBlit: 1 embeddedLinuxEnableGamepadInput: 1 - hmiCpuConfiguration: + hmiCpuConfiguration: hmiLogStartupTiming: 0 - qnxGraphicConfPath: + qnxGraphicConfPath: apiCompatibilityLevel: 6 captureStartupLogs: {} activeInputHandler: 0 windowsGamepadBackendHint: 0 - cloudProjectId: + cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] - projectName: - organizationId: + projectName: + organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 1 hmiLoadingImage: {fileID: 0} diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Assets/Scenes/071_ChromaticAberration.unity b/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Assets/Scenes/071_ChromaticAberration.unity index 1632021d005..ebbb0e72033 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Assets/Scenes/071_ChromaticAberration.unity +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Assets/Scenes/071_ChromaticAberration.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: 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 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -161,13 +160,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 255570693} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &896969948 GameObject: @@ -204,6 +203,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -225,9 +229,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: @@ -244,60 +250,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 896969948} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1271118584 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1271118585} - - component: {fileID: 1271118586} - m_Layer: 0 - m_Name: Resolution setter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1271118585 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271118584} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1271118586 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271118584} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b7a791aa4ee448a7a269341301b2063, type: 3} - m_Name: - m_EditorClassIdentifier: - customResolutionSettings: {fileID: 11400000, guid: edb26acb1cd7e47baa34647cef262829, - type: 2} --- !u!1 &1340572837 GameObject: m_ObjectHideFlags: 0 @@ -328,6 +288,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: qualityLevelIndex: 0 + callbacks: [] --- !u!4 &1340572839 Transform: m_ObjectHideFlags: 0 @@ -335,13 +296,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1340572837} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1598565826 GameObject: @@ -392,19 +353,20 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 m_UseScreenCoordOverride: 0 m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!114 &1598565828 MonoBehaviour: m_ObjectHideFlags: 0 @@ -420,6 +382,7 @@ MonoBehaviour: ImageComparisonSettings: TargetWidth: 256 TargetHeight: 256 + TargetMSAASamples: 1 PerPixelCorrectnessThreshold: 0.005 PerPixelGammaThreshold: 0.003921569 PerPixelAlphaThreshold: 0.003921569 @@ -428,12 +391,14 @@ MonoBehaviour: IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 UseBackBuffer: 0 - ImageResolution: 0 ActiveImageTests: 1 ActivePixelTests: 7 WaitFrames: 0 XRCompatible: 1 + gpuDrivenCompatible: 1 CheckMemoryAllocation: 1 + renderBackendCompatibility: 2 + SetBackBufferResolution: 0 --- !u!20 &1598565829 Camera: m_ObjectHideFlags: 0 @@ -492,11 +457,19 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1598565826} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1340572839} + - {fileID: 1598565830} + - {fileID: 255570695} + - {fileID: 896969951} diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Assets/Scenes/375_HDROutput_UpscalingFilters/375_URP_Asset_HDROutput_FSR.asset b/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Assets/Scenes/375_HDROutput_UpscalingFilters/375_URP_Asset_HDROutput_FSR.asset index 10730a3107a..f2db22e24ab 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Assets/Scenes/375_HDROutput_UpscalingFilters/375_URP_Asset_HDROutput_FSR.asset +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/Assets/Scenes/375_HDROutput_UpscalingFilters/375_URP_Asset_HDROutput_FSR.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: 375_URP_Asset_HDROutput_FSR m_EditorClassIdentifier: - k_AssetVersion: 12 - k_AssetPreviousVersion: 12 + k_AssetVersion: 13 + k_AssetPreviousVersion: 13 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -53,6 +53,7 @@ MonoBehaviour: m_AdditionalLightsShadowResolutionTierHigh: 512 m_ReflectionProbeBlending: 0 m_ReflectionProbeBoxProjection: 0 + m_ReflectionProbeAtlas: 1 m_ShadowDistance: 50 m_ShadowCascadeCount: 1 m_Cascade2Split: 0.25 @@ -127,8 +128,14 @@ MonoBehaviour: m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 0 + m_PrefilterScreenSpaceIrradiance: 0 m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterBicubicLightmapSampling: 0 + m_PrefilterReflectionProbeRotation: 0 + m_PrefilterReflectionProbeBlending: 0 + m_PrefilterReflectionProbeBoxProjection: 0 + m_PrefilterReflectionProbeAtlas: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/ProjectSettings/ProjectSettings.asset b/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/ProjectSettings/ProjectSettings.asset index e5518e18169..5b31cc09567 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/ProjectSettings/ProjectSettings.asset +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_PostPro/ProjectSettings/ProjectSettings.asset @@ -41,11 +41,10 @@ PlayerSettings: height: 1 m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} - m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1920 defaultScreenHeight: 1080 - defaultScreenWidthWeb: 960 - defaultScreenHeightWeb: 600 + defaultScreenWidthWeb: 1920 + defaultScreenHeightWeb: 1080 m_StereoRenderingPath: 1 m_ActiveColorSpace: 1 unsupportedMSAAFallback: 0 @@ -141,12 +140,10 @@ PlayerSettings: preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 - m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 1 vrSettings: enable360StereoCapture: 0 - isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 allowHDRDisplaySupport: 1 @@ -172,7 +169,7 @@ PlayerSettings: AndroidMinSdkVersion: 23 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 - aotOptions: + aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 @@ -215,7 +212,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: + iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -223,9 +220,9 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSLaunchScreenCustomStoryboardPath: - iOSLaunchScreeniPadCustomStoryboardPath: + iOSLaunchScreeniPadCustomXibPath: + iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] macOSURLSchemes: [] @@ -236,10 +233,10 @@ PlayerSettings: metalCompileShaderBinary: 1 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 - appleDeveloperTeamID: - iOSManualSigningProvisioningProfileID: - tvOSManualSigningProvisioningProfileID: - bratwurstManualSigningProvisioningProfileID: + appleDeveloperTeamID: + iOSManualSigningProvisioningProfileID: + tvOSManualSigningProvisioningProfileID: + bratwurstManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 bratwurstManualSigningProvisioningProfileType: 0 @@ -249,8 +246,8 @@ PlayerSettings: appleEnableProMotion: 0 shaderPrecisionModel: 0 clonedFromGUID: 00000000000000000000000000000000 - templatePackageId: - templateDefaultScene: + templatePackageId: + templateDefaultScene: useCustomMainManifest: 0 useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 0 @@ -264,7 +261,7 @@ PlayerSettings: AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' - AndroidKeyaliasName: + AndroidKeyaliasName: AndroidEnableArmv9SecurityFeatures: 0 AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 @@ -390,92 +387,92 @@ PlayerSettings: m_Width: 432 m_Height: 432 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 324 m_Height: 324 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 216 m_Height: 216 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 162 m_Height: 162 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 108 m_Height: 108 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 81 m_Height: 81 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 192 m_Height: 192 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 144 m_Height: 144 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 96 m_Height: 96 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 72 m_Height: 72 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 48 m_Height: 48 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 36 m_Height: 36 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 192 m_Height: 192 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 144 m_Height: 144 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 96 m_Height: 96 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 72 m_Height: 72 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 48 m_Height: 48 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 36 m_Height: 36 m_Kind: 0 - m_SubKind: + m_SubKind: m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: @@ -547,13 +544,13 @@ PlayerSettings: enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 - cameraUsageDescription: - locationUsageDescription: - microphoneUsageDescription: - bluetoothUsageDescription: + cameraUsageDescription: + locationUsageDescription: + microphoneUsageDescription: + bluetoothUsageDescription: macOSTargetOSVersion: 10.13.0 - switchNMETAOverride: - switchNetLibKey: + switchNMETAOverride: + switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 @@ -562,8 +559,8 @@ PlayerSettings: switchEnableFileSystemTrace: 0 switchUseGOLDLinker: 0 switchLTOSetting: 0 - switchNSODependencies: - switchCompilerFlags: + switchNSODependencies: + switchCompilerFlags: switchSupportedNpadStyles: 3 switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 @@ -587,35 +584,35 @@ PlayerSettings: switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 - ps4NPTitleSecret: - ps4NPTrophyPackPath: + ps4NPTitleSecret: + ps4NPTrophyPackPath: ps4ParentalLevel: 11 ps4ContentID: ED1633-NPXX51362_00-0000000000000000 ps4Category: 0 ps4MasterVersion: 01.00 ps4AppVersion: 01.00 ps4AppType: 0 - ps4ParamSfxPath: + ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 ps4VideoOutReprojectionRate: 60 - ps4PronunciationXMLPath: - ps4PronunciationSIGPath: - ps4BackgroundImagePath: - ps4StartupImagePath: - ps4StartupImagesFolder: - ps4IconImagesFolder: - ps4SaveDataImagePath: - ps4SdkOverride: - ps4BGMPath: - ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: - ps4ExtraSceSysFile: - ps4NPtitleDatPath: + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4StartupImagesFolder: + ps4IconImagesFolder: + ps4SaveDataImagePath: + ps4SdkOverride: + ps4BGMPath: + ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: + ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: + ps4RemotePlayKeyMappingDir: ps4PlayTogetherPlayerCount: 0 ps4EnterButtonAssignment: 2 ps4ApplicationParam1: 0 @@ -643,9 +640,9 @@ PlayerSettings: ps4ScriptOptimizationLevel: 2 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: ps4PatchDayOne: 0 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 @@ -673,19 +670,19 @@ PlayerSettings: - libSceNpToolkit2.prx - libSceS3DConversion.prx ps4attribVROutputEnabled: 0 - monoEnv: + monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} blurSplashScreenBackground: 1 - spritePackerPolicy: + spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 - webGLEmscriptenArgs: - webGLModulesDirectory: + webGLEmscriptenArgs: + webGLModulesDirectory: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 @@ -730,7 +727,7 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - additionalIl2CppArgs: + additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 gcWBarrierValidation: 0 @@ -739,15 +736,15 @@ PlayerSettings: m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: GraphicsTests - metroPackageVersion: - metroCertificatePath: - metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: + metroPackageVersion: + metroCertificatePath: + metroCertificatePassword: + metroCertificateSubject: + metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: GraphicsTests wsaImages: {} - metroTileShortName: + metroTileShortName: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -762,23 +759,23 @@ PlayerSettings: metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} - metroFTAName: + metroFTAName: metroFTAFileTypes: [] - metroProtocolName: - vcxProjDefaultLanguage: - XboxOneProductId: - XboxOneUpdateKey: - XboxOneSandboxId: - XboxOneContentId: - XboxOneTitleId: - XboxOneSCId: - XboxOneGameOsOverridePath: - XboxOnePackagingOverridePath: - XboxOneAppManifestOverridePath: + metroProtocolName: + vcxProjDefaultLanguage: + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 - XboxOneDescription: + XboxOneDescription: XboxOneLanguage: - enus XboxOneCapability: [] @@ -791,36 +788,36 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - XboxOneOverrideIdentityName: - XboxOneOverrideIdentityPublisher: + XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: vrEditorSettings: {} cloudServicesEnabled: {} luminIcon: - m_Name: - m_ModelFolderPath: - m_PortalFolderPath: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: luminCert: - m_CertPath: + m_CertPath: m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 - m_VersionName: - hmiPlayerDataPath: + m_VersionName: + hmiPlayerDataPath: hmiForceSRGBBlit: 1 embeddedLinuxEnableGamepadInput: 1 - hmiCpuConfiguration: + hmiCpuConfiguration: hmiLogStartupTiming: 0 - qnxGraphicConfPath: + qnxGraphicConfPath: apiCompatibilityLevel: 6 captureStartupLogs: {} activeInputHandler: 0 windowsGamepadBackendHint: 0 - cloudProjectId: + cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] - projectName: - organizationId: + projectName: + organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 1 hmiLoadingImage: {fileID: 0} From b269bc7df7dbcd98a7e9ec5d3ba360fec34a9915 Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Tue, 17 Feb 2026 06:06:32 +0000 Subject: [PATCH 03/12] [Port] [6000.3] docg-8422: Remove deprecated link --- .../Documentation~/getting-started-in-hdrp.md | 1 - 1 file changed, 1 deletion(-) diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/getting-started-in-hdrp.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/getting-started-in-hdrp.md index 036be6fb1f3..c026620fec1 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/getting-started-in-hdrp.md +++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/getting-started-in-hdrp.md @@ -10,4 +10,3 @@ Set up a project to use the High Definition Render Pipeline (HDRP), and use Volu ## Additional resources - [HDRP overview](HDRP-Features.md) -- [Achieving High Fidelity Graphics for Games with HDRP](https://resources.unity.com/unitenow/onlinesessions/achieving-high-fidelity-graphics-for-games-with-hdrp) From 5e90f71c1241c45a7ff7b6bd25687dcc01267448 Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Tue, 17 Feb 2026 06:06:33 +0000 Subject: [PATCH 04/12] [Port] [6000.3] [PS5, PS4] Fix built-in RP warnings when using shadergraph shaders on PS4 or PS5 --- .../BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl index 27b5d3eba3a..9afdfcea44b 100644 --- a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl +++ b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/HLSLSupportShim.hlsl @@ -16,12 +16,19 @@ #define SHADOWS_NATIVE +#undef fixed #define fixed real +#undef fixed2 #define fixed2 real2 +#undef fixed3 #define fixed3 real3 +#undef fixed4 #define fixed4 real4 +#undef fixed4x4 #define fixed4x4 real4x4 +#undef fixed3x3 #define fixed3x3 real3x3 +#undef fixed2x2 #define fixed2x2 real2x2 #define UNITY_INITIALIZE_OUTPUT(type,name) ZERO_INITIALIZE(type, name) From 5de7415b12ec96c0beafbbdea7a73c6ae9cccd8f Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Wed, 18 Feb 2026 08:43:08 +0000 Subject: [PATCH 05/12] [Port] [6000.3] [ShaderGraph] Fix Enum Labels and a few other issues --- .../Editor/Data/Nodes/Channel/SwizzleNode.cs | 2 +- .../Editor/Data/Nodes/Utility/KeywordNode.cs | 5 +++-- .../Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs | 6 +++++- .../Editor/Generation/Processors/Generator.cs | 4 ---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs index 210b7c7604a..ba02cc7ff4a 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs @@ -36,7 +36,7 @@ public string maskInput get { return _maskInput; } set { - if (_maskInput.Equals(value)) + if (value == null || _maskInput.Equals(value)) return; _maskInput = value; UpdateNodeAfterDeserialization(); diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs index b1d7a4e873e..f3810ccf737 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs @@ -154,8 +154,9 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo sb.AppendLine(string.Format($"{outputSlot.concreteValueType.ToShaderString()} {GetVariableNameForSlot(OutputSlotId)};")); for(int i = 0; i < keyword.entries.Count; ++i) { - string keywordName = $"{keyword.referenceName}_{keyword.entries[i].referenceName}"; - var value = GetSlotValue(i + 1, generationMode); + var keywordEntry = keyword.entries[i]; + string keywordName = $"{keyword.referenceName}_{keywordEntry.referenceName}"; + var value = GetSlotValue(keywordEntry.id, generationMode); sb.AppendLine(string.Format($"{(i != 0 ? "else" : "")} if({keywordName}) {GetVariableNameForSlot(OutputSlotId)} = {value};")); } break; diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs index e2c038f8950..187a8577d9e 100644 --- a/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs +++ b/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs @@ -1600,7 +1600,8 @@ void BuildKeywordFields(PropertySheet propertySheet, ShaderInput shaderInput) return; keyword.keywordDefinition = (KeywordDefinition)newValue; UpdateEnableState(); - this._postChangeValueCallback(true, ModificationScope.Nothing); + this._postChangeValueCallback(true); + this._keywordChangedCallback(); }, keyword.keywordDefinition, "Definition", @@ -1960,6 +1961,7 @@ void KeywordAddCallbacks() keyword.entries[index] = new KeywordEntry(entry.id, displayName, referenceName); this._postChangeValueCallback(true); + this._keywordChangedCallback(); } }; @@ -2066,6 +2068,8 @@ void KeywordReorderEntries(ReorderableList list) { this._preChangeValueCallback("Reorder Keyword Entry"); this._postChangeValueCallback(true); + this._keywordChangedCallback(); + } public string GetDuplicateSafeEnumDisplayName(int id, string name) diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs b/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs index d2d4dc4bfc9..dd53a92c2f4 100644 --- a/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs +++ b/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs @@ -597,10 +597,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo List nodeList, List slotList) { if (passBlockMask == null) - { - Profiler.EndSample(); return; - } Profiler.BeginSample("ProcessStackForPass"); foreach (var blockFieldDescriptor in passBlockMask) @@ -832,7 +829,6 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo // Generated structs and Packing code Profiler.BeginSample("StructsAndPacking"); var interpolatorBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable); - if (passStructs != null) { var packedStructs = new List(); From d7f20455c4b3f1932fa59f1501017c1e1e861a27 Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Wed, 18 Feb 2026 08:43:08 +0000 Subject: [PATCH 06/12] [Port] [6000.3] [Bugfix] Reflection probe rotation setting included in build --- .../Runtime/Settings/URPReflectionProbeSettings.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPReflectionProbeSettings.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPReflectionProbeSettings.cs index 4f16a3aa5ad..47677c29327 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPReflectionProbeSettings.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPReflectionProbeSettings.cs @@ -18,6 +18,7 @@ public class URPReflectionProbeSettings : IRenderPipelineGraphicsSettings [SerializeField, HideInInspector] private int version = 1; int IRenderPipelineGraphicsSettings.version => version; + bool IRenderPipelineGraphicsSettings.isAvailableInPlayerBuild => true; [SerializeField, Tooltip("Use ReflectionProbe rotation. Enabling this will improve the appearance of reflections when the ReflectionProbe isn't axis aligned, but may worsen performance on lower end platforms.")] private bool useReflectionProbeRotation = true; From 703a3e22f67ebc6ebbff0731f8088b21f6f4fd60 Mon Sep 17 00:00:00 2001 From: Reach Platform Support Date: Fri, 20 Feb 2026 04:45:05 +0000 Subject: [PATCH 07/12] [Port] [6000.3] Web accessibility fixes in Shader Graph documentation --- .../Documentation~/Blackboard.md | 7 +- .../Documentation~/Block-Node.md | 2 - .../Documentation~/Boolean-Node.md | 12 +- .../Documentation~/Channel-Mixer-Node.md | 20 +-- .../Documentation~/Color-Node.md | 14 +- .../Documentation~/Comparison-Node.md | 16 +- .../Documentation~/Cubemap-Asset-Node.md | 12 +- .../Dielectric-Specular-Node.md | 16 +- .../Documentation~/Fresnel-Equation-Node.md | 6 +- .../Documentation~/Gradient-Node.md | 12 +- .../Documentation~/Graph-Target.md | 2 - .../Documentation~/Integer-Node.md | 12 +- .../Documentation~/Internal-Inspector.md | 16 +- .../Documentation~/Master-Stack.md | 6 +- .../Documentation~/Matrix-2x2-Node.md | 12 +- .../Documentation~/Matrix-3x3-Node.md | 12 +- .../Documentation~/Matrix-4x4-Node.md | 12 +- .../Matrix-Construction-Node.md | 24 +-- .../Documentation~/Matrix-Split-Node.md | 20 +-- .../Documentation~/Port-Bindings.md | 24 +-- .../Documentation~/Precision-Modes.md | 10 +- .../Documentation~/Preview-Mode-Control.md | 8 +- .../Documentation~/Rectangle-Node.md | 18 +-- .../Documentation~/Refract-Node.md | 6 +- .../Documentation~/Shader-Graph-Window.md | 22 ++- .../Documentation~/ShaderGraph-Samples.md | 16 +- .../Documentation~/Slider-Node.md | 16 +- .../Split-Texture-Transform-Node.md | 2 +- .../Documentation~/Sticky-Notes.md | 2 - .../Documentation~/TableOfContents.md | 2 +- .../Texture-2D-Array-Asset-Node.md | 12 +- .../Documentation~/Texture-2D-Asset-Node.md | 12 +- .../Documentation~/Texture-3D-Asset-Node.md | 12 +- .../Documentation~/ThreadMapDetail-Node.md | 139 +++--------------- .../Transformation-Matrix-Node.md | 12 +- .../Documentation~/UVCombine-Node.md | 59 +------- .../Documentation~/Upgrade-Guide-10-0-x.md | 10 +- .../images/Active-Inactive-Blocks.PNG | Bin 52826 -> 0 bytes .../images/MasterStack_Empty.png | Bin 14039 -> 0 bytes .../Documentation~/images/StickyNote.png | Bin 25720 -> 0 bytes .../images/blackboardcategories2.png | Bin 87712 -> 0 bytes .../images/blackboardcategories3.png | Bin 55251 -> 0 bytes .../images/materialoverride1.PNG | Bin 60441 -> 0 bytes .../images/materialoverride2.PNG | Bin 67821 -> 0 bytes .../images/previewmodecontrol.png | Bin 40002 -> 0 bytes .../snippets/nodes-compatibility-hdrp.md | 19 +-- .../Documentation~/surface-options.md | 61 ++------ 47 files changed, 239 insertions(+), 456 deletions(-) delete mode 100644 Packages/com.unity.shadergraph/Documentation~/images/Active-Inactive-Blocks.PNG delete mode 100644 Packages/com.unity.shadergraph/Documentation~/images/MasterStack_Empty.png delete mode 100644 Packages/com.unity.shadergraph/Documentation~/images/StickyNote.png delete mode 100644 Packages/com.unity.shadergraph/Documentation~/images/blackboardcategories2.png delete mode 100644 Packages/com.unity.shadergraph/Documentation~/images/blackboardcategories3.png delete mode 100644 Packages/com.unity.shadergraph/Documentation~/images/materialoverride1.PNG delete mode 100644 Packages/com.unity.shadergraph/Documentation~/images/materialoverride2.PNG delete mode 100644 Packages/com.unity.shadergraph/Documentation~/images/previewmodecontrol.png diff --git a/Packages/com.unity.shadergraph/Documentation~/Blackboard.md b/Packages/com.unity.shadergraph/Documentation~/Blackboard.md index 9a302e382ac..e1b5f214a1e 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Blackboard.md +++ b/Packages/com.unity.shadergraph/Documentation~/Blackboard.md @@ -3,7 +3,7 @@ ## Description You can use the Blackboard to define, order, and categorize the [Properties](Property-Types.md) and [Keywords](Keywords.md) in a graph. From the Blackboard, you can also edit the path for the selected Shader Graph Asset or Sub Graph. -![image](images/blackboardcategories1.png) +![The blackboard layout with properties, keywords, and categories.](images/blackboardcategories1.png) ## Accessing the Blackboard The Blackboard is visible by default, and you cannot drag it off the graph and lose it. However, you are able to position it anywhere in the [Shader Graph Window](Shader-Graph-Window.md). It always maintains the same distance from the nearest corner, even if you resize the window. @@ -42,8 +42,6 @@ To make the properties in your shader more discoverable, organize them into cate ### Adding, removing, and reordering properties and keywords * To add a property or keyword to a category, expand the category with the foldout (⌄) symbol, then drag and drop the property or keyword onto the expanded category. -![image](images/blackboardcategories2.png) - * To remove a property or keyword, select it and press **Delete**, or right-click and select **Delete**. * To re-order properties or keywords, drag and drop them within a category or move them into other categories. @@ -66,9 +64,6 @@ To copy a specific set of properties: ### Using categories in the Material Inspector To modify a material you have created with a Shader Graph, you can adjust specific property or keyword values in the Material Inspector, or edit the graph itself. -![image](images/blackboardcategories3.png) - - #### Working with Streaming Virtual Textures [Streaming Virtual Texture Properties](https://docs.unity3d.com/Documentation/Manual/svt-use-in-shader-graph.html) sample texture layers. To access these layers in the Material Inspector, expand the relevant **Virtual Texture** section with the ⌄ symbol next to its name. You can add and remove layers via the Inspector. diff --git a/Packages/com.unity.shadergraph/Documentation~/Block-Node.md b/Packages/com.unity.shadergraph/Documentation~/Block-Node.md index 0b8090b83b7..b98826160a4 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Block-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Block-Node.md @@ -26,6 +26,4 @@ If you disable **Automatically Add or Remove Blocks**, Shader Graph doesn't auto Active Block nodes are Blocks that contribute to the final shader. Inactive Block nodes are Blocks that are present in the Shader Graph, but don't contribute to the final shader. -![image](images/Active-Inactive-Blocks.png) - When you change the graph settings, certain Blocks might become active or inactive. Inactive Block nodes and any node streams that are connected only to Inactive Block nodes appear grayed out. diff --git a/Packages/com.unity.shadergraph/Documentation~/Boolean-Node.md b/Packages/com.unity.shadergraph/Documentation~/Boolean-Node.md index e0785189acd..58a361816f4 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Boolean-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Boolean-Node.md @@ -6,15 +6,15 @@ Defines a constant **Boolean** value in the [Shader Graph](index.md), although i ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| Out | Output | Boolean | None | Output value | +| Name | Direction | Type | Binding | Description | +|:--- |:---|:---|:---|:---| +| Out | Output | Boolean | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Toggle | | Defines the output value. | +| Control | Description | +|:---|:---| +| (Checkbox) | Defines the output value. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Channel-Mixer-Node.md b/Packages/com.unity.shadergraph/Documentation~/Channel-Mixer-Node.md index 5fba552c278..d45d90c2953 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Channel-Mixer-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Channel-Mixer-Node.md @@ -6,19 +6,19 @@ Controls the amount each of the channels of input **In** contribute to each of t ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| In | Input | Vector 3 | None | Input value | -| Out | Output | Vector 3 | None | Output value | +| Name | Direction | Type | Binding | Description | +|:---|:---|:---|:---|:---| +| In | Input | Vector 3 | None | Input value | +| Out | Output | Vector 3 | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Toggle Button Array | R, G, B | Selects the output channel to edit. | -| R | Slider | | Controls contribution of input red channel to selected output channel. | -| G | Slider | | Controls contribution of input green channel to selected output channel. | -| B | Slider | | Controls contribution of input blue channel to selected output channel. | +| Control | Description | +|:---|:---| +| **R**, **G**, **B** (toggle buttons) | Selects the output channel to edit with the sliders. | +| **R** (slider) | Controls the contribution of the input red channel to the selected output channel. | +| **G** (slider) | Controls the contribution of the input green channel to the selected output channel. | +| **B** (slider) | Controls the contribution of the input blue channel to the selected output channel. | ## Shader Function diff --git a/Packages/com.unity.shadergraph/Documentation~/Color-Node.md b/Packages/com.unity.shadergraph/Documentation~/Color-Node.md index 5405913ea97..ba9dcb722d4 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Color-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Color-Node.md @@ -8,16 +8,16 @@ NOTE: In versions prior to 10.0, Shader Graph assumed that HDR colors from the C ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| Out | Output | Vector 4 | None | Output value | +| Name | Direction | Type | Binding | Description | +|:--- |:---|:---|:---|:---| +| Out | Output | Vector 4 | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Color | | Defines the output value. | -| Mode | Dropdown | Default, HDR | Sets properties of the Color field | +| Control | Description | +|:---|:---| +| (Color) | Defines the output value. | +| **Mode** | Sets properties of the Color field. The options are:
  • **Default**
  • **HDR**
| ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Comparison-Node.md b/Packages/com.unity.shadergraph/Documentation~/Comparison-Node.md index e0424ea5ac4..34a352b124e 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Comparison-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Comparison-Node.md @@ -6,17 +6,17 @@ Compares the two input values **A** and **B** based on the condition selected on ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| A | Input | Float | None | First input value | -| B | Input | Float | None | Second input value | -| Out | Output | Boolean | None | Output value | +| Name | Direction | Type | Binding | Description | +|:--- |:---|:---|:---|:---| +| A | Input | Float | None | First input value | +| B | Input | Float | None | Second input value | +| Out | Output | Boolean | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Dropdown | Equal, NotEqual, Less, LessOrEqual, Greater, GreaterOrEqual | Condition for comparison | +| Control | Description | +|:---|:---| +| (Dropdown) | Select the condition for comparison between A and B. The options are:
  • **Equal**
  • **NotEqual**
  • **Less**
  • **LessOrEqual**
  • **Greater**
  • **GreaterOrEqual**
| ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Cubemap-Asset-Node.md b/Packages/com.unity.shadergraph/Documentation~/Cubemap-Asset-Node.md index 7afa17f55f2..1b8a40870a6 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Cubemap-Asset-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Cubemap-Asset-Node.md @@ -6,12 +6,12 @@ Defines a constant **Cubemap Asset** for use in the shader. To sample the **Cube ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| Out | Output | Cubemap | None | Output value | +| Name | Direction | Type | Binding | Description | +|:--- |:---|:---|:---|:---| +| Out | Output | Cubemap | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Object Field (Cubemap) | | Defines the cubemap asset from the project. | +| Control | Description | +|:--- |:---| +| (Cubemap)| Defines the cubemap asset from the project. | diff --git a/Packages/com.unity.shadergraph/Documentation~/Dielectric-Specular-Node.md b/Packages/com.unity.shadergraph/Documentation~/Dielectric-Specular-Node.md index ab06b823c35..969c297fd12 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Dielectric-Specular-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Dielectric-Specular-Node.md @@ -10,17 +10,17 @@ You can use **Custom** material type to define your own physically based materia ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| Out | Output | Float | None | Output value | +| Name | Direction | Type | Binding | Description | +|:--- |:---|:---|:---|:---| +| Out | Output | Float | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| Material | Dropdown | Common, RustedMetal, Water, Ice, Glass, Custom | Selects the material value to output. | -| Range | Slider | | Controls output value for **Common** material type. | -| IOR | Slider | | Controls index of refraction for **Custom** material type. | +| Control | Description | +|:---|:---| +| **Material** | Selects the material value to output. The options are:
  • **Common**
  • **RustedMetal**
  • **Water**
  • **Ice**
  • **Glass**
  • **Custom**
| +| **Range** | Controls the output value for a **Common** material type. | +| **IOR** | Controls the index of refraction for a **Custom** material type. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Fresnel-Equation-Node.md b/Packages/com.unity.shadergraph/Documentation~/Fresnel-Equation-Node.md index e6ed9badb8c..d5aeeefed59 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Fresnel-Equation-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Fresnel-Equation-Node.md @@ -35,9 +35,9 @@ You can find Numerical values of refractive indices at [refractiveindex.info](ht ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| Mode | Dropdown | • **Schlick**: This mode produces an approximation based on [Schlick's Approximation](https://en.wikipedia.org/wiki/Schlick%27s_approximation). Use the Schlick mode for interactions between air and dielectric materials.
• **Dielectric**: Use this mode for interactions between two dielectric Materials. For example, air to glass, glass to water, or water to air.
• **DielectricGeneric**: This mode computes a [Fresnel equation](https://seblagarde.wordpress.com/2013/04/29/memo-on-fresnel-equations) for interactions between a dielectric and a metal. For example, clear-coat- to metal, glass to metal, or water to metal.
**Note:** if the **IORMediumK** value is 0, **DielectricGeneric** behaves in the same way as the **Dielectric** mode. || +| Control | Description | +|:---|:---| +| **Mode** | Select an equation mode to affect Material interactions to the Fresnel Component. The options are:
  • **Schlick**: This mode produces an approximation based on [Schlick's Approximation](https://en.wikipedia.org/wiki/Schlick%27s_approximation). Use the Schlick mode for interactions between air and dielectric materials.
  • **Dielectric**: Use this mode for interactions between two dielectric Materials. For example, air to glass, glass to water, or water to air.
  • **DielectricGeneric**: This mode computes a [Fresnel equation](https://seblagarde.wordpress.com/2013/04/29/memo-on-fresnel-equations) for interactions between a dielectric and a metal. For example, clear-coat- to metal, glass to metal, or water to metal.
**Note:** if the **IORMediumK** value is 0, **DielectricGeneric** behaves in the same way as the **Dielectric** mode. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Gradient-Node.md b/Packages/com.unity.shadergraph/Documentation~/Gradient-Node.md index 5e0f92d1a7b..1c1ab010eaa 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Gradient-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Gradient-Node.md @@ -6,15 +6,15 @@ Defines a constant **Gradient** for use in [Shader Graph](index.md), although in ## Ports -| Name | Direction | Type | Description | -|:------------ |:-------------|:-----|:---| -| Out | Output | Gradient | Output value | +| Name | Direction | Type | Description | +|:--- |:---|:---|:---| +| Out | Output | Gradient | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Gradient Field | | Defines the gradient. | +| Control | Description | +|:---|:---| +| (Gradient Field) | Defines the gradient. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Graph-Target.md b/Packages/com.unity.shadergraph/Documentation~/Graph-Target.md index 05e4feb18b6..d843d493b6f 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Graph-Target.md +++ b/Packages/com.unity.shadergraph/Documentation~/Graph-Target.md @@ -2,8 +2,6 @@ A Target determines the end point compatibility of a shader you generate using Shader Graph. You can select Targets for each Shader Graph asset, and use the [Graph Settings Menu](Graph-Settings-Tab.md) to change the Targets. -![image](images/GraphSettings_Menu.png) - Targets hold information such as the required generation format, and variables that allow compatibility with different render pipelines or integration features like [Visual Effect Graph](https://docs.unity3d.com/Packages/com.unity.visualeffectgraph@latest). You can select any number of Targets for each Shader Graph asset. If a Target you select isn't compatible with other Targets you've already selected, an error message that explains the problem appears. Target Settings are specific to each Target, and can vary between assets depending on which Targets you've selected. Be aware that Universal Render Pipeline (URP) Target Settings and High Definition Render Pipeline (HDRP) Target Settings might change in future versions. diff --git a/Packages/com.unity.shadergraph/Documentation~/Integer-Node.md b/Packages/com.unity.shadergraph/Documentation~/Integer-Node.md index 017eacec8d6..e4a5dbff735 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Integer-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Integer-Node.md @@ -6,15 +6,15 @@ Defines a constant **Float** value in the shader using an **Integer** field. Can ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| Out | Output | Float | None | Output value | +| Name | Direction | Type | Binding | Description | +|:--- |:---|:---|:---|:---| +| Out | Output | Float | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Integer | | Defines the output value. | +| Control | Description | +|:---|:---| +| (Integer) | Defines the output value. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Internal-Inspector.md b/Packages/com.unity.shadergraph/Documentation~/Internal-Inspector.md index afd823e5887..54f4c97a9d6 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Internal-Inspector.md +++ b/Packages/com.unity.shadergraph/Documentation~/Internal-Inspector.md @@ -10,29 +10,29 @@ When you open a Shader Graph, the **Graph Inspector** displays the **[Graph Sett Select a node in the graph to display settings available for that node in the **Graph Inspector**. Settings available for that node appear in the **Node Settings** tab of the Graph Inspector. For example, if you select a Property node either in the graph or the [Blackboard](Blackboard.md), the **Node Settings** tab displays attributes of the Property that you can edit. -![](images/InternalInspectorBlackboardProperty.png) +![The Blackboard with a property selected, and the Graph Inspector showing the property settings.](images/InternalInspectorBlackboardProperty.png) Graph elements that currently work with the Graph Inspector: - [Properties](https://docs.unity3d.com/Manual/SL-Properties.html) - ![](images/InternalInspectorGraphProperty.png) + ![A property selected in the workspace, and the Graph Inspector showing the property settings.](images/InternalInspectorGraphProperty.png) - [Keywords](Keywords.md) - ![](images/keywords_enum.png) + ![The Blackboard with a keyword selected, and the Graph Inspector showing the keyword settings.](images/keywords_enum.png) - [Custom Function nodes](Custom-Function-Node.md) - ![](images/Custom-Function-Node-File.png) + ![A Custom Function node selected in the workspace, and the Graph Inspector showing the node settings.](images/Custom-Function-Node-File.png) - [Subgraph Output nodes](Sub-graph.md) - ![](images/Inspector-SubgraphOutput.png) + ![A subgraph output node selected in the workspace, and the Graph Inspector showing the node settings.](images/Inspector-SubgraphOutput.png) - [Per-node precision](Precision-Modes.md) - ![](images/Inspector-PerNodePrecision.png) + ![A node selected in the workspace, and the Graph Inspector showing the Precision setting.](images/Inspector-PerNodePrecision.png) Graph elements that currently do not work with the Graph Inspector: @@ -44,7 +44,3 @@ Graph elements that currently do not work with the Graph Inspector: ## Material Override Enabling the [Allow Material Override](surface-options.md) option in the Graph Settings makes it possible for you to override certain graph properties via the Material Inspector. - -![](images/materialoverride1.PNG) - -![](images/materialoverride2.PNG) diff --git a/Packages/com.unity.shadergraph/Documentation~/Master-Stack.md b/Packages/com.unity.shadergraph/Documentation~/Master-Stack.md index b0ffbb52f4f..442f31fa5e8 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Master-Stack.md +++ b/Packages/com.unity.shadergraph/Documentation~/Master-Stack.md @@ -4,12 +4,10 @@ The Master Stack is the end point of a Shader Graph that defines the final surface appearance of a shader. Your Shader Graph should always contain only one Master Stack. -![image](images/MasterStack_Populated.png) - The content of the Master Stack might change depending on the [Graph Settings](Graph-Settings-Tab.md) you select. The Master Stack is made up of Contexts, which contain [Block nodes](Block-Node.md). -## Contexts +![The Master Stack display, showing the Vertex and Fragment contexts populated with Block nodes.](images/MasterStack_Populated.png) -![image](images/MasterStack_Empty.png) +## Contexts The Master Stack contains two Contexts: Vertex and Fragment. These represent the two stages of a shader. Nodes that you connect to Blocks in the Vertex Context become part of the final shader's vertex function. Nodes that you connect to Blocks in the Fragment Context become part of the final shader's fragment (or pixel) function. If you connect any nodes to both Contexts, they are executed twice, once in the vertex function and then again in the fragment function. You can't cut, copy, or paste Contexts. diff --git a/Packages/com.unity.shadergraph/Documentation~/Matrix-2x2-Node.md b/Packages/com.unity.shadergraph/Documentation~/Matrix-2x2-Node.md index e796a580c14..b5fed26f801 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Matrix-2x2-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Matrix-2x2-Node.md @@ -6,15 +6,15 @@ Defines a constant **Matrix 2x2** value in the shader. ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| Out | Output | Matrix 2 | None | Output value | +| Name | Direction | Type | Binding | Description | +|:--- |:---|:---|:---|:---| +| Out | Output | Matrix 2 | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Matrix 2x2 | | Sets output value | +| Control | Description | +|:---|:---| +| (Matrix 2x2) | Sets the matrix 2x2 output value. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Matrix-3x3-Node.md b/Packages/com.unity.shadergraph/Documentation~/Matrix-3x3-Node.md index 03284e6b3f4..071fd6ac21b 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Matrix-3x3-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Matrix-3x3-Node.md @@ -6,15 +6,15 @@ Defines a constant **Matrix 3x3** value in the shader. ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| Out | Output | Matrix 3 | None | Output value | +| Name | Direction | Type | Binding | Description | +|:--- |:---|:---|:---|:---| +| Out | Output | Matrix 3 | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Matrix 3x3 | | Sets output value | +| Control | Description | +|:---|:---| +| (Matrix 3x3) | Sets the matrix 3x3 output value. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Matrix-4x4-Node.md b/Packages/com.unity.shadergraph/Documentation~/Matrix-4x4-Node.md index cd33295a17c..4d1ba1d3766 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Matrix-4x4-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Matrix-4x4-Node.md @@ -6,15 +6,15 @@ Defines a constant **Matrix 4x4** value in the shader. ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| Out | Output | Matrix 4 | None | Output value | +| Name | Direction | Type | Binding | Description | +|:--- |:---|:---|:---|:---| +| Out | Output | Matrix 4 | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Matrix 4x4 | | Sets output value | +| Control | Description | +|:---|:---| +| (Matrix 4x4) | Sets the matrix 4x4 output value. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Matrix-Construction-Node.md b/Packages/com.unity.shadergraph/Documentation~/Matrix-Construction-Node.md index b7a639342e2..42b2e7403fe 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Matrix-Construction-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Matrix-Construction-Node.md @@ -15,21 +15,21 @@ For example, connecting **Vector 2** type values to inputs **M0** and **M1** wil ## Ports -| Name | Direction | Type | Description | -|:------------ |:-------------|:-----|:---| -| M0 | Input | Vector 4 | First row or column | -| M1 | Input | Vector 4 | Second row or column | -| M2 | Input | Vector 4 | Third row or column | -| M3 | Input | Vector 4 | Fourth row or column | -| 4x4 | Output | Matrix 4x4 | Output as Matrix 4x4 | -| 3x3 | Output | Matrix 3x3 | Output as Matrix 3x3 | -| 2x2 | Output | Matrix 2x2 | Output as Matrix 2x2 | +| Name | Direction | Type | Description | +|:--- |:---|:---|:---| +| M0 | Input | Vector 4 | First row or column | +| M1 | Input | Vector 4 | Second row or column | +| M2 | Input | Vector 4 | Third row or column | +| M3 | Input | Vector 4 | Fourth row or column | +| 4x4 | Output | Matrix 4x4 | Output as Matrix 4x4 | +| 3x3 | Output | Matrix 3x3 | Output as Matrix 3x3 | +| 2x2 | Output | Matrix 2x2 | Output as Matrix 2x2 | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Dropdown | Row, Column | Selects how the output matrix should be filled | +| Control | Description | +|:---|:---| +| (Dropdown) | Selects how the output matrix should be filled. The options are:
  • **Row**: Input vectors specify matrix rows from top to bottom.
  • **Column**: Input vectors specify matrix columns from left to right.
| ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Matrix-Split-Node.md b/Packages/com.unity.shadergraph/Documentation~/Matrix-Split-Node.md index a0836b235d6..d0b82c8a50b 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Matrix-Split-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Matrix-Split-Node.md @@ -15,19 +15,19 @@ For example, connecting **Matrix 2x2** type to input **In** will return the corr ## Ports -| Name | Direction | Type | Description | -|:------------ |:-------------|:-----|:---| -| In | Input | Dynamic Matrix | Input value | -| M0 | Output | Dynamic Vector | First row or column | -| M1 | Output | Dynamic Vector | Second row or column | -| M2 | Output | Dynamic Vector | Third row or column | -| M3 | Output | Dynamic Vector | Fourth row or column | +| Name | Direction | Type | Description | +|:--- |:---|:---|:---| +| In | Input | Dynamic Matrix | Input value | +| M0 | Output | Dynamic Vector | First row or column | +| M1 | Output | Dynamic Vector | Second row or column | +| M2 | Output | Dynamic Vector | Third row or column | +| M3 | Output | Dynamic Vector | Fourth row or column | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Dropdown | Row, Column | Selects how the output vectors should be filled | +| Control | Description | +|:---|:---| +| (Dropdown) | Selects how the output vectors should be filled. The options are:
  • **Row**: Output vectors are composed of matrix rows from top to bottom.
  • **Column**: Output vectors are composed of matrix columns from left to right.
| ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Port-Bindings.md b/Packages/com.unity.shadergraph/Documentation~/Port-Bindings.md index c441a319273..7f48676d22f 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Port-Bindings.md +++ b/Packages/com.unity.shadergraph/Documentation~/Port-Bindings.md @@ -8,15 +8,15 @@ In practice this means that if no [Edge](Edge.md) is connected to the [Port](Por ## Port Bindings List -| Name | Data Type | Options | Description | -|:------------|:----------|:------------------|:------------| -| Bitangent | Vector 3 | | Vertex or fragment bitangent, label describes expected transform space | -| Color | Vector 4 | |RGBA Color picker | -| ColorRGB | Vector 3 | | RGB Color picker | -| Normal | Vector 3 | | Vertex or fragment normal vector, label describes expected transform space | -| Position | Vector 3 | | Vertex or fragment position, label describes expected transform space | -| Screen Position | Vector 4 | | Default, Raw, Center, Tiled | Vertex or fragment position in screen space. Dropdown selects mode. See [Screen Position Node](Screen-Position-Node.md) for details | -| Tangent | Vector 3 | | Vertex or fragment tangent vector, label describes expected transform space | -| UV | Vector 2 | | UV0, UV1, UV2, UV3 | Mesh UV coordinates. Dropdown selects UV channel. | -| Vertex Color | Vector 4 | | RGBA vertex color value. | -| View Direction | Vector 3 | | Vertex or fragment view direction vector, label describes expected transform space | +| Name | Data Type | Description | +|:---|:---|:---| +| Bitangent | Vector 3 | Vertex or fragment bitangent, label describes expected transform space | +| Color | Vector 4 |RGBA Color picker | +| ColorRGB | Vector 3 | RGB Color picker | +| Normal | Vector 3 | Vertex or fragment normal vector, label describes expected transform space | +| Position | Vector 3 | Vertex or fragment position, label describes expected transform space | +| Screen Position | Vector 4 | Default, Raw, Center, Tiled | Vertex or fragment position in screen space. Dropdown selects mode. See [Screen Position Node](Screen-Position-Node.md) for details | +| Tangent | Vector 3 | Vertex or fragment tangent vector, label describes expected transform space | +| UV | Vector 2 | UV0, UV1, UV2, UV3 | Mesh UV coordinates. Dropdown selects UV channel. | +| Vertex Color | Vector 4 | RGBA vertex color value. | +| View Direction | Vector 3 | Vertex or fragment view direction vector, label describes expected transform space | diff --git a/Packages/com.unity.shadergraph/Documentation~/Precision-Modes.md b/Packages/com.unity.shadergraph/Documentation~/Precision-Modes.md index 88a30a7003c..50cc3676d9c 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Precision-Modes.md +++ b/Packages/com.unity.shadergraph/Documentation~/Precision-Modes.md @@ -23,7 +23,7 @@ To visualize data precision in a graph, set the [**Color Mode**](Color-Modes.md) * **Half** nodes are red * **Switchable** nodes are Green. -![](images/Color-Mode-Precision.png) +![A graph showing nodes with different colors according to their data precision.](images/Color-Mode-Precision.png) ### Setting graph Precision To set the default precision for the entire graph to **Single** or **Half**, open the **Graph Settings** and set the Precision property. Newly-created nodes in a graph default to the **Inherit** precision mode, and inherit the graph's precision. @@ -51,7 +51,7 @@ Simple inheritance refers to the inheritance behaviour of a node with only one p In the figure below, Node A has the **Inherit** mode. Because it has no incoming edge, it takes the **Graph Precision**, which is **Half**. Node B also has the **Inherit** mode, so it inherits the **Half** precision mode from Node A. -![](images/precisionmodes1.png) +![Diagram showing a simple precision inheritance.](images/precisionmodes1.png) #### Complex inheritance @@ -61,7 +61,7 @@ A node reads precision settings from each input port. If you connect a node to s In the figure below, node D has the **Inherit** mode. It receives input from the adjacent edges via inputs 1 and 2. Node B passes the **Half** mode through input 1. Node C passes the **Single** mode through input 2. Because **Single** is 32-bit and **Half** only 16-bit, **Single** takes precedence, so Node D uses **Single** precision. -![](images/precisionmodes2.png) +![Diagram showing a complex precision inheritance.](images/precisionmodes2.png) #### Mixed inheritance @@ -69,13 +69,13 @@ Mixed inheritance refers to the inheritance behaviour on a node with both simple Nodes with no input ports, such as [Input nodes](Input-Nodes.md), inherit the **Graph Precision**. However, complex inheritance rules still affect other nodes in the same group, as illustrated in the figure below. -![](images/precisionmodes3.png) +![Diagram showing a mixed precision inheritance.](images/precisionmodes3.png) ### Switchable precision The **Switchable** mode overrides **Half** mode but not **Single**. -![](images/precisionmodes4.png) +![Diagram showing precision inheritance with the Switchable mode.](images/precisionmodes4.png) ### Sub Graph precision diff --git a/Packages/com.unity.shadergraph/Documentation~/Preview-Mode-Control.md b/Packages/com.unity.shadergraph/Documentation~/Preview-Mode-Control.md index a84d8c4d489..bf896cfda4f 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Preview-Mode-Control.md +++ b/Packages/com.unity.shadergraph/Documentation~/Preview-Mode-Control.md @@ -13,16 +13,16 @@ This mode control functionality also applies to Sub Graph previews. See [Graph S ## How to use For nodes: + 1. Add a node which includes a preview. 2. Select the node. 3. In the Graph Inspector or Node Settings, find the Preview control. 4. Select an option. - For SubGraphs: + * Select a mode in the [Sub Graph](Sub-graph.md) [Graph Settings](Graph-Settings-Tab.md) menu. -![](images/previewmodecontrol.png) +## Additional resources -Related -[Preview node](Preview-Node.md) +* [Preview node](Preview-Node.md) diff --git a/Packages/com.unity.shadergraph/Documentation~/Rectangle-Node.md b/Packages/com.unity.shadergraph/Documentation~/Rectangle-Node.md index 08ae33abe4d..b453bd94122 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Rectangle-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Rectangle-Node.md @@ -8,18 +8,18 @@ NOTE: This [Node](Node.md) can only be used in the **Fragment** [Shader Stage](S ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| UV | Input | Vector 2 | UV | Input UV value | -| Width | Input | Float | None | Rectangle width | -| Height | Input | Float | None | Rectangle height | -| Out | Output | Float | None | Output value | +| Name | Direction | Type | Binding | Description | +|:--- |:---|:---|:---|:---| +| UV | Input | Vector 2 | UV | Input UV value | +| Width | Input | Float | None | Rectangle width | +| Height | Input | Float | None | Rectangle height | +| Out | Output | Float | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Dropdown | Fastest, Nicest | Robustness of computation | +| Control | Description | +|:---|:---| +| (Dropdown) | Select the robustness of computation. The options are:
  • **Fastest**
  • **Nicest**
| ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Refract-Node.md b/Packages/com.unity.shadergraph/Documentation~/Refract-Node.md index 8cb41cadb4d..f39b0b57576 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Refract-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Refract-Node.md @@ -25,9 +25,9 @@ The Refract node uses the principles described in [Snell's Law](https://en.wikip ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| Mode | Dropdown | • **Safe:** Returns a null vector result instead of a NaN result at the point of critical angle refraction.
• **CriticalAngle:** Avoids the **Safe** check for a potential NaN result. || +| Control | Description | +|:---|:---| +| **Mode** | Select a mode to handle results at the point of critical angle refraction. The options are:
  • **Safe:** Returns a null vector result instead of a NaN result at the point of critical angle refraction.
  • **CriticalAngle:** Avoids the **Safe** check for a potential NaN result.
| ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Window.md b/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Window.md index d49036d4740..c4f124860b7 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Window.md +++ b/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Window.md @@ -21,18 +21,16 @@ To access the **Shader Graph Window**, you must first create a [Shader Graph Ass Use the **Shader Graph Window** toolbar to manage the shader graph asset, display elements in the window, and more. -| Icon | Item | Description | -|:--------------------|:--------------------|:------------| -| ![Image](images/sg-save-icon.png) | **Save Asset** | Save the graph to update the [Shader Graph Asset](index.md). | -| ![Image](images/sg-dropdown-icon.png) | **Save As** | Save the [Shader Graph Asset](index.md) under a new name. | -| | **Show In Project** | Highlight the [Shader Graph Asset](index.md) in the [Project Window](https://docs.unity3d.com/Manual/ProjectView.html). | -| | **Check Out** | If version control is enabled, check out the [Shader Graph Asset](index.md) from the source control provider. | -| ![Image](images/sg-color-mode-selector.png) | **Color Mode Selector** | Select a [Color Mode](Color-Modes.md) for the graph. | -| ![Image](images/sg-blackboard-icon.png) | **Blackboard** | Toggle the visibility of the [Blackboard](Blackboard.md). | -| ![Image](images/sg-graph-inspector-icon.png) | **Graph Inspector** | Toggle the visibility of the [Graph Inspector](Internal-Inspector.md). | -| ![Image](images/sg-main-preview-icon.png) | **Main Preview** | Toggle the visibility of the [Main Preview](Main-Preview.md). | -| ![Image](images/sg-help_icon.png) | **Help** | Open the Shader Graph documentation in the browser. | -| ![Image](images/sg-dropdown-icon.png) | **Resources** | Contains links to Shader Graph resources (like samples and User forums). | +| Icon | Item | Description | +|:---|:---|:---| +| ![The Save Asset icon](images/sg-save-icon.png) | **Save Asset** | Save the graph to update the [Shader Graph Asset](index.md). | +| ![The asset file management icon](images/sg-dropdown-icon.png) | **Asset file management** | Use additional options to manage the graph asset file. The options are:
  • **Save As**: Save the [Shader Graph Asset](index.md) under a new name.
  • **Show In Project**: Highlight the [Shader Graph Asset](index.md) in the [Project Window](https://docs.unity3d.com/Manual/ProjectView.html).
  • **Check Out**: If version control is enabled, check out the [Shader Graph Asset](index.md) from the source control provider.
| +| ![The Color Mode Selector icon](images/sg-color-mode-selector.png) | **Color Mode Selector** | Select a [Color Mode](Color-Modes.md) for the graph. | +| ![The Blackboard icon](images/sg-blackboard-icon.png) | **Blackboard** | Toggle the visibility of the [Blackboard](Blackboard.md). | +| ![The Graph Inspector icon](images/sg-graph-inspector-icon.png) | **Graph Inspector** | Toggle the visibility of the [Graph Inspector](Internal-Inspector.md). | +| ![The Main Preview icon](images/sg-main-preview-icon.png) | **Main Preview** | Toggle the visibility of the [Main Preview](Main-Preview.md). | +| ![The Help icon](images/sg-help_icon.png) | **Help** | Open the Shader Graph documentation in the browser. | +| ![The Resources icon](images/sg-dropdown-icon.png) | **Resources** | Contains links to Shader Graph resources (like samples and User forums). | ## Workspace diff --git a/Packages/com.unity.shadergraph/Documentation~/ShaderGraph-Samples.md b/Packages/com.unity.shadergraph/Documentation~/ShaderGraph-Samples.md index c8a5ef0ec05..3c6c91a1f6e 100644 --- a/Packages/com.unity.shadergraph/Documentation~/ShaderGraph-Samples.md +++ b/Packages/com.unity.shadergraph/Documentation~/ShaderGraph-Samples.md @@ -20,41 +20,41 @@ The following samples are currently available for Shader Graph. | Procedural Patterns | |:--------------------| -|![](images/Patterns_Page.png) | +|![A visual overview of Procedural Patterns](images/Patterns_Page.png) | | This collection of Assets showcases various procedural techniques possible with Shader Graph. Use them directly in your Project, or edit them to create other procedural patterns. The patterns in this collection are: Bacteria, Brick, Dots, Grid, Herringbone, Hex Lattice, Houndstooth, Smooth Wave, Spiral, Stripes, Truchet, Whirl, Zig Zag. | | Node Reference | |:--------------------| -|![](images/NodeReferenceSamples.png) | +|![A visual overview of Node Reference](images/NodeReferenceSamples.png) | | This set of Shader Graph assets provides reference material for the nodes available in the Shader Graph node library. Each graph contains a description for a specific node, examples of how it can be used, and useful tips. Some example assets also show a break-down of the math that the node is doing. You can use these samples along with the documentation to learn more about the behavior of individual nodes. | | [Feature Examples](Shader-Graph-Sample-Feature-Examples.md) | |:--------------------| -|![](images/FeatureExamplesSample.png) | +|![A visual overview of Feature Examples](images/FeatureExamplesSample.png) | | This is a collection of over 30 Shader Graph files. Each file demonstrates a specific shader technique such as angle blending, triplanar projection, parallax mapping, and custom lighting. While you won’t use these shaders directly in your project, you can use them to quickly learn and understand the various techniques, and recreate them into your own work. Each file contains notes that describe what the shader is doing, and most of the shaders are set up with the core functionality contained in a subgraph that’s easy to copy and paste directly into your own shader. The sample also has extensive documentation describing each of the samples to help you learn. | [Production Ready Shaders](Shader-Graph-Sample-Production-Ready.md) | |:--------------------| -|![](images/ProductionReadySample.png) | +|![A visual example of Production Ready Shaders](images/ProductionReadySample.png) | | The Shader Graph Production Ready Shaders sample is a collection of Shader Graph shader assets that are ready to be used out of the box or modified to suit your needs. You can take them apart and learn from them, or just drop them directly into your project and use them as they are. The sample includes the Shader Graph versions of the HDRP and URP Lit shaders. It also includes a step-by-step tutorial for how to combine several of the shaders to create a forest stream environment. | [UGUI Shaders](Shader-Graph-Sample-UGUI-Shaders.md) | |:--------------------| -|![](images/UIToolsSample.png) | +|![A visual example of UGUI Shaders](images/UIToolsSample.png) | | The Shader Graph UGUI Shaders sample is a collection of Shader Graph subgraphs that you can use to build user interface elements. They speed up the process of building widgets, buttons, and backgrounds for the user interface of your project. With these tools, you can build dynamic, procedural UI elements that don’t require any texture memory and scale correctly for any resolution screen. In addition to the subgraphs, the sample also includes example buttons, indicators, and backgrounds built with the subgraphs. The examples show how the subgraphs function in context and help you learn how to use them. | Custom Material Property Drawers | |:--------------------| -|![](images/CustomMaterialPropertySample.png) | +|![An example result of Custom Material Property Drawers in a material's Inspector](images/CustomMaterialPropertySample.png) | | This sample contains an example of a Custom Material Property Drawer that allows using a Min/Max Slider to control a Vector2 x and y values, often used for range remapping. It comes with a documented Shader Graph example. | | [Custom Lighting](Shader-Graph-Sample-Custom-Lighting.md) | |:--------------------| -|![](images/CustomLightingSample.png) | +|![A visual example of Custom Lighting](images/CustomLightingSample.png) | | The Shader Graph Custom Lighting sample shows how you can create your own custom lighting model in Shader Graph and provides dozens of example templates, shaders, and subgraphs to help you get started with your own custom lighting. | [Terrain Shaders](Shader-Graph-Sample-Terrain-Shaders.md) | |:--------------------| -|![](images/TerrainSample.png) | +|![A visual overview of Terrain Shaders](images/TerrainSample.png) | | The Shader Graph Terrain Sample provides example shaders to learn from and subgraphs that you can use to build your own terrain shaders. Custom terrain shaders can use more advanced features like hexagon tile break-up, parallax occlusion mapping, or triplanar projection. Or you can use techniques like array texture sampling or alternate texture packing methods to make the shader cheaper to render than the default one. Whether you're making faster or more advanced terrain shaders, this sample will help you get the results you're looking for. | diff --git a/Packages/com.unity.shadergraph/Documentation~/Slider-Node.md b/Packages/com.unity.shadergraph/Documentation~/Slider-Node.md index 593c76aebad..7cd0030551c 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Slider-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Slider-Node.md @@ -6,17 +6,17 @@ Defines a constant **Float** value in the shader using a **Slider** field. Can b ## Ports -| Name | Direction | Type | Binding | Description | -|:------------ |:-------------|:-----|:---|:---| -| Out | Output | Float | None | Output value | +| Name | Direction | Type | Binding | Description | +|:--- |:---|:---|:---|:---| +| Out | Output | Float | None | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Slider | | Defines the output value. | -| Min | Float | | Defines the slider parameter's minimum value. | -| Max | Float | | Defines the slider parameter's maximum value. | +| Name | Type | Options | Description | +|:--- |:---|:---|:---| +| | Slider | | Defines the output value. | +| Min | Float | | Defines the slider parameter's minimum value. | +| Max | Float | | Defines the slider parameter's maximum value. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Split-Texture-Transform-Node.md b/Packages/com.unity.shadergraph/Documentation~/Split-Texture-Transform-Node.md index e63a7294c5c..6a619f89c58 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Split-Texture-Transform-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Split-Texture-Transform-Node.md @@ -7,7 +7,7 @@ This node outputs the texture with its tiling set to (0,0) and scale set to (1,1 Another term you may hear for tiling in this context is scale. Both terms refer to the size of the texture tiles. -![](images/node-splittexturetransform.png) +![The Split Texture Transform node](images/node-splittexturetransform.png) ### Ports diff --git a/Packages/com.unity.shadergraph/Documentation~/Sticky-Notes.md b/Packages/com.unity.shadergraph/Documentation~/Sticky-Notes.md index bb391f76915..ab0f3ffb3f2 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Sticky-Notes.md +++ b/Packages/com.unity.shadergraph/Documentation~/Sticky-Notes.md @@ -13,8 +13,6 @@ To create a Sticky Note, right-click an empty space in the graph view and, in th * **Title**: The text area at the top of the Sticky Note is the title. You can use it to concisely describe what information the Sticky Note contains. * **Body**: The larger text area below the title area is the body. You can write the full contents of the note here. -![](images/StickyNote.png) - ### Editing text To edit text on a Sticky Note, double-click on a text area. This also selects the entire text area, so be sure to move the cursor before you edit the text. diff --git a/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md b/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md index 87fdf746e71..9aa2a2f35ef 100644 --- a/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md +++ b/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md @@ -121,7 +121,7 @@ * [Gradient](Gradient-Node.md) * [Sample Gradient](Sample-Gradient-Node.md) * High Definition Render Pipeline - * [Custom Color Buffer](HD-Custom-Color-Node.md) + * [Custom Color Buffer](Custom-Color-Buffer-Node.md) * [Custom Depth Buffer](HD-Custom-Depth-Node.md) * [Diffusion Profile](Diffusion-Profile-Node.md) * [Exposure](Exposure-Node.md) diff --git a/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Array-Asset-Node.md b/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Array-Asset-Node.md index 37120cce91a..b9eda3a25ff 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Array-Asset-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Array-Asset-Node.md @@ -6,15 +6,15 @@ Defines a constant **Texture 2D Array Asset** for use in the shader. To sample t ## Ports -| Name | Direction | Type | Description | -|:------------ |:-------------|:-----|:---| -| Out | Output | Texture 2D Array | Output value | +| Name | Direction | Type | Description | +|:--- |:---|:---|:---| +| Out | Output | Texture 2D Array | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Object Field (Texture 2D Array) | | Defines the texture 2D array asset from the project. | +| Control | Description | +|:--- |:---| +| (Texture 2D Array) | Defines the texture 2D array asset from the project. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Asset-Node.md b/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Asset-Node.md index 76f924e8b40..8868ed3c05b 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Asset-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Asset-Node.md @@ -6,15 +6,15 @@ Defines a constant **Texture 2D Asset** for use in the shader. To sample the **T ## Ports -| Name | Direction | Type | Description | -|:------------ |:-------------|:-----|:---| -| Out | Output | Texture 2D | Output value | +| Name | Direction | Type | Description | +|:--- |:---|:---|:---| +| Out | Output | Texture 2D | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Object Field (Texture) | | Defines the texture 3D asset from the project. | +| Control | Description | +|:--- |:---| +| (Texture) | Defines the texture 3D asset from the project. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/Texture-3D-Asset-Node.md b/Packages/com.unity.shadergraph/Documentation~/Texture-3D-Asset-Node.md index 82bbddd03b9..efa5a10b0b7 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Texture-3D-Asset-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Texture-3D-Asset-Node.md @@ -6,15 +6,15 @@ Defines a constant **Texture 3D Asset** for use in the shader. To sample the **T ## Ports -| Name | Direction | Type | Description | -|:------------ |:-------------|:-----|:---| -| Out | Output | Texture 3D | Output value | +| Name | Direction | Type | Description | +|:--- |:---|:---|:---| +| Out | Output | Texture 3D | Output value | ## Controls -| Name | Type | Options | Description | -|:------------ |:-------------|:-----|:---| -| | Object Field (Texture 3D) | | Defines the texture 3D asset from the project. | +| Control | Description | +|:--- |:---| +| (Texture 3D) | Defines the texture 3D asset from the project. | ## Generated Code Example diff --git a/Packages/com.unity.shadergraph/Documentation~/ThreadMapDetail-Node.md b/Packages/com.unity.shadergraph/Documentation~/ThreadMapDetail-Node.md index 2594ce32ebf..c765cd3af94 100644 --- a/Packages/com.unity.shadergraph/Documentation~/ThreadMapDetail-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/ThreadMapDetail-Node.md @@ -26,131 +26,30 @@ The ThreadMapDetail node is under the **Utility** > **High Definition Render [!include[nodes-inputs](./snippets/nodes-inputs.md)] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeBindingDescription
Use Thread MapBooleanNoneUse the port's default input to enable or disable the ThreadMapDetail node. You can also connect a node that outputs a Boolean to choose when to enable or disable the thread map.
ThreadMapTexture 2DNoneThe texture that contains the detailed information of a fabric's thread pattern. The texture should contain 4 channels: -
    -
  • R - The ambient occlusion
    • -
  • G - The normal Y-axis
    • -
  • B - The smoothness
    • -
  • A - The normal X-axis
    • -
-
UVVector 2UVThe UV coordinates the ThreadMapDetail node should use to map the ThreadMap texture on the geometry.
NormalsVector 3NoneThe base normal map that you want your Shader Graph to apply to the geometry before it applies the thread map.
SmoothnessFloatNoneThe base smoothness value that you want your Shader Graph to apply to the geometry before it applies the thread map.
AlphaFloatNoneThe base alpha value that you want your Shader Graph to apply to the geometry before it applies the thread map.
Ambient OcclusionFloatNoneThe base ambient occlusion value that you want your Shader Graph to apply to the geometry before it applies the thread map.
Thread AO StrengthFloatNoneSpecify a value of 0 or 1 to determine how the ThreadMap's ambient occlusion should impact the final shader result: -
    -
  • If you provide a value of 0, the ThreadMap's ambient occlusion has no effect on the final output of the shader.
    • -
  • If you provide a value of 1, Shader Graph multiplies your base Ambient Occlusion value by the ambient occlusion value specified in your ThreadMap to determine the final output of the shader.
Thread Normal StrengthFloatNoneSpecify a value of 0 or 1 to determine how the ThreadMap's normal should impact the final shader result: -
    -
  • If you provide a value of 0, the ThreadMap's normal has no effect on the final output of the shader.
    • -
  • If you provide a value of 1, Shader Graph blends the values from your base Normals with the normal specified in your ThreadMap to determine the final output of the shader.
Thread Smoothness StrengthFloatNoneSpecify a value of 0 or 1 to determine how the ThreadMap's smoothness should impact the final shader result: -
    -
  • If you provide a value of 0, the ThreadMap's smoothness value has no effect on the final output of the shader.
    • -
  • If you provide a value of 1, Shader Graph adds the smoothness value specified in your ThreadMap to your base Smoothness value to determine the final output of the shader. For this calculation, Shader Graph remaps the value of your ThreadMap's smoothness from (0,1) to (-1, 1).
+| **Name** | **Type** | **Binding** | **Description** | +| :--- | :--- | :--- | :--- | +| **Use Thread Map** | Boolean | None | Use the port's default input to enable or disable the ThreadMapDetail node. You can also connect a node that outputs a Boolean to choose when to enable or disable the thread map. | +| **ThreadMap** | Texture 2D | None | The texture that contains the detailed information of a fabric's thread pattern. The texture should contain 4 channels: