diff --git a/package/CHANGELOG.md b/package/CHANGELOG.md index c1f233b98..fa029072b 100755 --- a/package/CHANGELOG.md +++ b/package/CHANGELOG.md @@ -4,6 +4,12 @@ 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). +## [2.1.4] - 2019-02-27 + +### Fixed +- Shader compilation errors with OpenGL ES2 and Switch. +- Proper viewport support on Builtin render pipelines. + ## [2.1.3] - 2019-01-30 ### Fixed diff --git a/package/PostProcessing/Runtime/Effects/DepthOfField.cs b/package/PostProcessing/Runtime/Effects/DepthOfField.cs index 4567ddda2..d1e3508b4 100755 --- a/package/PostProcessing/Runtime/Effects/DepthOfField.cs +++ b/package/PostProcessing/Runtime/Effects/DepthOfField.cs @@ -161,7 +161,7 @@ RenderTexture CheckHistory(int eye, int id, PostProcessRenderContext context, Re public override void Render(PostProcessRenderContext context) { - var colorFormat = RenderTextureFormat.DefaultHDR; + var colorFormat = context.sourceFormat; var cocFormat = SelectFormat(RenderTextureFormat.R8, RenderTextureFormat.RHalf); // Avoid using R8 on OSX with Metal. #896121, https://goo.gl/MgKqu6 diff --git a/package/PostProcessing/Runtime/PostProcessLayer.cs b/package/PostProcessing/Runtime/PostProcessLayer.cs index ecdacab86..601fc232f 100755 --- a/package/PostProcessing/Runtime/PostProcessLayer.cs +++ b/package/PostProcessing/Runtime/PostProcessLayer.cs @@ -1150,8 +1150,10 @@ int RenderBuiltins(PostProcessRenderContext context, bool isFinalPass, int relea { cmd.BlitFullscreenTriangleToDoubleWide(context.source, context.destination, uberSheet, 0, eye); } +#if LWRP_1_0_0_OR_NEWER else if (isFinalPass) cmd.BlitFullscreenTriangle(context.source, context.destination, uberSheet, 0, false, context.camera.pixelRect); +#endif else cmd.BlitFullscreenTriangle(context.source, context.destination, uberSheet, 0); diff --git a/package/PostProcessing/Runtime/Unity.Postprocessing.Runtime.asmdef b/package/PostProcessing/Runtime/Unity.Postprocessing.Runtime.asmdef index b0ba6fe2d..b326847e4 100755 --- a/package/PostProcessing/Runtime/Unity.Postprocessing.Runtime.asmdef +++ b/package/PostProcessing/Runtime/Unity.Postprocessing.Runtime.asmdef @@ -3,5 +3,12 @@ "references": [], "optionalUnityReferences": [], "includePlatforms": [], - "excludePlatforms": [] + "excludePlatforms": [], + "versionDefines": [ + { + "name": "com.unity.render-pipelines.lightweight", + "expression": "1.0.0", + "define": "LWRP_1_0_0_OR_NEWER" + } + ] } diff --git a/package/PostProcessing/Shaders/Builtins/FinalPass.shader b/package/PostProcessing/Shaders/Builtins/FinalPass.shader index eb61e5849..a818323e8 100755 --- a/package/PostProcessing/Shaders/Builtins/FinalPass.shader +++ b/package/PostProcessing/Shaders/Builtins/FinalPass.shader @@ -4,8 +4,10 @@ Shader "Hidden/PostProcessing/FinalPass" #pragma multi_compile __ FXAA FXAA_LOW #pragma multi_compile __ FXAA_KEEP_ALPHA - #pragma multi_compile __ STEREO_INSTANCING_ENABLED - #pragma multi_compile __ STEREO_DOUBLEWIDE_TARGET + + #pragma vertex VertUVTransform + #pragma fragment Frag + #include "../StdLib.hlsl" #include "../Colors.hlsl" #include "Dithering.hlsl" @@ -97,9 +99,9 @@ Shader "Hidden/PostProcessing/FinalPass" Pass { HLSLPROGRAM + #pragma exclude_renderers gles vulkan switch - #pragma vertex VertUVTransform - #pragma fragment Frag + #pragma multi_compile __ STEREO_INSTANCING_ENABLED STEREO_DOUBLEWIDE_TARGET #pragma target 5.0 ENDHLSL @@ -113,12 +115,42 @@ Shader "Hidden/PostProcessing/FinalPass" Pass { HLSLPROGRAM + #pragma exclude_renderers gles vulkan switch - #pragma vertex VertUVTransform - #pragma fragment Frag + #pragma multi_compile __ STEREO_INSTANCING_ENABLED STEREO_DOUBLEWIDE_TARGET #pragma target 3.0 ENDHLSL } } + + SubShader + { + Cull Off ZWrite Off ZTest Always + + Pass + { + HLSLPROGRAM + #pragma only_renderers gles + + #pragma multi_compile __ STEREO_INSTANCING_ENABLED STEREO_DOUBLEWIDE_TARGET + #pragma target es3.0 + + ENDHLSL + } + } + + SubShader + { + Cull Off ZWrite Off ZTest Always + + Pass + { + HLSLPROGRAM + #pragma only_renderers gles vulkan switch + + #pragma multi_compile __ STEREO_DOUBLEWIDE_TARGET //not supporting STEREO_INSTANCING_ENABLED + ENDHLSL + } + } } diff --git a/package/PostProcessing/Shaders/Builtins/Uber.shader b/package/PostProcessing/Shaders/Builtins/Uber.shader index 80257fcc6..9c08853bb 100755 --- a/package/PostProcessing/Shaders/Builtins/Uber.shader +++ b/package/PostProcessing/Shaders/Builtins/Uber.shader @@ -275,7 +275,7 @@ Shader "Hidden/PostProcessing/Uber" Pass { HLSLPROGRAM - #pragma exclude_renderers gles vulkan + #pragma exclude_renderers gles vulkan switch #pragma multi_compile __ COLOR_GRADING_LDR_2D COLOR_GRADING_HDR_2D COLOR_GRADING_HDR_3D #pragma multi_compile __ STEREO_INSTANCING_ENABLED STEREO_DOUBLEWIDE_TARGET @@ -290,7 +290,7 @@ Shader "Hidden/PostProcessing/Uber" Pass { HLSLPROGRAM - #pragma only_renderers vulkan + #pragma only_renderers vulkan switch #pragma multi_compile __ COLOR_GRADING_LDR_2D COLOR_GRADING_HDR_2D COLOR_GRADING_HDR_3D #pragma multi_compile __ STEREO_DOUBLEWIDE_TARGET // disabled for Vulkan because of shader compiler issues in older Unity versions: STEREO_INSTANCING_ENABLED diff --git a/package/package.json b/package/package.json index 2674cfd8c..4530a92b3 100755 --- a/package/package.json +++ b/package/package.json @@ -4,10 +4,10 @@ "displayName": "Post Processing", "name": "com.unity.postprocessing", "repository": { - "revision": "0c92d23eb8b5dff6c1ecb96ab807d0a7ace5bb97", + "revision": "80a69390a3559448807ac51d294265edaf4c7c4e", "type": "git", "url": "ssh://git@github.com/Unity-Technologies/PostProcessing.git" }, "unity": "2018.1", - "version": "2.1.3" + "version": "2.1.4" } \ No newline at end of file diff --git a/versions.txt b/versions.txt index f02c9d133..13d5eabdf 100755 --- a/versions.txt +++ b/versions.txt @@ -33,3 +33,4 @@ 2.1.1 2.1.2 2.1.3 +2.1.4