Merge pull request #270 from keijiro/v2_xb1_fix

Chman · web-flow · commit 95783cb4bf74 · 2017-09-04T11:20:29.000+02:00
Fixes for Xbox One support
diff --git a/PostProcessing/Runtime/Utils/RuntimeUtilities.cs b/PostProcessing/Runtime/Utils/RuntimeUtilities.cs
@@ -240,6 +240,8 @@ public static bool isVREnabled
             {
 #if UNITY_EDITOR
                 return UnityEditor.PlayerSettings.virtualRealitySupported;
+#elif UNITY_XBOXONE
+                return false;
 #elif UNITY_2017_2_OR_NEWER
                 return UnityEngine.XR.XRSettings.enabled;
 #elif UNITY_5_6_OR_NEWER
diff --git a/PostProcessing/Shaders/API/XboxOne.hlsl b/PostProcessing/Shaders/API/XboxOne.hlsl
@@ -1,4 +1,4 @@
-#define UNITY_UV_STARTS_AT_TOP 0 // Probably wrong?
+#define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
 

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,8 @@ public static bool isVREnabled`
`240`	`240`	`{`
`241`	`241`	`#if UNITY_EDITOR`
`242`	`242`	`return UnityEditor.PlayerSettings.virtualRealitySupported;`
	`243`	`+#elif UNITY_XBOXONE`
	`244`	`+ return false;`
`243`	`245`	`#elif UNITY_2017_2_OR_NEWER`
`244`	`246`	`return UnityEngine.XR.XRSettings.enabled;`
`245`	`247`	`#elif UNITY_5_6_OR_NEWER`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#define UNITY_UV_STARTS_AT_TOP 0 // Probably wrong?`
	`1`	`+#define UNITY_UV_STARTS_AT_TOP 1`
`2`	`2`	`#define UNITY_REVERSED_Z 1`
`3`	`3`	`#define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)`
`4`	`4`