Skip to content

Commit c3f9e87

Browse files
svc-reach-platform-supportEvergreen
authored andcommitted
[Port] [6000.3] [UUM-133826] Initialize uv1 for Canvas shaders when not using masking
1 parent 9946d5c commit c3f9e87

3 files changed

Lines changed: 6 additions & 0 deletions

File tree

  • Packages

Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Canvas/HDCanvasPass.hlsl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ Varyings BuildVaryings(Attributes input)
9191
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
9292
float2 maskUV = (input.positionOS.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy);
9393
output.texCoord1 = float4(input.positionOS.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_UIMaskSoftnessX, _UIMaskSoftnessY) + abs(pixelSize.xy)));
94+
#else
95+
output.texCoord1 = input.uv1;
9496
#endif
9597
#endif
9698

Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/CanvasPass.hlsl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ Varyings BuildVaryings(Attributes input)
8080
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
8181
float2 maskUV = (input.positionOS.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy);
8282
output.texCoord1 = float4(input.positionOS.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_UIMaskSoftnessX, _UIMaskSoftnessY) + abs(pixelSize.xy)));
83+
#else
84+
output.texCoord1 = input.uv1;
8385
#endif
8486
#endif
8587

Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuiltInCanvasPass.hlsl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ Varyings BuildVaryings(Attributes input)
7777
float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
7878
float2 maskUV = (input.positionOS.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy);
7979
output.texCoord1 = float4(input.positionOS.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_UIMaskSoftnessX, _UIMaskSoftnessY) + abs(pixelSize.xy)));
80+
#else
81+
output.texCoord1 = input.uv1;
8082
#endif
8183
#endif
8284

0 commit comments

Comments
 (0)