Remove UNITY_3D_TEXTURES_SUPPORTED define and use tex2D instead.

PaulDunning · PaulDunning · commit 1e4d5e87227d · 2018-04-13T15:40:29.000+01:00
For Vita define the TEXTURE3D related macros to use 2D instead, avoids compiler errors and cleaner code with fewer #if's
diff --git a/PostProcessing/Shaders/API/D3D11.hlsl b/PostProcessing/Shaders/API/D3D11.hlsl
@@ -1,7 +1,6 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
-#define UNITY_3D_TEXTURES_SUPPORTED 1
 #define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) Texture2D textureName; SamplerState samplerName
diff --git a/PostProcessing/Shaders/API/D3D12.hlsl b/PostProcessing/Shaders/API/D3D12.hlsl
@@ -1,7 +1,6 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
-#define UNITY_3D_TEXTURES_SUPPORTED 1
 #define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) Texture2D textureName; SamplerState samplerName
diff --git a/PostProcessing/Shaders/API/D3D9.hlsl b/PostProcessing/Shaders/API/D3D9.hlsl
@@ -2,7 +2,6 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 0
 #define UNITY_GATHER_SUPPORTED 0
-#define UNITY_3D_TEXTURES_SUPPORTED 1
 #define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) sampler2D textureName
diff --git a/PostProcessing/Shaders/API/Metal.hlsl b/PostProcessing/Shaders/API/Metal.hlsl
@@ -1,7 +1,6 @@
 #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_3D_TEXTURES_SUPPORTED 1
 #define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) Texture2D textureName; SamplerState samplerName
diff --git a/PostProcessing/Shaders/API/OpenGL.hlsl b/PostProcessing/Shaders/API/OpenGL.hlsl
@@ -2,7 +2,6 @@
 #define UNITY_UV_STARTS_AT_TOP 0
 #define UNITY_REVERSED_Z 0
 #define UNITY_GATHER_SUPPORTED 0
-#define UNITY_3D_TEXTURES_SUPPORTED 1
 #define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) sampler2D textureName
diff --git a/PostProcessing/Shaders/API/PSP2.hlsl b/PostProcessing/Shaders/API/PSP2.hlsl
@@ -2,35 +2,33 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 0
 #define UNITY_GATHER_SUPPORTED 0
-#define UNITY_3D_TEXTURES_SUPPORTED 0
 #define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 0
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) sampler2D textureName
-#define TEXTURE3D_SAMPLER3D(textureName, samplerName) sampler3D textureName
 
 #define TEXTURE2D(textureName) sampler2D textureName
 #define SAMPLER2D(samplerName)
 
-#define TEXTURE3D(textureName) sampler3D textureName
-#define SAMPLER3D(samplerName)
-
 #define TEXTURE2D_ARGS(textureName, samplerName) sampler2D textureName
 #define TEXTURE2D_PARAM(textureName, samplerName) textureName
 
-#define TEXTURE3D_ARGS(textureName, samplerName) sampler3D textureName
-#define TEXTURE3D_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 SAMPLE_TEXTURE3D(textureName, samplerName, coord3) tex3D(textureName, coord3)
-
 #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
diff --git a/PostProcessing/Shaders/API/PSSL.hlsl b/PostProcessing/Shaders/API/PSSL.hlsl
@@ -1,7 +1,6 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
-#define UNITY_3D_TEXTURES_SUPPORTED 1
 #define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 #define INTRINSIC_MINMAX3
 #define Min3 min3
diff --git a/PostProcessing/Shaders/API/Vulkan.hlsl b/PostProcessing/Shaders/API/Vulkan.hlsl
@@ -1,7 +1,6 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
-#define UNITY_3D_TEXTURES_SUPPORTED 1
 #define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) Texture2D textureName; SamplerState samplerName
diff --git a/PostProcessing/Shaders/API/XboxOne.hlsl b/PostProcessing/Shaders/API/XboxOne.hlsl
@@ -1,7 +1,6 @@
 #define UNITY_UV_STARTS_AT_TOP 1
 #define UNITY_REVERSED_Z 1
 #define UNITY_GATHER_SUPPORTED (SHADER_TARGET >= 50)
-#define UNITY_3D_TEXTURES_SUPPORTED 1
 #define UNITY_CAN_READ_POSITION_IN_FRAGMENT_PROGRAM 1
 
 #define TEXTURE2D_SAMPLER2D(textureName, samplerName) Texture2D textureName; SamplerState samplerName
