Fixed UnityStereoClamp warnings and broken macro

Chman · Chman · commit 4d01fc375916 · 2017-09-20T10:54:01.000+02:00
diff --git a/PostProcessing/Shaders/xRLib.hlsl b/PostProcessing/Shaders/xRLib.hlsl
@@ -51,7 +51,7 @@ float4 UnityStereoTransformScreenSpaceTex(float4 uv)
     return float4(UnityStereoTransformScreenSpaceTex(uv.xy), UnityStereoTransformScreenSpaceTex(uv.zw));
 }
 
-float2 UnityStereoClamp(float2 uv, float4 scaleAndOffset)
+float2 UnityStereoClampScaleOffset(float2 uv, float4 scaleAndOffset)
 {
     return float2(clamp(uv.x, scaleAndOffset.z, scaleAndOffset.z + scaleAndOffset.x), uv.y);
 }
@@ -63,7 +63,7 @@ float2 UnityStereoClamp(float2 uv)
 #else
 #define TransformStereoScreenSpaceTex(uv, w) uv
 #define UnityStereoTransformScreenSpaceTex(uv) uv
-#define UnityStereoClamp(uv, scaleAndOffset) uv
+#define UnityStereoClampScaleOffset(uv, scaleAndOffset) uv
 #define UnityStereoClamp(uv) uv
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ float4 UnityStereoTransformScreenSpaceTex(float4 uv)`
`51`	`51`	`return float4(UnityStereoTransformScreenSpaceTex(uv.xy), UnityStereoTransformScreenSpaceTex(uv.zw));`
`52`	`52`	`}`
`53`	`53`
`54`		`-float2 UnityStereoClamp(float2 uv, float4 scaleAndOffset)`
	`54`	`+float2 UnityStereoClampScaleOffset(float2 uv, float4 scaleAndOffset)`
`55`	`55`	`{`
`56`	`56`	`return float2(clamp(uv.x, scaleAndOffset.z, scaleAndOffset.z + scaleAndOffset.x), uv.y);`
`57`	`57`	`}`
`@@ -63,7 +63,7 @@ float2 UnityStereoClamp(float2 uv)`
`63`	`63`	`#else`
`64`	`64`	`#define TransformStereoScreenSpaceTex(uv, w) uv`
`65`	`65`	`#define UnityStereoTransformScreenSpaceTex(uv) uv`
`66`		`-#define UnityStereoClamp(uv, scaleAndOffset) uv`
	`66`	`+#define UnityStereoClampScaleOffset(uv, scaleAndOffset) uv`
`67`	`67`	`#define UnityStereoClamp(uv) uv`
`68`	`68`	`#endif`
`69`	`69`