Merge branch 'v2' into shader-stripping

Author: hkr

PostProcessing/Runtime/Effects/ColorGrading.cs

@@ -451,13 +451,13 @@ void CheckInternalLogLut()
                 m_InternalLogLut = new RenderTexture(k_Lut3DSize, k_Lut3DSize, 0, format, RenderTextureReadWrite.Linear)
                 {
                     name = "Color Grading Log Lut",
+                    dimension = TextureDimension.Tex3D,
                     hideFlags = HideFlags.DontSave,
                     filterMode = FilterMode.Bilinear,
                     wrapMode = TextureWrapMode.Clamp,
                     anisoLevel = 0,
                     enableRandomWrite = true,
                     volumeDepth = k_Lut3DSize,
-                    dimension = TextureDimension.Tex3D,
                     autoGenerateMips = false,
                     useMipMap = false
                 };

PostProcessing/Runtime/PostProcessLayer.cs

@@ -848,7 +848,7 @@ int RenderBuiltins(PostProcessRenderContext context, bool isFinalPass, int relea
 
             if (releaseTargetAfterUse > -1) cmd.ReleaseTemporaryRT(releaseTargetAfterUse);
             if (motionBlurTarget > -1) cmd.ReleaseTemporaryRT(motionBlurTarget);
-            if (depthOfFieldTarget > -1) cmd.ReleaseTemporaryRT(motionBlurTarget);
+            if (depthOfFieldTarget > -1) cmd.ReleaseTemporaryRT(depthOfFieldTarget);
             if (context.bloomBufferNameID > -1) cmd.ReleaseTemporaryRT(context.bloomBufferNameID);
 
             cmd.EndSample("BuiltinStack");

PostProcessing/Runtime/Utils/TextureLerper.cs

@@ -82,12 +82,12 @@ RenderTexture Get(RenderTextureFormat format, int w, int h, int d = 1, bool enab
 
                 rt = new RenderTexture(w, h, d, format)
                 {
+                    dimension = dimension,
                     filterMode = FilterMode.Bilinear,
                     wrapMode = TextureWrapMode.Clamp,
                     anisoLevel = 0,
                     volumeDepth = d,
-                    enableRandomWrite = enableRandomWrite,
-                    dimension = dimension
+                    enableRandomWrite = enableRandomWrite
                 };
                 rt.Create();
             }

PostProcessing/Runtime/Utils/XRSettings.cs

@@ -1,5 +1,5 @@
 // Small shim for VRSettings/XRSettings on XboxOne and Switch
-#if !UNITY_2018_1_OR_NEWER && (UNITY_XBOXONE || UNITY_SWITCH)
+#if !UNITY_2018_2_OR_NEWER && (UNITY_XBOXONE || UNITY_SWITCH) && !UNITY_EDITOR
 using System;
 
 namespace UnityEngine.XR

PostProcessing/Shaders/API/OpenGL.hlsl

@@ -29,11 +29,19 @@
 #define SAMPLE_DEPTH_TEXTURE(textureName, samplerName, coord2) SAMPLE_TEXTURE2D(textureName, samplerName, coord2).r
 #define SAMPLE_DEPTH_TEXTURE_LOD(textureName, samplerName, coord2, lod) SAMPLE_TEXTURE2D_LOD(textureName, samplerName, coord2, lod).r
 
-#define UNITY_BRANCH
-#define UNITY_FLATTEN
-#define UNITY_UNROLL
-#define UNITY_LOOP
-#define UNITY_FASTOPT
+#if SHADER_API_GLES
+#    define UNITY_BRANCH
+#    define UNITY_FLATTEN
+#    define UNITY_UNROLL
+#    define UNITY_LOOP
+#    define UNITY_FASTOPT
+#else
+#    define UNITY_BRANCH    [branch]
+#    define UNITY_FLATTEN   [flatten]
+#    define UNITY_UNROLL    [unroll]
+#    define UNITY_LOOP      [loop]
+#    define UNITY_FASTOPT   [fastopt]
+#endif
 
 #define CBUFFER_START(name)
 #define CBUFFER_END

PostProcessing/Shaders/Builtins/CopyStd.shader

@@ -53,20 +53,12 @@ Shader "Hidden/PostProcessing/CopyStd"
         //>>> We don't want to include StdLib.hlsl in this file so let's copy/paste what we need
         bool IsNan(float x)
         {
-        #if !SHADER_API_GLES
-            return isnan(x) || isinf(x);
-        #else
             return (x <= 0.0 || 0.0 <= x) ? false : true;
-        #endif
         }
 
         bool AnyIsNan(float4 x)
         {
-        #if !SHADER_API_GLES
-            return any(isnan(x)) || any(isinf(x));
-        #else
             return IsNan(x.x) || IsNan(x.y) || IsNan(x.z) || IsNan(x.w);
-        #endif
         }
         //<<<
 

PostProcessing/Shaders/StdLib.hlsl

@@ -55,6 +55,10 @@ float rcp(float value)
 }
 #endif
 
+#if defined(SHADER_API_GLES)
+#define mad(a, b, c) (a * b + c)
+#endif
+
 #ifndef INTRINSIC_MINMAX3
 float Min3(float a, float b, float c)
 {
@@ -143,40 +147,25 @@ float4 PositivePow(float4 base, float4 power)
 }
 
 // NaN checker
+// /Gic isn't enabled on fxc so we can't rely on isnan() anymore
 bool IsNan(float x)
 {
-#if !defined(SHADER_API_GLES)
-    return isnan(x) || isinf(x);
-#else
     return (x <= 0.0 || 0.0 <= x) ? false : true;
-#endif
 }
 
 bool AnyIsNan(float2 x)
 {
-#if !defined(SHADER_API_GLES)
-    return any(isnan(x)) || any(isinf(x));
-#else
     return IsNan(x.x) || IsNan(x.y);
-#endif
 }
 
 bool AnyIsNan(float3 x)
 {
-#if !defined(SHADER_API_GLES)
-    return any(isnan(x)) || any(isinf(x));
-#else
     return IsNan(x.x) || IsNan(x.y) || IsNan(x.z);
-#endif
 }
 
 bool AnyIsNan(float4 x)
 {
-#if !defined(SHADER_API_GLES)
-    return any(isnan(x)) || any(isinf(x));
-#else
     return IsNan(x.x) || IsNan(x.y) || IsNan(x.z) || IsNan(x.w);
-#endif
 }
 
 // -----------------------------------------------------------------------------

README.md

@@ -21,4 +21,4 @@ Requires Unity 5.6.1+ or 2017.1+.
 License
 -------
 
-MIT (see [LICENSE](LICENSE))
+Unity Companion License (see [LICENSE](LICENSE))