Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[11.x.x] Fixed terrain and speed tree shaders missing XR macros #2663

Merged
merged 5 commits into from
Dec 16, 2020
Merged

[11.x.x] Fixed terrain and speed tree shaders missing XR macros #2663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f155155
Fixed terrain and speed tree shaders missing XR macros.
thomas-zeng Nov 18, 2020
37ebfdc
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
thomas-zeng Nov 19, 2020
6254bdd
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
thomas-zeng Nov 30, 2020
028d426
Fixed speedtreev8 shader issue.
thomas-zeng Nov 30, 2020
c901a34
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
thomas-zeng Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ half4 SpeedTree7Frag(SpeedTreeVertexOutput input) : SV_Target
#endif
{
UNITY_SETUP_INSTANCE_ID(input);
UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);

#if !defined(SHADER_QUALITY_LOW)
#ifdef LOD_FADE_CROSSFADE // enable dithering LOD transition if user select CrossFade transition in LOD group
Expand Down Expand Up @@ -193,6 +194,7 @@ half4 SpeedTree7Frag(SpeedTreeVertexOutput input) : SV_Target
half4 SpeedTree7FragDepth(SpeedTreeVertexDepthOutput input) : SV_Target
{
UNITY_SETUP_INSTANCE_ID(input);
UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);

#if !defined(SHADER_QUALITY_LOW)
#ifdef LOD_FADE_CROSSFADE // enable dithering LOD transition if user select CrossFade transition in LOD group
Expand All @@ -219,6 +221,7 @@ half4 SpeedTree7FragDepth(SpeedTreeVertexDepthOutput input) : SV_Target
half4 SpeedTree7FragDepthNormal(SpeedTreeVertexDepthNormalOutput input) : SV_Target
{
UNITY_SETUP_INSTANCE_ID(input);
UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);

#if !defined(SHADER_QUALITY_LOW)
#ifdef LOD_FADE_CROSSFADE // enable dithering LOD transition if user select CrossFade transition in LOD group
Expand Down
3 changes: 3 additions & 0 deletions com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ half4 SpeedTree8Frag(SpeedTreeFragmentInput input) : SV_Target
#endif
{
UNITY_SETUP_INSTANCE_ID(input.interpolated);
UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input.interpolated);

#if !defined(SHADER_QUALITY_LOW)
#ifdef LOD_FADE_CROSSFADE // enable dithering LOD transition if user select CrossFade transition in LOD group
Expand Down Expand Up @@ -446,6 +447,7 @@ half4 SpeedTree8Frag(SpeedTreeFragmentInput input) : SV_Target
half4 SpeedTree8FragDepth(SpeedTreeVertexDepthOutput input) : SV_Target
{
UNITY_SETUP_INSTANCE_ID(input);
UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);

#if !defined(SHADER_QUALITY_LOW)
#ifdef LOD_FADE_CROSSFADE // enable dithering LOD transition if user select CrossFade transition in LOD group
Expand Down Expand Up @@ -505,6 +507,7 @@ SpeedTreeVertexDepthNormalOutput SpeedTree8VertDepthNormal(SpeedTreeVertexInput
half4 SpeedTree8FragDepthNormal(SpeedTreeDepthNormalFragmentInput input) : SV_Target
{
UNITY_SETUP_INSTANCE_ID(input.interpolated);
UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input.interpolated);

#if !defined(SHADER_QUALITY_LOW)
#ifdef LOD_FADE_CROSSFADE // enable dithering LOD transition if user select CrossFade transition in LOD group
Expand Down
1 change: 1 addition & 0 deletions com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLitPasses.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ FragmentOutput SplatmapFragment(Varyings IN)
half4 SplatmapFragment(Varyings IN) : SV_TARGET
#endif
{
UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(IN);
#ifdef _ALPHATEST_ON
ClipHoles(IN.uvMainAndLM.xy);
#endif
Expand Down