Merge pull request #554 from thebanjomatic/objecttoclippos

StephenHodgson · web-flow · commit 7130ab0403db · 2017-04-12T15:29:08.000-04:00
Using UnityObjectToClipPos according to performance recommendations
diff --git a/Assets/HoloToolkit-Tests/Input/Shaders/button_unlit_shader.shader b/Assets/HoloToolkit-Tests/Input/Shaders/button_unlit_shader.shader
@@ -52,7 +52,7 @@
 			struct v2f
 			{
 				float4 pos : SV_POSITION;
-				fixed4 uv : TEXCOORD0;
+				fixed3 uv : TEXCOORD0;
 				fixed3 localNormal : TEXCOORD1;
 				fixed3 viewDir : TEXCOORD2;
 				fixed3 halfVec : TEXCOORD3;
@@ -63,7 +63,7 @@
 			{
 				v2f o;
 
-				o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+				o.pos = UnityObjectToClipPos(v.vertex);
 				o.uv.xy = v.texcoord;
 				o.localNormal = normalize(v.normal);
 				o.viewDir = normalize(ObjSpaceViewDir(v.vertex));
diff --git a/Assets/HoloToolkit/Input/Shaders/Cursor.shader b/Assets/HoloToolkit/Input/Shaders/Cursor.shader
@@ -37,7 +37,7 @@
 				UNITY_SETUP_INSTANCE_ID(v);
 
 				v2f o;
-				o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+				o.vertex = UnityObjectToClipPos(v.vertex);
 
 				UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
 				return o;
diff --git a/Assets/HoloToolkit/Input/Shaders/CursorShader.shader b/Assets/HoloToolkit/Input/Shaders/CursorShader.shader
@@ -71,7 +71,7 @@ Shader "HoloToolkit/Cursor"
 				UNITY_SETUP_INSTANCE_ID(IN);
 
 				v2f OUT;
-				OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex);
+				OUT.vertex = UnityObjectToClipPos(IN.vertex);
 				OUT.texcoord = IN.texcoord;
 #ifdef UNITY_HALF_TEXEL_OFFSET
 				OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
diff --git a/Assets/HoloToolkit/Input/Shaders/EditorHands.shader b/Assets/HoloToolkit/Input/Shaders/EditorHands.shader
@@ -67,7 +67,7 @@
             {
                 UNITY_SETUP_INSTANCE_ID(IN);
                 v2f OUT;
-                OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex);
+                OUT.vertex = UnityObjectToClipPos(IN.vertex);
                 OUT.texcoord = IN.texcoord;
                 #ifdef UNITY_HALF_TEXEL_OFFSET
                 OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
diff --git a/Assets/HoloToolkit/Input/Shaders/SpecularHighlight.shader b/Assets/HoloToolkit/Input/Shaders/SpecularHighlight.shader
@@ -92,7 +92,7 @@ Shader "HoloToolkit/SpecularHighlight"
             v2f vert(appdata_t v)
             {
                 v2f o;
-                o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+                o.pos = UnityObjectToClipPos(v.vertex);
                 o.uv = v.texcoord;
 
                 //Setup vectors for light probe contribution, w = 1.
diff --git a/Assets/HoloToolkit/SpatialMapping/Shaders/Occlusion.shader b/Assets/HoloToolkit/SpatialMapping/Shaders/Occlusion.shader
@@ -40,7 +40,7 @@ Shader "HoloToolkit/Occlusion"
             {
                 UNITY_SETUP_INSTANCE_ID(v);
                 v2f o;
-                o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+                o.pos = UnityObjectToClipPos(v.vertex);
                 UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
                 return o;
             }
diff --git a/Assets/HoloToolkit/SpatialMapping/Shaders/SpatialMappingTap.shader b/Assets/HoloToolkit/SpatialMapping/Shaders/SpatialMappingTap.shader
@@ -60,7 +60,7 @@ Shader "Spatial Mapping/Spatial Mappping Tap"
 			{
 				v2g o;
 
-				o.viewPos = mul(UNITY_MATRIX_MVP, v.vertex);
+				o.viewPos = UnityObjectToClipPos(v.vertex);
 
 				float4 worldPos = mul(unity_ObjectToWorld, v.vertex);
 				half distToCenter = distance(_Center, worldPos.xyz);		
diff --git a/Assets/HoloToolkit/SpatialMapping/Shaders/Wireframe.shader b/Assets/HoloToolkit/SpatialMapping/Shaders/Wireframe.shader
@@ -45,7 +45,7 @@ Shader "HoloToolkit/Wireframe"
             {
                 UNITY_SETUP_INSTANCE_ID(v);
                 v2g o;
-                o.viewPos = mul(UNITY_MATRIX_MVP, v.vertex);
+                o.viewPos = UnityObjectToClipPos(v.vertex);
                 UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
                 return o;
             }
diff --git a/Assets/HoloToolkit/SpatialUnderstanding/Materials/SpatialMappingSurface.shader b/Assets/HoloToolkit/SpatialUnderstanding/Materials/SpatialMappingSurface.shader
@@ -44,7 +44,7 @@ Shader "HoloToolkit/SpatialUnderstanding/Mapping"
             {
                 UNITY_SETUP_INSTANCE_ID(v);
                 v2g o;
-                o.viewPos = mul(UNITY_MATRIX_MVP, v.vertex);
+                o.viewPos = UnityObjectToClipPos(v.vertex);
                 UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
                 return o;
             }
diff --git a/Assets/HoloToolkit/SpatialUnderstanding/Materials/SpatialUnderstandingSurface.shader b/Assets/HoloToolkit/SpatialUnderstanding/Materials/SpatialUnderstandingSurface.shader
@@ -45,7 +45,7 @@ Shader "HoloToolkit/SpatialUnderstanding/Understanding"
            {
                v2g o;
                UNITY_SETUP_INSTANCE_ID(v);
-               o.viewPos = mul(UNITY_MATRIX_MVP, v.vertex);
+               o.viewPos = UnityObjectToClipPos(v.vertex);
                UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
                return o;
            }
diff --git a/Assets/HoloToolkit/UI/Shaders/3DTextShader.shader b/Assets/HoloToolkit/UI/Shaders/3DTextShader.shader
@@ -71,7 +71,7 @@
                 v2f vert (appdata_t v)
                 {
                     v2f o;
-                    o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+                    o.vertex = UnityObjectToClipPos(v.vertex);
                     o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
                     o.color = v.color;
                     #ifdef UNITY_HALF_TEXEL_OFFSET
diff --git a/Assets/HoloToolkit/Utilities/Shaders/HoloToolkitCommon.cginc b/Assets/HoloToolkit/Utilities/Shaders/HoloToolkitCommon.cginc
@@ -1,3 +1,5 @@
+#include "UnityCG.cginc"
+
 #ifndef HOLOTOOLKIT_COMMON
 #define HOLOTOOLKIT_COMMON
 
@@ -7,7 +9,7 @@ float4 _NearPlaneFadeDistance;
 // Could instead be done non-linear in projected space for speed
 inline float ComputeNearPlaneFadeLinear(float4 vertex)
 {
-    float distToCamera = -(mul(UNITY_MATRIX_MV, vertex).z);
+    float distToCamera = -(UnityObjectToViewPos(vertex).z);
     return saturate(mad(distToCamera, _NearPlaneFadeDistance.y, _NearPlaneFadeDistance.x));
 }
 
diff --git a/Assets/HoloToolkit/Utilities/Shaders/UnlitConfigurable.cginc b/Assets/HoloToolkit/Utilities/Shaders/UnlitConfigurable.cginc
@@ -35,7 +35,7 @@ v2f vert(appdata_t v)
 {
     UNITY_SETUP_INSTANCE_ID(v);
     v2f o;
-    o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+    o.vertex = UnityObjectToClipPos(v.vertex);
 
     #if _USEMAINTEX_ON
         o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
diff --git a/Assets/HoloToolkit/Utilities/Shaders/UnlitNoDepthTest.shader b/Assets/HoloToolkit/Utilities/Shaders/UnlitNoDepthTest.shader
@@ -40,7 +40,7 @@
 			{
 				UNITY_SETUP_INSTANCE_ID(v);
 				v2f o;
-				o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+				o.vertex = UnityObjectToClipPos(v.vertex);
 				o.uv = v.uv;
 				UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
 				return o;
diff --git a/Assets/HoloToolkit/Utilities/Shaders/VertexLitConfigurable.cginc b/Assets/HoloToolkit/Utilities/Shaders/VertexLitConfigurable.cginc
@@ -60,7 +60,7 @@ v2f_surf vert(appdata_t v)
     v2f_surf o;
     UNITY_INITIALIZE_OUTPUT(v2f_surf, o);
 
-    o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+    o.pos = UnityObjectToClipPos(v.vertex);
 
     #if _USEMAINTEX_ON || _USEEMISSIONTEX_ON
         o.pack0.xy = TRANSFORM_TEX(v.texcoord, _MainTex);
diff --git a/Assets/HoloToolkit/Utilities/Shaders/WindowOcclusion.shader b/Assets/HoloToolkit/Utilities/Shaders/WindowOcclusion.shader
@@ -39,7 +39,7 @@ Shader "HoloToolkit/WindowOcclusion"
             {
                 UNITY_SETUP_INSTANCE_ID(v);
                 v2f o;
-                o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+                o.pos = UnityObjectToClipPos(v.vertex);
                 UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
                 return o;
             }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`	`{`
`68`	`68`	`UNITY_SETUP_INSTANCE_ID(IN);`
`69`	`69`	`v2f OUT;`
`70`		`- OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex);`
	`70`	`+ OUT.vertex = UnityObjectToClipPos(IN.vertex);`
`71`	`71`	`OUT.texcoord = IN.texcoord;`
`72`	`72`	`#ifdef UNITY_HALF_TEXEL_OFFSET`
`73`	`73`	`OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ Shader "HoloToolkit/SpecularHighlight"`
`92`	`92`	`v2f vert(appdata_t v)`
`93`	`93`	`{`
`94`	`94`	`v2f o;`
`95`		`- o.pos = mul(UNITY_MATRIX_MVP, v.vertex);`
	`95`	`+ o.pos = UnityObjectToClipPos(v.vertex);`
`96`	`96`	`o.uv = v.texcoord;`
`97`	`97`
`98`	`98`	`//Setup vectors for light probe contribution, w = 1.`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ Shader "HoloToolkit/Occlusion"`
`40`	`40`	`{`
`41`	`41`	`UNITY_SETUP_INSTANCE_ID(v);`
`42`	`42`	`v2f o;`
`43`		`- o.pos = mul(UNITY_MATRIX_MVP, v.vertex);`
	`43`	`+ o.pos = UnityObjectToClipPos(v.vertex);`
`44`	`44`	`UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);`
`45`	`45`	`return o;`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ Shader "Spatial Mapping/Spatial Mappping Tap"`
`60`	`60`	`{`
`61`	`61`	`v2g o;`
`62`	`62`
`63`		`- o.viewPos = mul(UNITY_MATRIX_MVP, v.vertex);`
	`63`	`+ o.viewPos = UnityObjectToClipPos(v.vertex);`
`64`	`64`
`65`	`65`	`float4 worldPos = mul(unity_ObjectToWorld, v.vertex);`
`66`	`66`	`half distToCenter = distance(_Center, worldPos.xyz);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ Shader "HoloToolkit/Wireframe"`
`45`	`45`	`{`
`46`	`46`	`UNITY_SETUP_INSTANCE_ID(v);`
`47`	`47`	`v2g o;`
`48`		`- o.viewPos = mul(UNITY_MATRIX_MVP, v.vertex);`
	`48`	`+ o.viewPos = UnityObjectToClipPos(v.vertex);`
`49`	`49`	`UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);`
`50`	`50`	`return o;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ Shader "HoloToolkit/SpatialUnderstanding/Mapping"`
`44`	`44`	`{`
`45`	`45`	`UNITY_SETUP_INSTANCE_ID(v);`
`46`	`46`	`v2g o;`
`47`		`- o.viewPos = mul(UNITY_MATRIX_MVP, v.vertex);`
	`47`	`+ o.viewPos = UnityObjectToClipPos(v.vertex);`
`48`	`48`	`UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);`
`49`	`49`	`return o;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ Shader "HoloToolkit/SpatialUnderstanding/Understanding"`
`45`	`45`	`{`
`46`	`46`	`v2g o;`
`47`	`47`	`UNITY_SETUP_INSTANCE_ID(v);`
`48`		`- o.viewPos = mul(UNITY_MATRIX_MVP, v.vertex);`
	`48`	`+ o.viewPos = UnityObjectToClipPos(v.vertex);`
`49`	`49`	`UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);`
`50`	`50`	`return o;`
`51`	`51`	`}`