Fixed _FOVEATED_RENDERING_NON_UNIFORM_RASTER shader compilation errors

Fixed _FOVEATED_RENDERING_NON_UNIFORM_RASTER shader compilation errors

Author: JarkkoUnity

Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRendering.hlsl

@@ -5,14 +5,8 @@
 #error Use #include_with_pragmas "FoveatedRenderingKeywords.hlsl" before including this file
 #endif*/
 
-#if (!defined(UNITY_COMPILER_DXC) && (defined(UNITY_PLATFORM_OSX) || defined(UNITY_PLATFORM_IOS) || defined(UNITY_PLATFORM_VISIONOS))) || defined(SHADER_API_PS5)
+#if defined(SUPPORTS_FOVEATED_RENDERING_NON_UNIFORM_RASTER)
 
-    #if defined(SHADER_API_PS5) || defined(SHADER_API_METAL)
-        #define SUPPORTS_FOVEATED_RENDERING_NON_UNIFORM_RASTER 1
-    #endif
-#endif
-
-#if SUPPORTS_FOVEATED_RENDERING_NON_UNIFORM_RASTER
 #if defined(SHADER_API_PS5)
     #include "Packages/com.unity.render-pipelines.ps5/ShaderLibrary/API/FoveatedRendering_PSSL.hlsl"
 #endif
@@ -90,12 +84,12 @@ float2 FoveatedRemapPrevFrameNonUniformToLinear(float2 uv)
 }
 #undef FOVEATED_FLIP_Y
 
-int2 FoveatedRemapLinearToNonUniformCS(int2 positionCS)
+float2 FoveatedRemapLinearToNonUniformCS(float2 positionCS)
 {
-    return FoveatedRemapLinearToNonUniform((positionCS + float2(0.5, 0.5)) * _ScreenSize.zw) * _ScreenSize.xy;
+    return FoveatedRemapLinearToNonUniform(positionCS * _ScreenSize.zw) * _ScreenSize.xy;
 }
 
-int2 FoveatedRemapNonUniformToLinearCS(int2 positionCS)
+float2 FoveatedRemapNonUniformToLinearCS(float2 positionCS)
 {
     UNITY_BRANCH if(_FOVEATED_RENDERING_NON_UNIFORM_RASTER)
         positionCS = RemapFoveatedRenderingNonUniformToLinearCS(positionCS, true);
@@ -111,8 +105,8 @@ float2 FoveatedRemapDensity(float2 uv) {return uv;}
 float2 FoveatedRemapPrevFrameDensity(float2 uv) {return uv;}
 float2 FoveatedRemapNonUniformToLinear(float2 uv) {return uv;}
 float2 FoveatedRemapPrevFrameNonUniformToLinear(float2 uv) {return uv;}
-int2 FoveatedRemapLinearToNonUniformCS(int2 positionCS) {return positionCS;}
-int2 FoveatedRemapNonUniformToLinearCS(int2 positionCS) {return positionCS;}
+float2 FoveatedRemapLinearToNonUniformCS(float2 positionCS) {return positionCS;}
+float2 FoveatedRemapNonUniformToLinearCS(float2 positionCS) {return positionCS;}
 
 #endif
 

Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl

@@ -3,19 +3,15 @@
 
 #if (!defined(UNITY_COMPILER_DXC) && (defined(UNITY_PLATFORM_OSX) || defined(UNITY_PLATFORM_IOS) || defined(UNITY_PLATFORM_VISIONOS))) || defined(SHADER_API_PS5)
 
-    #if defined(SHADER_API_PS5) || defined(SHADER_API_METAL)
+    #define SUPPORTS_FOVEATED_RENDERING_NON_UNIFORM_RASTER 1
 
-        #define SUPPORTS_FOVEATED_RENDERING_NON_UNIFORM_RASTER 1
+    // On Metal Foveated Rendering is currently not supported with DXC
+    #pragma warning (disable : 3568) // unknown pragma ignored
 
-        // On Metal Foveated Rendering is currently not supported with DXC
-        #pragma warning (disable : 3568) // unknown pragma ignored
+    #pragma never_use_dxc metal
+    #pragma dynamic_branch _ _FOVEATED_RENDERING_NON_UNIFORM_RASTER
 
-        #pragma never_use_dxc metal
-        #pragma dynamic_branch _ _FOVEATED_RENDERING_NON_UNIFORM_RASTER
-
-        #pragma warning (default : 3568) // restore unknown pragma ignored
-
-    #endif
+    #pragma warning (default : 3568) // restore unknown pragma ignored
 
 #endif
 

Packages/com.unity.render-pipelines.universal/Runtime/VFXGraph/Shaders/VFXDefines.hlsl

@@ -1,3 +1,4 @@
+#include_with_pragmas "Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl"
 #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl"
 #if defined(FOG_LINEAR) || defined(FOG_EXP) || defined(FOG_EXP2)
 #define USE_FOG 1

Packages/com.unity.visualeffectgraph/Editor/Compiler/VFXCodeGenerator.cs

@@ -762,7 +762,7 @@ static private StringBuilder Build(
                 var spaceable = contextData as ISpaceable;
                 globalIncludeContent.WriteLineFormat("#define {0} 1", spaceable.space == VFXSpace.World ? "VFX_WORLD_SPACE" : "VFX_LOCAL_SPACE");
             }
-            globalIncludeContent.WriteLineFormat("#include \"{0}/VFXDefines.hlsl\"", renderRuntimePipePath);
+            globalIncludeContent.WriteLineFormat("#include_with_pragmas \"{0}/VFXDefines.hlsl\"", renderRuntimePipePath);
 
             if (needsGraphValueStruct)
                 globalIncludeContent.WriteLine("#define VFX_USE_GRAPH_VALUES 1");