Skip to content

Commit 7baef35

Browse files
removed undesired change in AXF
1 parent 16f7161 commit 7baef35

File tree

3 files changed

+5
-11
lines changed
  • TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None
  • com.unity.render-pipelines.high-definition

3 files changed

+5
-11
lines changed
Lines changed: 2 additions & 2 deletions
Loading

com.unity.render-pipelines.high-definition/Editor/Material/AxF/AxFGUI.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,8 @@ static public void SetupMaterialKeywordsAndPass(Material material)
132132
// Keywords for opt-out of decals and SSR:
133133
bool decalsEnabled = material.HasProperty(kEnableDecals) && material.GetFloat(kEnableDecals) > 0.0f;
134134
CoreUtils.SetKeyword(material, "_DISABLE_DECALS", decalsEnabled == false);
135-
bool ssrEnabled = false;
136-
if (material.GetSurfaceType() == SurfaceType.Transparent)
137-
ssrEnabled = material.HasProperty(kReceivesSSRTransparent) ? material.GetFloat(kReceivesSSRTransparent) != 0 : false;
138-
else
139-
ssrEnabled = material.HasProperty(kReceivesSSR) ? material.GetFloat(kReceivesSSR) != 0 : false;
140-
CoreUtils.SetKeyword(material, "_DISABLE_SSR", material.HasProperty(kReceivesSSR) && material.GetFloat(kReceivesSSR) == 0.0f);
141-
CoreUtils.SetKeyword(material, "_DISABLE_SSR_TRANSPARENT", material.HasProperty(kReceivesSSRTransparent) && material.GetFloat(kReceivesSSRTransparent) == 0.0);
135+
bool ssrEnabled = material.HasProperty(kEnableSSR) && material.GetFloat(kEnableSSR) > 0.0f;
136+
CoreUtils.SetKeyword(material, "_DISABLE_SSR", ssrEnabled == false);
142137
CoreUtils.SetKeyword(material, "_ENABLE_GEOMETRIC_SPECULAR_AA", material.HasProperty(kEnableGeometricSpecularAA) && material.GetFloat(kEnableGeometricSpecularAA) > 0.0f);
143138
CoreUtils.SetKeyword(material, "_SPECULAR_OCCLUSION_NONE", material.HasProperty(kSpecularOcclusionMode) && material.GetFloat(kSpecularOcclusionMode) == 0.0f);
144139

com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.shader

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Shader "HDRP/AxF"
141141

142142
[ToggleUI] _SupportDecals("Support Decals", Float) = 1.0
143143
[ToggleUI] _ReceivesSSR("Receives SSR", Float) = 1.0
144-
[ToggleUI] _ReceivesSSRTransparent("Receives SSR Transparent", Float) = 0.0
144+
145145
[ToggleUI] _AddPrecomputedVelocity("AddPrecomputedVelocity", Float) = 0.0
146146

147147
}
@@ -167,7 +167,6 @@ Shader "HDRP/AxF"
167167

168168
#pragma shader_feature_local _DISABLE_DECALS
169169
#pragma shader_feature_local _DISABLE_SSR
170-
#pragma shader_feature_local _DISABLE_SSR_TRANSPARENT
171170
#pragma shader_feature_local _ENABLE_GEOMETRIC_SPECULAR_AA
172171

173172
#pragma shader_feature_local _ADD_PRECOMPUTED_VELOCITY

0 commit comments

Comments
 (0)