Merge pull request #536 from Unity-Technologies/switch_support

Switch fixes

Author: Chman

PostProcessing/Runtime/PostProcessLayer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine.Assertions;
@@ -279,12 +279,14 @@ void OnPreCull()
             m_Camera.ResetProjectionMatrix();
             m_Camera.nonJitteredProjectionMatrix = m_Camera.projectionMatrix;
 
+#if !UNITY_SWITCH
             if (m_Camera.stereoEnabled)
             {
                 m_Camera.ResetStereoProjectionMatrices();
                 Shader.SetGlobalFloat(ShaderIDs.RenderViewportScaleFactor, XRSettings.renderViewportScale);
             }
             else
+#endif
             {
                 Shader.SetGlobalFloat(ShaderIDs.RenderViewportScaleFactor, 1.0f);
             }

PostProcessing/Runtime/PostProcessRenderContext.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace UnityEngine.Rendering.PostProcessing
 {
@@ -23,6 +23,7 @@ public Camera camera
             {
                 m_Camera = value;
 
+#if !UNITY_SWITCH
                 if (m_Camera.stereoEnabled)
                 {
 #if UNITY_2017_2_OR_NEWER
@@ -48,6 +49,7 @@ public Camera camera
                     stereoActive = true;
                 }
                 else
+#endif
                 {
                     width = m_Camera.pixelWidth;
                     height = m_Camera.pixelHeight;

PostProcessing/Runtime/Utils/RuntimeUtilities.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -355,6 +355,8 @@ public static bool isSinglePassStereoEnabled
             {
 #if UNITY_EDITOR
                 return isSinglePassStereoSelected && Application.isPlaying;
+#elif UNITY_SWITCH
+                return false;
 #elif UNITY_2017_2_OR_NEWER
                 return UnityEngine.XR.XRSettings.eyeTextureDesc.vrUsage == VRTextureUsage.TwoEyes;
 #else
@@ -369,7 +371,7 @@ public static bool isVREnabled
             {
 #if UNITY_EDITOR
                 return UnityEditor.PlayerSettings.virtualRealitySupported;
-#elif UNITY_XBOXONE
+#elif UNITY_XBOXONE || UNITY_SWITCH
                 return false;
 #elif UNITY_2017_2_OR_NEWER
                 return UnityEngine.XR.XRSettings.enabled;

PostProcessing/Shaders/API/Switch.hlsl

@@ -0,0 +1,51 @@
+#define UNITY_UV_STARTS_AT_TOP 1
+#define UNITY_REVERSED_Z 1
+#define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
+
+#define TEXTURE2D_SAMPLER2D(textureName, samplerName) Texture2D textureName; SamplerState samplerName
+#define TEXTURE3D_SAMPLER3D(textureName, samplerName) Texture3D textureName; SamplerState samplerName
+
+#define TEXTURE2D(textureName) Texture2D textureName
+#define SAMPLER2D(samplerName) SamplerState samplerName
+
+#define TEXTURE3D(textureName) Texture3D textureName
+#define SAMPLER3D(samplerName) SamplerState samplerName
+
+#define TEXTURE2D_ARGS(textureName, samplerName) Texture2D textureName, SamplerState samplerName
+#define TEXTURE2D_PARAM(textureName, samplerName) textureName, samplerName
+
+#define TEXTURE3D_ARGS(textureName, samplerName) Texture3D textureName, SamplerState samplerName
+#define TEXTURE3D_PARAM(textureName, samplerName) textureName, samplerName
+
+#define SAMPLE_TEXTURE2D(textureName, samplerName, coord2) textureName.Sample(samplerName, coord2)
+#define SAMPLE_TEXTURE2D_LOD(textureName, samplerName, coord2, lod) textureName.SampleLevel(samplerName, coord2, lod)
+
+#define SAMPLE_TEXTURE3D(textureName, samplerName, coord3) textureName.Sample(samplerName, coord3)
+
+#define LOAD_TEXTURE2D(textureName, texelSize, icoord2) textureName.Load(int3(icoord2, 0))
+#define LOAD_TEXTURE2D_LOD(textureName, texelSize, icoord2) textureName.Load(int3(icoord2, lod))
+
+#define GATHER_TEXTURE2D(textureName, samplerName, coord2) textureName.Gather(samplerName, coord2)
+#define GATHER_RED_TEXTURE2D(textureName, samplerName, coord2) textureName.GatherRed(samplerName, coord2)
+#define GATHER_GREEN_TEXTURE2D(textureName, samplerName, coord2) textureName.GatherGreen(samplerName, coord2)
+#define GATHER_BLUE_TEXTURE2D(textureName, samplerName, coord2) textureName.GatherBlue(samplerName, coord2)
+
+#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    [branch]
+#define UNITY_FLATTEN   [flatten]
+#define UNITY_UNROLL    [unroll]
+#define UNITY_LOOP      [loop]
+#define UNITY_FASTOPT   [fastopt]
+
+#define CBUFFER_START(name) cbuffer name {
+#define CBUFFER_END };
+
+#if UNITY_GATHER_SUPPORTED
+    #define FXAA_HLSL_5 1
+    #define SMAA_HLSL_4_1 1
+#else
+    #define FXAA_HLSL_4 1
+    #define SMAA_HLSL_4 1
+#endif

PostProcessing/Shaders/API/Switch.hlsl.meta

@@ -1,4 +1,4 @@
-// Because this framework is supposed to work with the legacy render pipelines AND scriptable render
+// Because this framework is supposed to work with the legacy render pipelines AND scriptable render
 // pipelines we can't use Unity's shader libraries (some scriptable pipelines come with their own
 // shader lib). So here goes a minimal shader lib only used for post-processing to ensure good
 // compatibility with all pipelines.
@@ -19,8 +19,10 @@
     #include "API/D3D12.hlsl"
 #elif defined(SHADER_API_D3D9) || defined(SHADER_API_D3D11_9X)
     #include "API/D3D9.hlsl"
-#elif defined(SHADER_API_VULKAN) || defined(SHADER_API_SWITCH)
+#elif defined(SHADER_API_VULKAN)
     #include "API/Vulkan.hlsl"
+#elif defined(SHADER_API_SWITCH)
+    #include "API/Switch.hlsl"
 #elif defined(SHADER_API_METAL)
     #include "API/Metal.hlsl"
 #elif defined(SHADER_API_PSP2)