Merge branch 'v2' into shader-stripping

Author: hkr

PostProcessing/Runtime/Effects/ColorGrading.cs

@@ -178,6 +178,7 @@ public override void Render(PostProcessRenderContext context)
                 && SystemInfo.supportsComputeShaders
                 && context.resources.computeShaders.lut3DBaker != null
                 && SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLCore;
+                && SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLES3;
 
             if (gradingMode == GradingMode.External)
                 RenderExternalPipeline3D(context);

PostProcessing/Runtime/PostProcessRenderContext.cs

@@ -81,7 +81,7 @@ public Camera camera
 
         // Should we flip the last pass?
         public bool flip { get; set; }
-        
+
         // -----------------------------------------------------------------------------------------
         // The following is auto-populated by the post-processing stack
 
@@ -106,12 +106,11 @@ public Camera camera
 
         // TODO: Change w/h name to texture w/h in order to make
         // size usages explicit
-
 #if UNITY_2017_2_OR_NEWER
-        private RenderTextureDescriptor m_sourceDescriptor;
-        private RenderTextureDescriptor GetDescriptor(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default)
+        RenderTextureDescriptor m_sourceDescriptor;
+        RenderTextureDescriptor GetDescriptor(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default)
         {
-            var modifiedDesc = new RenderTextureDescriptor(m_sourceDescriptor.width, m_sourceDescriptor.height, 
+            var modifiedDesc = new RenderTextureDescriptor(m_sourceDescriptor.width, m_sourceDescriptor.height,
                                                                                 m_sourceDescriptor.colorFormat, depthBufferBits);
             modifiedDesc.dimension = m_sourceDescriptor.dimension;
             modifiedDesc.volumeDepth = m_sourceDescriptor.volumeDepth;
@@ -126,14 +125,14 @@ private RenderTextureDescriptor GetDescriptor(int depthBufferBits = 0, RenderTex
 
             if (colorFormat != RenderTextureFormat.Default)
                 modifiedDesc.colorFormat = colorFormat;
-            if (readWrite != RenderTextureReadWrite.Default)
-                modifiedDesc.sRGB = (readWrite != RenderTextureReadWrite.Linear);
+
+            modifiedDesc.sRGB = readWrite != RenderTextureReadWrite.Linear;
 
             return modifiedDesc;
         }
 #endif
 
-        public void GetScreenSpaceTemporaryRT(CommandBuffer cmd, int nameID, 
+        public void GetScreenSpaceTemporaryRT(CommandBuffer cmd, int nameID,
                                             int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default,
                                             FilterMode filter = FilterMode.Bilinear, int widthOverride = 0, int heightOverride = 0)
         {
@@ -155,11 +154,11 @@ public void GetScreenSpaceTemporaryRT(CommandBuffer cmd, int nameID,
 
             cmd.GetTemporaryRT(nameID, actualWidth, actualHeight, depthBufferBits, filter, colorFormat, readWrite);
             // TODO: How to handle MSAA for XR in older versions?  Query cam?
-            // TODO: Pass in vrUsage into the args 
+            // TODO: Pass in vrUsage into the args
 #endif
         }
 
-        public RenderTexture GetScreenSpaceTemporaryRT(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, 
+        public RenderTexture GetScreenSpaceTemporaryRT(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default,
                                                         RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default, int widthOverride = 0, int heightOverride = 0)
         {
 #if UNITY_2017_2_OR_NEWER
@@ -194,7 +193,7 @@ public RenderTexture GetScreenSpaceTemporaryRT(int depthBufferBits = 0, RenderTe
 
         // Are we currently rendering in the scene view?
         public bool isSceneView { get; internal set; }
-        
+
         // Current antialiasing method set
         public PostProcessLayer.Antialiasing antialiasing { get; internal set; }
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.unity.postprocessing",
-    "version": "0.1.7",
+    "version": "0.1.8",
     "unity": "2018.1",
     "description": "Unity postprocessing",
     "dependencies": {