diff --git a/CHANGELOG.md b/CHANGELOG.md index c17e76f..271135b 100644 --- a/CHANGELOG.md +++ b/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). +## [7.6.0] - 2021-03-25 + +### Added +- Support for the PlayStation 5 platform has been added. + ## [7.5.3] - 2021-01-11 Version Updated diff --git a/Editor/MaterialUpgrader.cs b/Editor/MaterialUpgrader.cs index bde4ad1..a0e9581 100644 --- a/Editor/MaterialUpgrader.cs +++ b/Editor/MaterialUpgrader.cs @@ -331,7 +331,7 @@ public static void UpgradeProjectFolder(List upgraders, string /// Material Upgrader flags. public static void UpgradeProjectFolder(List upgraders, HashSet shaderNamesToIgnore, string progressBarName, UpgradeFlags flags = UpgradeFlags.None) { - if (!EditorUtility.DisplayDialog(DialogText.title, "The upgrade will overwrite materials in your project. " + DialogText.projectBackMessage, DialogText.proceed, DialogText.cancel)) + if ((!Application.isBatchMode) && (!EditorUtility.DisplayDialog(DialogText.title, "The upgrade will overwrite materials in your project. " + DialogText.projectBackMessage, DialogText.proceed, DialogText.cancel))) return; int totalMaterialCount = 0; diff --git a/Runtime/Documentation.cs b/Runtime/Documentation.cs index a5347d8..45f10f6 100644 --- a/Runtime/Documentation.cs +++ b/Runtime/Documentation.cs @@ -18,7 +18,7 @@ public class DocumentationInfo /// /// [Obsolete("Can not be used anymore, use Documentation.releaseVersion", false)] - public const string version = "7.3"; + public const string version = "7.6"; } //Need to live in Runtime as Attribute of documentation is on Runtime classes \o/ @@ -35,7 +35,7 @@ class Documentation : DocumentationInfo internal const string endURL = ".html"; - internal const string releaseVersion = "7.5"; + internal const string releaseVersion = "7.6"; //Temporary for now, there is several part of the Core documentation that are misplaced in HDRP documentation. //use this base url for them: diff --git a/Runtime/Textures/TextureXR.cs b/Runtime/Textures/TextureXR.cs index bc98432..63091a8 100644 --- a/Runtime/Textures/TextureXR.cs +++ b/Runtime/Textures/TextureXR.cs @@ -39,6 +39,7 @@ public static bool useTexArray case GraphicsDeviceType.Direct3D11: case GraphicsDeviceType.Direct3D12: case GraphicsDeviceType.PlayStation4: + case GraphicsDeviceType.PlayStation5: case GraphicsDeviceType.Vulkan: return true; diff --git a/ShaderLibrary/Common.hlsl b/ShaderLibrary/Common.hlsl index 6044960..cd27df8 100644 --- a/ShaderLibrary/Common.hlsl +++ b/ShaderLibrary/Common.hlsl @@ -158,8 +158,10 @@ // Include language header #if defined(SHADER_API_XBOXONE) #include "Packages/com.unity.render-pipelines.xboxone/ShaderLibrary/API/XBoxOne.hlsl" -#elif defined(SHADER_API_PSSL) +#elif defined(SHADER_API_PS4) #include "Packages/com.unity.render-pipelines.ps4/ShaderLibrary/API/PSSL.hlsl" +#elif defined(SHADER_API_PS5) +#include "Packages/com.unity.render-pipelines.ps5/ShaderLibrary/API/PSSL.hlsl" #elif defined(SHADER_API_D3D11) #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/API/D3D11.hlsl" #elif defined(SHADER_API_METAL) diff --git a/ShaderLibrary/SpaceTransforms.hlsl b/ShaderLibrary/SpaceTransforms.hlsl index d1c09a9..9f8383b 100644 --- a/ShaderLibrary/SpaceTransforms.hlsl +++ b/ShaderLibrary/SpaceTransforms.hlsl @@ -49,7 +49,10 @@ float3 GetCameraRelativePositionWS(float3 positionWS) real GetOddNegativeScale() { - return unity_WorldTransformParams.w; + // FIXME: We should be able to just return unity_WorldTransformParams.w, but it is not + // properly set at the moment, when doing ray-tracing; once this has been fixed in cpp, + // we can revert back to the former implementation. + return unity_WorldTransformParams.w >= 0.0 ? 1.0 : -1.0; } float3 TransformObjectToWorld(float3 positionOS) diff --git a/ShaderLibrary/Version.hlsl b/ShaderLibrary/Version.hlsl index 582c687..40977db 100644 --- a/ShaderLibrary/Version.hlsl +++ b/ShaderLibrary/Version.hlsl @@ -1,5 +1,5 @@ #define SHADER_LIBRARY_VERSION_MAJOR 7 -#define SHADER_LIBRARY_VERSION_MINOR 5 +#define SHADER_LIBRARY_VERSION_MINOR 6 #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/ValidationExceptions.json b/ValidationExceptions.json new file mode 100644 index 0000000..8896bba --- /dev/null +++ b/ValidationExceptions.json @@ -0,0 +1,11 @@ + +{ + "Exceptions": + [ + { + "ValidationTest": "API Validation", + "ExceptionError": "Breaking changes require a new major version.", + "PackageVersion": "7.6.0" + } + ] +} \ No newline at end of file diff --git a/ValidationExceptions.json.meta b/ValidationExceptions.json.meta new file mode 100644 index 0000000..b2c58a6 --- /dev/null +++ b/ValidationExceptions.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 358f31ea4621b134481dc0a475d8b6c9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/package.json b/package.json index cb04dc7..3efc534 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,20 @@ { "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": "7.5.3", + "version": "7.6.0", "unity": "2019.4", - "unityRelease": "14f1", + "unityRelease": "23f1", "displayName": "Core RP Library", "dependencies": { "com.unity.ugui": "1.0.0", "com.unity.modules.physics": "1.0.0" }, "upmCi": { - "footprint": "80b83f326f847c22d1b27218dc54d2b3e2672a4c" + "footprint": "ead9a96e90e328ac99ad3f6e128368efc06fff57" }, "repository": { "url": "https://github.com/Unity-Technologies/Graphics.git", "type": "git", - "revision": "ac3b5ff88a3e68b57911bd6e66fdf7bbc2090dac" + "revision": "b9e8ac45ef83cffce6a345c8b09ec7575fd0b713" } }