diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index f858a046744..260f6bd296f 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -9,7 +9,7 @@ nightly_katana_abv_validate: variables: MANIFEST: .copycat/graphics.json RELEASE_BRANCH: trunk - SRP_VERSION: "12.0.0" + SRP_VERSION: "12.1.0" skip_checkout: true commands: - eval "$COPYCAT_1" @@ -31,7 +31,7 @@ vendor: variables: MANIFEST: .copycat/graphics.json RELEASE_BRANCH: trunk - SRP_VERSION: "12.0.0" + SRP_VERSION: "12.1.0" skip_checkout: true commands: - eval "$COPYCAT_1" diff --git a/Tools/CreateLocalPackages.cmd b/Tools/CreateLocalPackages.cmd index 672fc1f23f2..7f47a7c6b7b 100644 --- a/Tools/CreateLocalPackages.cmd +++ b/Tools/CreateLocalPackages.cmd @@ -1,4 +1,4 @@ -set version=12.0.0 +set version=12.1.0 call CreateOneLocalPackage.bat com.unity.render-pipelines.core %version% call CreateOneLocalPackage.bat com.unity.render-pipelines.high-definition %version% call CreateOneLocalPackage.bat com.unity.render-pipelines.high-definition-config %version% diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md index 5452c4d9445..ee16d3d0445 100644 --- a/com.unity.render-pipelines.core/CHANGELOG.md +++ b/com.unity.render-pipelines.core/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [12.1.0] - 2021-09-23 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 ### Added diff --git a/com.unity.render-pipelines.core/Runtime/Documentation.cs b/com.unity.render-pipelines.core/Runtime/Documentation.cs index a4f2127170a..9a21e11c576 100644 --- a/com.unity.render-pipelines.core/Runtime/Documentation.cs +++ b/com.unity.render-pipelines.core/Runtime/Documentation.cs @@ -38,7 +38,7 @@ public CoreRPHelpURLAttribute(string pageName, string packageName = "com.unity.r /// public class DocumentationInfo { - const string fallbackVersion = "12.0"; + const string fallbackVersion = "12.1"; const string url = "https://docs.unity3d.com/Packages/{0}@{1}/manual/{2}.html"; /// diff --git a/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl index 0178aa7649c..3f92b776ac5 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl @@ -2,7 +2,7 @@ // User should rely on the Macro UNITY_VERSION now to detect which version of Unity is coupled to the current set of pipeline shader // Example of usage #if UNITY_VERSION >= 202120 to check if the version is above or equal 2021.2 #define SHADER_LIBRARY_VERSION_MAJOR 12 -#define SHADER_LIBRARY_VERSION_MINOR 0 +#define SHADER_LIBRARY_VERSION_MINOR 1 #define VERSION_GREATER_EQUAL(major, minor) ((SHADER_LIBRARY_VERSION_MAJOR > major) || ((SHADER_LIBRARY_VERSION_MAJOR == major) && (SHADER_LIBRARY_VERSION_MINOR >= minor))) #define VERSION_LOWER(major, minor) ((SHADER_LIBRARY_VERSION_MAJOR < major) || ((SHADER_LIBRARY_VERSION_MAJOR == major) && (SHADER_LIBRARY_VERSION_MINOR < minor))) diff --git a/com.unity.render-pipelines.core/package.json b/com.unity.render-pipelines.core/package.json index 2482b6384c3..8a0aafbb980 100644 --- a/com.unity.render-pipelines.core/package.json +++ b/com.unity.render-pipelines.core/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.render-pipelines.core", "description": "SRP Core makes it easier to create or customize a Scriptable Render Pipeline (SRP). SRP Core contains reusable code, including boilerplate code for working with platform-specific graphics APIs, utility functions for common rendering operations, and shader libraries. The code in SRP Core is use by the High Definition Render Pipeline (HDRP) and Universal Render Pipeline (URP). If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time.", - "version": "12.0.0", + "version": "12.1.0", "unity": "2021.2", "unityRelease": "0b14", "displayName": "Core RP Library", diff --git a/com.unity.render-pipelines.high-definition-config/CHANGELOG.md b/com.unity.render-pipelines.high-definition-config/CHANGELOG.md index a3861919b4f..37146c9fea2 100644 --- a/com.unity.render-pipelines.high-definition-config/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition-config/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [12.1.0] - 2021-09-23 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 Version Updated diff --git a/com.unity.render-pipelines.high-definition-config/package.json b/com.unity.render-pipelines.high-definition-config/package.json index 4bb0b79bd28..36d995684f3 100644 --- a/com.unity.render-pipelines.high-definition-config/package.json +++ b/com.unity.render-pipelines.high-definition-config/package.json @@ -1,11 +1,11 @@ { "name": "com.unity.render-pipelines.high-definition-config", "description": "Configuration files for the High Definition Render Pipeline.", - "version": "12.0.0", + "version": "12.1.0", "unity": "2021.2", "unityRelease": "0b14", "displayName": "High Definition RP Config", "dependencies": { - "com.unity.render-pipelines.core": "12.0.0" + "com.unity.render-pipelines.core": "12.1.0" } } diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 67ea925bff4..7f183bbe0e8 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [12.1.0] - 2021-09-23 + +### Fixed +- Fixed the volume not being assigned on some scene templates. +- Fixed corruption in player with lightmap uv when Optimize Mesh Data is enabled [1357902] +- Fixed a warning to Rendering Debugger Runtime UI when debug shaders are stripped. + ## [12.0.0] - 2021-01-11 ### Added @@ -428,9 +435,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed double camera preview. - Fixed memory leak with XR combined occlusion meshes. - Fixed diffusion profile being reset to default on SpeedTree8 materials with subsurface scattering enabled during import. -- Fixed the volume not being assigned on some scene templates. -- Fixed corruption in player with lightmap uv when Optimize Mesh Data is enabled [1357902] -- Fixed a warning to Rendering Debugger Runtime UI when debug shaders are stripped. ### Changed - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard diff --git a/com.unity.render-pipelines.high-definition/package.json b/com.unity.render-pipelines.high-definition/package.json index 17b99009127..f6af6ff923f 100644 --- a/com.unity.render-pipelines.high-definition/package.json +++ b/com.unity.render-pipelines.high-definition/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.render-pipelines.high-definition", "description": "The High Definition Render Pipeline (HDRP) is a high-fidelity Scriptable Render Pipeline built by Unity to target modern (Compute Shader compatible) platforms. HDRP utilizes Physically-Based Lighting techniques, linear lighting, HDR lighting, and a configurable hybrid Tile/Cluster deferred/Forward lighting architecture and gives you the tools you need to create games, technical demos, animations, and more to a high graphical standard.", - "version": "12.0.0", + "version": "12.1.0", "unity": "2021.2", "unityRelease": "0b14", "displayName": "High Definition RP", @@ -12,10 +12,10 @@ "com.unity.modules.animation": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.terrain": "1.0.0", - "com.unity.render-pipelines.core": "12.0.0", - "com.unity.shadergraph": "12.0.0", - "com.unity.visualeffectgraph": "12.0.0", - "com.unity.render-pipelines.high-definition-config": "12.0.0" + "com.unity.render-pipelines.core": "12.1.0", + "com.unity.shadergraph": "12.1.0", + "com.unity.visualeffectgraph": "12.1.0", + "com.unity.render-pipelines.high-definition-config": "12.1.0" }, "keywords": [ "graphics", diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index d22b649582e..fadd9e997e3 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -4,6 +4,14 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [12.1.0] - 2021-09-23 + +### Changed +- URP will no longer render via an intermediate texture unless actively required by a Renderer Feature. See the upgrade guide for compatibility options and how assets are upgraded. + +### Fixed +- Fixed a Universal Targets in ShaderGraph not rendering correctly in game view [1352225] + ## [12.0.0] - 2021-01-11 ### Added - Added support for default sprite mask shaders for the 2D Renderer in URP. @@ -80,7 +88,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Refactored some of the array resizing code around decal projector rendering to use new APIs in render core - UniversalRendererData and ForwardRendererData GUIDs have been reversed so that users coming from 2019LTS, 2020LTS and 2021.1 have a smooth upgrade path, you may encounter issues coming from 2021.2 Alpha/Beta versions and are recommended to start with a fresh library if initial upgrade fails. - VFX: New shadergraph support directly on Universal target. -- URP will no longer render via an intermediate texture unless actively required by a Renderer Feature. See the upgrade guide for compatibility options and how assets are upgraded. ### Fixed - Fixed an issue in PostProcessPass causing OnGUI draws to not show on screen. [case 1346650] @@ -180,7 +187,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue where _AfterPostProcessTexture was no longer being assigned in UniversalRenderer. - Fixed UniversalRenderPipelineAsset now being able to use multiedit - Fixed memory leak with XR combined occlusion meshes. [case 1366173] -- Fixed a Universal Targets in ShaderGraph not rendering correctly in game view [1352225] ### Changed - Change Asset/Create/Shader/Universal Render Pipeline/Lit Shader Graph to Asset/Create/Shader Graph/URP/Lit Shader Graph diff --git a/com.unity.render-pipelines.universal/ValidationExceptions.json b/com.unity.render-pipelines.universal/ValidationExceptions.json index 7a57fa6593f..456381ca071 100644 --- a/com.unity.render-pipelines.universal/ValidationExceptions.json +++ b/com.unity.render-pipelines.universal/ValidationExceptions.json @@ -1,10 +1,9 @@ { - "Exceptions": - [ - { - "ValidationTest": "Package Lifecycle Validation", - "ExceptionError": "Package com.unity.render-pipelines.universal@12.0.0 depends on package com.unity.burst@1.5.0 which is in an invalid track for release purposes. Release versions can only depend on Release versions.", - "PackageVersion": "12.0.0" - } - ] + "Exceptions": [ + { + "ValidationTest": "Package Lifecycle Validation", + "ExceptionError": "Package com.unity.render-pipelines.universal@12.1.0 depends on package com.unity.burst@1.5.0 which is in an invalid track for release purposes. Release versions can only depend on Release versions.", + "PackageVersion": "12.1.0" + } + ] } diff --git a/com.unity.render-pipelines.universal/package.json b/com.unity.render-pipelines.universal/package.json index d16a38f4a93..1f40a5eef45 100644 --- a/com.unity.render-pipelines.universal/package.json +++ b/com.unity.render-pipelines.universal/package.json @@ -1,15 +1,15 @@ { "name": "com.unity.render-pipelines.universal", "description": "The Universal Render Pipeline (URP) is a prebuilt Scriptable Render Pipeline, made by Unity. URP provides artist-friendly workflows that let you quickly and easily create optimized graphics across a range of platforms, from mobile to high-end consoles and PCs.", - "version": "12.0.0", + "version": "12.1.0", "unity": "2021.2", "unityRelease": "0b14", "displayName": "Universal RP", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.5.0", - "com.unity.render-pipelines.core": "12.0.0", - "com.unity.shadergraph": "12.0.0" + "com.unity.render-pipelines.core": "12.1.0", + "com.unity.shadergraph": "12.1.0" }, "keywords": [ "graphics", diff --git a/com.unity.shadergraph/CHANGELOG.md b/com.unity.shadergraph/CHANGELOG.md index f26543cd7ce..9a7f1f9bc8d 100644 --- a/com.unity.shadergraph/CHANGELOG.md +++ b/com.unity.shadergraph/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package are documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [12.1.0] - 2021-09-23 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 ### Added diff --git a/com.unity.shadergraph/package.json b/com.unity.shadergraph/package.json index 09caffe704f..0543c5d1460 100644 --- a/com.unity.shadergraph/package.json +++ b/com.unity.shadergraph/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.shadergraph", "description": "The Shader Graph package adds a visual Shader editing tool to Unity. You can use this tool to create Shaders in a visual way instead of writing code. Specific render pipelines can implement specific graph features. Currently, both the High Definition Rendering Pipeline and the Universal Rendering Pipeline support Shader Graph.", - "version": "12.0.0", + "version": "12.1.0", "unity": "2021.2", "unityRelease": "0b14", "displayName": "Shader Graph", "dependencies": { - "com.unity.render-pipelines.core": "12.0.0", + "com.unity.render-pipelines.core": "12.1.0", "com.unity.searcher": "4.8.0" }, "samples": [ diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/package.json b/com.unity.template-hd/Packages/com.unity.template.hd/package.json index b1525340d8c..740a2a66fbe 100644 --- a/com.unity.template-hd/Packages/com.unity.template.hd/package.json +++ b/com.unity.template-hd/Packages/com.unity.template.hd/package.json @@ -10,6 +10,6 @@ "com.unity.cinemachine": "2.8.0", "com.unity.inputsystem": "1.1.0-pre.5", "com.unity.learn.iet-framework": "2.0.0", - "com.unity.render-pipelines.high-definition": "12.0.0" + "com.unity.render-pipelines.high-definition": "12.1.0" } } diff --git a/com.unity.template-hd/Packages/manifest.json b/com.unity.template-hd/Packages/manifest.json index 6c2263a3526..c6cb954c6e3 100644 --- a/com.unity.template-hd/Packages/manifest.json +++ b/com.unity.template-hd/Packages/manifest.json @@ -6,7 +6,7 @@ "com.unity.ide.vscode": "1.2.3", "com.unity.inputsystem": "1.1.0-pre.5", "com.unity.learn.iet-framework": "2.0.0", - "com.unity.render-pipelines.high-definition": "12.0.0", + "com.unity.render-pipelines.high-definition": "12.1.0", "com.unity.learn.iet-framework.authoring": "1.0.0", "com.unity.timeline": "1.6.1", "com.unity.ugui": "1.0.0", diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md index 98329d1a2c3..acd372f0a0e 100644 --- a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md +++ b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [12.2.0] - 2021-09-24 + ### Fixed - Fixed an issue that caused "ForwardRendererData has been deprecated" error message in the console when upgrading to 21.2. diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/package.json b/com.unity.template-universal/Packages/com.unity.template.universal/package.json index d7fbd7092b3..4c5be59ab3b 100644 --- a/com.unity.template-universal/Packages/com.unity.template.universal/package.json +++ b/com.unity.template-universal/Packages/com.unity.template.universal/package.json @@ -7,6 +7,6 @@ "host": "hub", "description": "The Universal Render Pipeline Template configures Project settings for Projects where performance, wide platform support, and ease of customizing graphics are the primary considerations.\n\nThis Template uses the Universal Render Pipeline (URP) and Shader Graph. URP is prebuilt Scriptable Render Pipeline that is quick and easy to customize, and lets you create optimized graphics across a wide range of platforms. URP also includes an optimized 2D renderer complete with 2D lights and pixel perfect rendering, and an integrated post-processing solution. Shader Graph is a tool that allows you to create shaders using a visual node editor instead of writing code.\n\nThis template contains a sample Scene that contains examples of how to configure lighting settings, Materials, Shaders, and post-processing effects in URP, several preconfigured Universal Render Pipeline Assets that let you quickly swap between graphics quality levels, and Presets that have been optimized for use with URP.", "dependencies": { - "com.unity.render-pipelines.universal": "12.0.0" + "com.unity.render-pipelines.universal": "12.1.0" } -} \ No newline at end of file +} diff --git a/com.unity.template-universal/Packages/manifest.json b/com.unity.template-universal/Packages/manifest.json index c3585b9fb55..756a6d4b4d3 100644 --- a/com.unity.template-universal/Packages/manifest.json +++ b/com.unity.template-universal/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.ide.visualstudio": "2.0.11", "com.unity.ide.vscode": "1.2.4", "com.unity.purchasing": "3.2.2", - "com.unity.render-pipelines.universal": "12.0.0", + "com.unity.render-pipelines.universal": "12.1.0", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.2", diff --git a/com.unity.testing.graphics-performance/package.json b/com.unity.testing.graphics-performance/package.json index 991c34e89e8..6b0bc680e63 100644 --- a/com.unity.testing.graphics-performance/package.json +++ b/com.unity.testing.graphics-performance/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.testing.graphics-performance", "displayName":"Performance Graphics Tests Framework", - "version": "12.0.0", + "version": "12.1.0", "unity": "2021.2", "unityRelease": "0a1", "description": "Provides performance framework helpers for writing tests for graphics code, such as test scene asset description, performance performance report and shader static analysis.", diff --git a/com.unity.testing.urp-upgrade/package.json b/com.unity.testing.urp-upgrade/package.json index 15948576635..a41565058bc 100644 --- a/com.unity.testing.urp-upgrade/package.json +++ b/com.unity.testing.urp-upgrade/package.json @@ -17,7 +17,7 @@ "nuget.moq": "1.0.0", "com.unity.test-framework": "1.1.29", "com.unity.testframework.graphics": "7.8.11-preview", - "com.unity.render-pipelines.universal": "12.0.0", + "com.unity.render-pipelines.universal": "12.1.0", "com.unity.timeline": "1.6.0-pre.3" } } diff --git a/com.unity.testing.visualeffectgraph/package.json b/com.unity.testing.visualeffectgraph/package.json index c60783896f9..7a6bfe6fb73 100644 --- a/com.unity.testing.visualeffectgraph/package.json +++ b/com.unity.testing.visualeffectgraph/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.testing.visualeffectgraph", "displayName": "Visual Effect Graphic Tests", - "version": "12.0.0", + "version": "12.1.0", "unity": "2021.2", "unityRelease": "0a1", "description": "This package contains common graphics tests from several scriptable renderpipeline", "dependencies": { - "com.unity.visualeffectgraph": "12.0.0", + "com.unity.visualeffectgraph": "12.1.0", "com.unity.testframework.graphics": "7.8.11-preview", "com.unity.testing.graphics-performance": "8.0.0", "com.unity.test-framework": "1.1.29" diff --git a/com.unity.visualeffectgraph/CHANGELOG.md b/com.unity.visualeffectgraph/CHANGELOG.md index c231fff6e3e..16530600f05 100644 --- a/com.unity.visualeffectgraph/CHANGELOG.md +++ b/com.unity.visualeffectgraph/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [12.1.0] - 2021-09-23 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 ### Added - Added support for Texture2D Arrays in Flipbooks diff --git a/com.unity.visualeffectgraph/package.json b/com.unity.visualeffectgraph/package.json index e85af77331f..c8126f8c2c9 100644 --- a/com.unity.visualeffectgraph/package.json +++ b/com.unity.visualeffectgraph/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.visualeffectgraph", "displayName": "Visual Effect Graph", - "version": "12.0.0", + "version": "12.1.0", "unity": "2021.2", "unityRelease": "0b14", "description": "The Visual Effect Graph is a node based visual effect editor. It allows you to author next generation visual effects that Unity simulates directly on the GPU. The Visual Effect Graph is production-ready for the High Definition Render Pipeline and runs on all platforms supported by it. Full support for the Universal Render Pipeline and compatible mobile devices is still in development.", @@ -13,8 +13,8 @@ "particles" ], "dependencies": { - "com.unity.shadergraph": "12.0.0", - "com.unity.render-pipelines.core": "12.0.0" + "com.unity.shadergraph": "12.1.0", + "com.unity.render-pipelines.core": "12.1.0" }, "samples": [ {