Merge pull request #307 from UnityTech/master

release stable version 1.5.4

Author: zhuxingwei

Runtime/Plugins/platform/ios/DeviceScreen.mm

@@ -1,8 +1,13 @@
 #import <UIKit/UIKit.h>
+#import "UIWidgetsDevice.h"
 extern "C"
 {
-    int IOSDeviceScaleFactor()
+    float IOSDeviceScaleFactor()
     {
-        return [[UIScreen mainScreen] scale];
+        float scale = [[UIScreen mainScreen] scale] * 1.0;
+        if ([UIWidgetsDevice NeedScreenDownSample]) {
+            scale *= 0.8696;
+        }
+        return scale;
     }
 }

Runtime/Resources/UIWidgets_GUITexture.shader.meta

@@ -3,15 +3,13 @@ Shader "UIWidgets/ShadowBox"
     //originally from http://madebyevan.com/shaders/fast-rounded-rectangle-shadows/
     Properties
     {
-        _SrcBlend("_SrcBlend", Int) = 1 // One
-        _DstBlend("_DstBlend", Int) = 10 // OneMinusSrcAlpha
         _StencilComp("_StencilComp", Float) = 8 // - Equal, 8 - Always 
     }
     SubShader
     {
         ZTest Always
         ZWrite Off
-        Blend [_SrcBlend] [_DstBlend]
+        Blend SrcAlpha OneMinusSrcAlpha
 
         Stencil {
             Ref 128

Runtime/Resources/shaders.meta

@@ -3,15 +3,13 @@ Shader "UIWidgets/ShadowRBox"
     //originally from http://madebyevan.com/shaders/fast-rounded-rectangle-shadows/
     Properties
     {
-        _SrcBlend("_SrcBlend", Int) = 1 // One
-        _DstBlend("_DstBlend", Int) = 10 // OneMinusSrcAlpha
         _StencilComp("_StencilComp", Float) = 8 // - Equal, 8 - Always 
     }
     SubShader
     {
         ZTest Always
         ZWrite Off
-        Blend [_SrcBlend] [_DstBlend]
+        Blend SrcAlpha OneMinusSrcAlpha
 
         Stencil {
             Ref 128

Runtime/Resources/UIWidgets_GUITexture.shader renamed to Runtime/Resources/shaders/UIWidgets_GUITexture.shader

@@ -0,0 +1,27 @@
+struct vdata
+{
+    float2 vertex;
+    float2 uv;
+};
+
+StructuredBuffer<vdata> databuffer;
+StructuredBuffer<int> indexbuffer;
+int _startVertex;
+
+v2f vert_compute (uint vertex_id: SV_VertexID)
+{
+    v2f o = (v2f)0;
+    vdata v = databuffer[indexbuffer[_startVertex + vertex_id]];
+    o.ftcoord = v.uv;
+    o.fpos = v.vertex;
+              
+    float3x3 mat = float3x3(_mat[0], _mat[1], _mat[2], _mat[3], _mat[4], _mat[5], 0, 0, 1);
+    float2 p = mul(mat, float3(v.vertex.xy, 1.0)).xy - _viewport.xy;
+    
+#if UNITY_UV_STARTS_AT_TOP
+    o.vertex = float4(2.0 * p.x / _viewport.z - 1.0, 2.0 * p.y / _viewport.w - 1.0, 0, 1);
+#else
+    o.vertex = float4(2.0 * p.x / _viewport.z - 1.0, 1.0 - 2.0 * p.y / _viewport.w, 0, 1);
+#endif
+    return o;
+}

Runtime/Resources/shaders/UIWidgets_GUITexture.shader.meta

@@ -0,0 +1,76 @@
+Shader "UIWidgets/canvas_convexFill_cb"
+{
+    Properties
+    {
+       _SrcBlend("_SrcBlend", Int) = 1 // One
+       _DstBlend("_DstBlend", Int) = 10 // OneMinusSrcAlpha
+       _StencilComp("_StencilComp", Float) = 3 // - Equal, 8 - Always 
+    }
+
+    SubShader
+    {   
+        ZTest Always
+        ZWrite Off
+        Blend [_SrcBlend] [_DstBlend]
+        
+        Stencil {
+            Ref 128
+            Comp [_StencilComp]
+        }
+        
+        Pass { // 0, color
+            CGPROGRAM
+            #pragma require compute
+            #define UIWIDGETS_COLOR
+            #include "../UIWidgets_canvas.cginc"
+            #include "UIWidgets_canvas_cb.cginc"
+            #pragma vertex vert_compute
+            #pragma fragment frag
+            ENDCG
+        }
+        
+        Pass { // 1, linear
+            CGPROGRAM
+            #pragma require compute
+            #define UIWIDGETS_LINEAR
+            #include "../UIWidgets_canvas.cginc"
+            #include "UIWidgets_canvas_cb.cginc"
+            #pragma vertex vert_compute
+            #pragma fragment frag
+            ENDCG
+        }
+
+        Pass { // 2, radial
+            CGPROGRAM
+            #pragma require compute
+            #define UIWIDGETS_RADIAL
+            #include "../UIWidgets_canvas.cginc"
+            #include "UIWidgets_canvas_cb.cginc"
+            #pragma vertex vert_compute
+            #pragma fragment frag
+            ENDCG
+        }
+
+        Pass { // 3, sweep
+            CGPROGRAM
+            #pragma require compute
+            #define UIWIDGETS_SWEEP
+            #include "../UIWidgets_canvas.cginc"
+            #include "UIWidgets_canvas_cb.cginc"
+            #pragma vertex vert_compute
+            #pragma fragment frag
+            ENDCG
+        }
+        
+        Pass { // 4, image
+            CGPROGRAM
+            #pragma require compute
+            #define UIWIDGETS_IMAGE
+            #include "../UIWidgets_canvas.cginc"
+            #include "UIWidgets_canvas_cb.cginc"
+            #pragma vertex vert_compute
+            #pragma fragment frag
+            ENDCG
+        }
+    }
+}

Runtime/Resources/UIWidgets_UIDefault.shader renamed to Runtime/Resources/shaders/UIWidgets_UIDefault.shader

@@ -0,0 +1,33 @@
+Shader "UIWidgets/canvas_fill0_cb"
+{
+    Properties {
+        _StencilComp("_StencilComp", Float) = 3 // - Equal, 8 - Always 
+    }
+   
+    SubShader {
+        ZTest Always
+        ZWrite Off
+        
+        Cull Off        
+        ColorMask 0
+        Stencil {
+            Ref 128
+            CompFront [_StencilComp]
+            CompBack [_StencilComp]
+            ReadMask 128
+            WriteMask 127
+            PassFront IncrWrap
+            PassBack DecrWrap
+        }
+            
+        Pass {
+            CGPROGRAM
+            #pragma require compute
+            #include "../UIWidgets_canvas.cginc"
+            #include "UIWidgets_canvas_cb.cginc"
+            #pragma vertex vert_compute
+            #pragma fragment frag_stencil
+            ENDCG
+        }
+    }
+}