Merge pull request #528 from Unity-Technologies/vita_support

Chman · web-flow · commit a8b968626a83 · 2018-04-13T16:55:17.000+02:00
PSVita support
diff --git a/PostProcessing/Runtime/Utils/XRSettings.cs b/PostProcessing/Runtime/Utils/XRSettings.cs
@@ -1,5 +1,5 @@
-// Small shim for VRSettings/XRSettings on XboxOne and Switch
-#if (UNITY_XBOXONE || UNITY_SWITCH) && !UNITY_EDITOR
+// Small shim for VRSettings/XRSettings on XboxOne, Switch and PS Vita
+#if (UNITY_XBOXONE || UNITY_SWITCH || UNITY_PSP2) && !UNITY_EDITOR
 using System;
 
 #if UNITY_2017_2_OR_NEWER
diff --git a/PostProcessing/Shaders/API/D3D11.hlsl b/PostProcessing/Shaders/API/D3D11.hlsl
@@ -1,6 +1,7 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
+#define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) Texture2D textureName; SamplerState samplerName
 #define TEXTURE3D_SAMPLER3D(textureName, samplerName) Texture3D textureName; SamplerState samplerName
diff --git a/PostProcessing/Shaders/API/D3D12.hlsl b/PostProcessing/Shaders/API/D3D12.hlsl
@@ -1,6 +1,7 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
+#define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) Texture2D textureName; SamplerState samplerName
 #define TEXTURE3D_SAMPLER3D(textureName, samplerName) Texture3D textureName; SamplerState samplerName
diff --git a/PostProcessing/Shaders/API/D3D9.hlsl b/PostProcessing/Shaders/API/D3D9.hlsl
@@ -2,6 +2,7 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 0
 #define UNITY_GATHER_SUPPORTED 0
+#define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) sampler2D textureName
 #define TEXTURE3D_SAMPLER3D(textureName, samplerName) sampler3D textureName
diff --git a/PostProcessing/Shaders/API/Metal.hlsl b/PostProcessing/Shaders/API/Metal.hlsl
@@ -1,6 +1,7 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED 0 // Currently broken on Metal for some reason (May 2017)
+#define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) Texture2D textureName; SamplerState samplerName
 #define TEXTURE3D_SAMPLER3D(textureName, samplerName) Texture3D textureName; SamplerState samplerName
diff --git a/PostProcessing/Shaders/API/OpenGL.hlsl b/PostProcessing/Shaders/API/OpenGL.hlsl
@@ -2,6 +2,7 @@
 #define UNITY_UV_STARTS_AT_TOP 0
 #define UNITY_REVERSED_Z 0
 #define UNITY_GATHER_SUPPORTED 0
+#define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) sampler2D textureName
 #define TEXTURE3D_SAMPLER3D(textureName, samplerName) sampler3D textureName
diff --git a/PostProcessing/Shaders/API/PSP2.hlsl b/PostProcessing/Shaders/API/PSP2.hlsl
@@ -0,0 +1,48 @@
+
+#define UNITY_UV_STARTS_AT_TOP 1
+#define UNITY_REVERSED_Z 0
+#define UNITY_GATHER_SUPPORTED 0
+#define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 0
+
+#define TEXTURE2D_SAMPLER2D(textureName, samplerName) sampler2D textureName
+
+#define TEXTURE2D(textureName) sampler2D textureName
+#define SAMPLER2D(samplerName)
+
+#define TEXTURE2D_ARGS(textureName, samplerName) sampler2D textureName
+#define TEXTURE2D_PARAM(textureName, samplerName) textureName
+
+#define SAMPLE_TEXTURE2D(textureName, samplerName, coord2) tex2D(textureName, coord2)
+#define SAMPLE_TEXTURE2D_LOD(textureName, samplerName, coord2, lod) tex2Dlod(textureName, float4(coord2, 0.0, lod))
+
+#define LOAD_TEXTURE2D(textureName, texelSize, icoord2) tex2D(textureName, icoord2 / texelSize)
+#define LOAD_TEXTURE2D_LOD(textureName, texelSize, icoord2) tex2Dlod(textureName, float4(icoord2 / texelSize, 0.0, lod))
+
+#define SAMPLE_DEPTH_TEXTURE(textureName, samplerName, coord2) tex2D<float>(textureName, coord2).r
+#define SAMPLE_DEPTH_TEXTURE_LOD(textureName, samplerName, coord2, lod) tex2Dlod<float>(textureName, float4(coord2, 0.0, lod)).r
+
+// 3D textures are not supported on Vita, use 2D to avoid compile errors.
+#define TEXTURE3D_SAMPLER3D(textureName, samplerName) sampler2D textureName
+#define TEXTURE3D(textureName) sampler2D textureName
+#define SAMPLER3D(samplerName)
+#define TEXTURE3D_ARGS(textureName, samplerName) sampler2D textureName
+#define TEXTURE3D_PARAM(textureName, samplerName) textureName
+#define SAMPLE_TEXTURE3D(textureName, samplerName, coord3) tex2D(textureName, coord3)
+
+#define UNITY_BRANCH
+#define UNITY_FLATTEN
+#define UNITY_UNROLL
+#define UNITY_LOOP
+#define UNITY_FASTOPT
+
+#define CBUFFER_START(name)
+#define CBUFFER_END
+
+#define FXAA_HLSL_3 1
+#define SMAA_HLSL_3 1
+
+// pragma exclude_renderers is only supported since Unity 2018.1 for compute shaders
+#if UNITY_VERSION < 201810 && !defined(SHADER_API_GLCORE)
+#    define DISABLE_COMPUTE_SHADERS 1
+#    define TRIVIAL_COMPUTE_KERNEL(name) [numthreads(1, 1, 1)] void name() {}
+#endif
diff --git a/PostProcessing/Shaders/API/PSP2.hlsl.meta b/PostProcessing/Shaders/API/PSP2.hlsl.meta
diff --git a/PostProcessing/Shaders/API/PSSL.hlsl b/PostProcessing/Shaders/API/PSSL.hlsl
@@ -1,6 +1,7 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
+#define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 #define INTRINSIC_MINMAX3
 #define Min3 min3
 #define Max3 max3
diff --git a/PostProcessing/Shaders/API/Vulkan.hlsl b/PostProcessing/Shaders/API/Vulkan.hlsl
@@ -1,6 +1,7 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
+#define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) Texture2D textureName; SamplerState samplerName
 #define TEXTURE3D_SAMPLER3D(textureName, samplerName) Texture3D textureName; SamplerState samplerName
diff --git a/PostProcessing/Shaders/API/XboxOne.hlsl b/PostProcessing/Shaders/API/XboxOne.hlsl
@@ -1,6 +1,7 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
+#define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) Texture2D textureName; SamplerState samplerName
 #define TEXTURE3D_SAMPLER3D(textureName, samplerName) Texture3D textureName; SamplerState samplerName
diff --git a/PostProcessing/Shaders/Builtins/Lut2DBaker.shader b/PostProcessing/Shaders/Builtins/Lut2DBaker.shader
@@ -42,7 +42,7 @@ Shader "Hidden/PostProcessing/Lut2DBaker"
             colorLinear = LiftGammaGainHDR(colorLinear, _Lift, _InvGamma, _Gain);
 
             // Do NOT feed negative values to RgbToHsv or they'll wrap around
-            colorLinear = max(0.0, colorLinear);
+            colorLinear = max((float3)0.0, colorLinear);
 
             float3 hsv = RgbToHsv(colorLinear);
 
diff --git a/PostProcessing/Shaders/Builtins/ScalableAO.shader b/PostProcessing/Shaders/Builtins/ScalableAO.shader
@@ -2,6 +2,7 @@ Shader "Hidden/PostProcessing/ScalableAO"
 {
     HLSLINCLUDE
 
+        #pragma exclude_renderers psp2
         #pragma target 3.0
   
     ENDHLSL
diff --git a/PostProcessing/Shaders/Builtins/TemporalAntialiasing.shader b/PostProcessing/Shaders/Builtins/TemporalAntialiasing.shader
@@ -2,7 +2,7 @@ Shader "Hidden/PostProcessing/TemporalAntialiasing"
 {
     HLSLINCLUDE
 
-        #pragma exclude_renderers gles
+        #pragma exclude_renderers gles psp2
         #include "../StdLib.hlsl"
         #include "../Colors.hlsl"
 
diff --git a/PostProcessing/Shaders/Debug/Overlays.shader b/PostProcessing/Shaders/Debug/Overlays.shader
@@ -102,6 +102,7 @@ Shader "Hidden/PostProcessing/Debug/Overlays"
 
         float4 FragMotionVectors(VaryingsDefault i) : SV_Target
         {
+#if UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM
             float3 src = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, i.texcoordStereo).rgb;
             float2 mv = SampleMotionVectors(i.texcoord);
 
@@ -158,6 +159,10 @@ Shader "Hidden/PostProcessing/Debug/Overlays"
         #endif
 
             return float4(color.rgb + d.xxx, 1.0);
+#else
+            // Reading vertex SV_POSITION in a fragment shader is not supported by this platform so just return solid color.
+            return float4(1.0f, 0.0f, 1.0f, 1.0f);
+#endif
         }
 
         // -----------------------------------------------------------------------------
diff --git a/PostProcessing/Shaders/StdLib.hlsl b/PostProcessing/Shaders/StdLib.hlsl
@@ -23,11 +23,13 @@
     #include "API/Vulkan.hlsl"
 #elif defined(SHADER_API_METAL)
     #include "API/Metal.hlsl"
+#elif defined(SHADER_API_PSP2)
+    #include "API/PSP2.hlsl"
 #else
     #include "API/OpenGL.hlsl"
 #endif
 
-#if defined(SHADER_API_PSSL) || defined(SHADER_API_XBOXONE) || defined(SHADER_API_SWITCH)
+#if defined(SHADER_API_PSSL) || defined(SHADER_API_XBOXONE) || defined(SHADER_API_SWITCH) || defined(SHADER_API_PSP2)
     #define SHADER_API_CONSOLE
 #endif
 
