Merge pull request #435 from Unity-Technologies/mobile-fixes

Mobile fixes

Author: Chman

PostProcessing/Runtime/Effects/ColorGrading.cs

@@ -450,13 +450,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/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/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