Skip to content

Fix for case 1366011 debug spew when switch target to non RT platform #5760

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

Merged
merged 2 commits into from
Sep 30, 2021
Merged

Fix for case 1366011 debug spew when switch target to non RT platform #5760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f127c4
Fix for case 1366011 debug spew when switch target to non RT platform
peterjohnlong Sep 22, 2021
7d28600
Fix UI RT
anisunity Sep 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.high-definition/Editor/Lighting/AmbientOcclusionEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ public override void OnInspectorGUI()
return;
}

if (HDRenderPipeline.buildPipelineSupportsRayTracing)
if (HDRenderPipeline.assetSupportsRayTracing)
PropertyField(m_RayTracing, EditorGUIUtility.TrTextContent("Ray Tracing (Preview)", "Enable ray traced ambient occlusion."));

// Shared attributes
PropertyField(m_Intensity, EditorGUIUtility.TrTextContent("Intensity", "Controls the strength of the ambient occlusion effect. Increase this value to produce darker areas."));
PropertyField(m_DirectLightingStrength, EditorGUIUtility.TrTextContent("Direct Lighting Strength", "Controls how much the ambient light affects occlusion."));

// If ray tracing is supported and it is enabled on this volume, display the ray tracing options.
if (HDRenderPipeline.buildPipelineSupportsRayTracing && m_RayTracing.overrideState.boolValue && m_RayTracing.value.boolValue)
if (HDRenderPipeline.assetSupportsRayTracing && m_RayTracing.overrideState.boolValue && m_RayTracing.value.boolValue)
{
PropertyField(m_LayerMask, EditorGUIUtility.TrTextContent("Layer Mask", "Layer mask used to include the objects for ambient occlusion."));
base.OnInspectorGUI(); // Quality Setting
Expand Down
6 changes: 3 additions & 3 deletions com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ static void DrawShadowMapContent(SerializedHDLight serialized, Editor owner)
EditorGUILayout.Slider(serialized.areaLightShadowCone, HDAdditionalLightData.k_MinAreaLightShadowCone, HDAdditionalLightData.k_MaxAreaLightShadowCone, s_Styles.areaLightShadowCone);
}

if (HDRenderPipeline.buildPipelineSupportsRayTracing && HDRenderPipeline.pipelineSupportsScreenSpaceShadows)
if (HDRenderPipeline.assetSupportsRayTracing && HDRenderPipeline.pipelineSupportsScreenSpaceShadows)
{
bool isPunctual = lightType == HDLightType.Point || (lightType == HDLightType.Spot && serialized.spotLightShape.GetEnumValue<SpotLightShape>() == SpotLightShape.Cone);
if (isPunctual || (lightType == HDLightType.Area && serialized.areaLightShape == AreaLightShape.Rectangle))
Expand Down Expand Up @@ -1199,7 +1199,7 @@ static void DrawShadowMapContent(SerializedHDLight serialized, Editor owner)
if (lightType == HDLightType.Directional && HDRenderPipeline.pipelineSupportsScreenSpaceShadows)
{
EditorGUILayout.PropertyField(serialized.useScreenSpaceShadows, s_Styles.useScreenSpaceShadows);
if (HDRenderPipeline.buildPipelineSupportsRayTracing)
if (HDRenderPipeline.assetSupportsRayTracing)
{
using (new EditorGUI.DisabledScope(!serialized.useScreenSpaceShadows.boolValue))
{
Expand Down Expand Up @@ -1333,7 +1333,7 @@ static void DrawContactShadowsContent(SerializedHDLight serialized, Editor owner
HDAdditionalLightData.ScalableSettings.UseContactShadow(hdrp),
hdrp.name
);
if (HDRenderPipeline.buildPipelineSupportsRayTracing
if (HDRenderPipeline.assetSupportsRayTracing
&& serialized.contactShadows.@override.boolValue)
{
EditorGUI.indentLevel++;
Expand Down
14 changes: 7 additions & 7 deletions ...der-pipelines.high-definition/Editor/Lighting/Reflection/HDScreenSpaceReflectionEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,12 @@ public override void OnInspectorGUI()
PropertyField(m_Enable);

// If ray tracing is supported display the tracing choice
if (HDRenderPipeline.buildPipelineSupportsRayTracing)
if (HDRenderPipeline.assetSupportsRayTracing)
PropertyField(m_Tracing, k_TracingText);

// Flag to track if the ray tracing parameters were displayed
RayCastingMode tracingMode = m_Tracing.value.GetEnumValue<RayCastingMode>();
bool rayTracingSettingsDisplayed = HDRenderPipeline.buildPipelineSupportsRayTracing
bool rayTracingSettingsDisplayed = HDRenderPipeline.assetSupportsRayTracing
&& m_Tracing.overrideState.boolValue
&& tracingMode != RayCastingMode.RayMarching;

Expand Down Expand Up @@ -282,7 +282,7 @@ public override QualitySettingsBlob SaveCustomQualitySettingsAsObject(QualitySet
public override void LoadSettingsFromObject(QualitySettingsBlob settings)
{
// RTR
if (HDRenderPipeline.buildPipelineSupportsRayTracing && m_Tracing.overrideState.boolValue &&
if (HDRenderPipeline.assetSupportsRayTracing && m_Tracing.overrideState.boolValue &&
m_Tracing.value.GetEnumValue<RayCastingMode>() != RayCastingMode.RayMarching)
{
settings.TryLoad<float>(ref m_MinSmoothness);
Expand All @@ -303,7 +303,7 @@ public override void LoadSettingsFromObject(QualitySettingsBlob settings)
public override void LoadSettingsFromQualityPreset(RenderPipelineSettings settings, int level)
{
// RTR
if (HDRenderPipeline.buildPipelineSupportsRayTracing && m_Tracing.overrideState.boolValue &&
if (HDRenderPipeline.assetSupportsRayTracing && m_Tracing.overrideState.boolValue &&
m_Tracing.value.GetEnumValue<RayCastingMode>() != RayCastingMode.RayMarching)
{
CopySetting(ref m_MinSmoothness, settings.lightingQualitySettings.RTRMinSmoothness[level]);
Expand All @@ -324,17 +324,17 @@ public override void LoadSettingsFromQualityPreset(RenderPipelineSettings settin
public override bool QualityEnabled()
{
// Quality always used for SSR
if (!HDRenderPipeline.buildTargetSupportsRayTracing || m_Tracing.value.GetEnumValue<RayCastingMode>() == RayCastingMode.RayMarching)
if (!HDRenderPipeline.assetSupportsRayTracing || m_Tracing.value.GetEnumValue<RayCastingMode>() == RayCastingMode.RayMarching)
return true;

// Handle the quality usage for RTR
HDRenderPipelineAsset currentAsset = HDRenderPipeline.currentAsset;

// Define if the asset supports Peformance or Both Mode (Quality && Performance)
// Define if the asset supports Performance or Both Mode (Quality && Performance)
bool assetSupportsPerf = currentAsset.currentPlatformRenderPipelineSettings.supportedRayTracingMode == RenderPipelineSettings.SupportedRayTracingMode.Performance;
bool assetSupportsBoth = currentAsset.currentPlatformRenderPipelineSettings.supportedRayTracingMode == RenderPipelineSettings.SupportedRayTracingMode.Both;

// Define if the volume is in Peformance or Mixed Mode
// Define if the volume is in Performance or Mixed Mode
bool volumeIsInPerfOrMixed = (m_Tracing.value.GetEnumValue<RayCastingMode>() == RayCastingMode.RayTracing && m_Mode.value.GetEnumValue<RayTracingMode>() == RayTracingMode.Performance)
|| (m_Tracing.value.GetEnumValue<RayCastingMode>() == RayCastingMode.Mixed);

Expand Down
2 changes: 1 addition & 1 deletion ...y.render-pipelines.high-definition/Editor/RenderPipeline/PathTracing/PathTracingEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public override void OnInspectorGUI()
}

// If ray tracing is supported display the content of the volume component
if (HDRenderPipeline.buildPipelineSupportsRayTracing)
if (HDRenderPipeline.assetSupportsRayTracing)
{
PropertyField(m_Enable);

Expand Down
10 changes: 5 additions & 5 deletions ...er-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,12 @@ public override void OnInspectorGUI()
EditorGUILayout.Space();

// If ray tracing is supported display the content of the volume component
if (HDRenderPipeline.buildPipelineSupportsRayTracing)
if (HDRenderPipeline.assetSupportsRayTracing)
PropertyField(m_Tracing);

// Flag to track if the ray tracing parameters were displayed
RayCastingMode tracingMode = m_Tracing.value.GetEnumValue<RayCastingMode>();
bool rayTracingSettingsDisplayed = HDRenderPipeline.buildPipelineSupportsRayTracing
bool rayTracingSettingsDisplayed = HDRenderPipeline.assetSupportsRayTracing
&& m_Tracing.overrideState.boolValue
&& tracingMode != RayCastingMode.RayMarching;

Expand Down Expand Up @@ -283,7 +283,7 @@ public override QualitySettingsBlob SaveCustomQualitySettingsAsObject(QualitySet

public override void LoadSettingsFromObject(QualitySettingsBlob settings)
{
if (HDRenderPipeline.buildPipelineSupportsRayTracing && m_Tracing.overrideState.boolValue &&
if (HDRenderPipeline.assetSupportsRayTracing && m_Tracing.overrideState.boolValue &&
m_Tracing.value.GetEnumValue<RayCastingMode>() != RayCastingMode.RayMarching)
{
// RTGI
Expand All @@ -309,7 +309,7 @@ public override void LoadSettingsFromObject(QualitySettingsBlob settings)

public override void LoadSettingsFromQualityPreset(RenderPipelineSettings settings, int level)
{
if (HDRenderPipeline.buildPipelineSupportsRayTracing && m_Tracing.overrideState.boolValue &&
if (HDRenderPipeline.assetSupportsRayTracing && m_Tracing.overrideState.boolValue &&
m_Tracing.value.GetEnumValue<RayCastingMode>() != RayCastingMode.RayMarching)
{
// RTGI
Expand All @@ -336,7 +336,7 @@ public override void LoadSettingsFromQualityPreset(RenderPipelineSettings settin
public override bool QualityEnabled()
{
// Quality always used for SSGI
if (!HDRenderPipeline.buildTargetSupportsRayTracing || m_Tracing.value.GetEnumValue<RayCastingMode>() == RayCastingMode.RayMarching)
if (!HDRenderPipeline.assetSupportsRayTracing || m_Tracing.value.GetEnumValue<RayCastingMode>() == RayCastingMode.RayMarching)
return true;

// Handle the quality usage for RTGI
Expand Down
2 changes: 1 addition & 1 deletion ...er-pipelines.high-definition/Editor/RenderPipeline/Raytracing/RecursiveRenderingEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public override void OnInspectorGUI()
}

// If ray tracing is supported display the content of the volume component
if (HDRenderPipeline.buildPipelineSupportsRayTracing)
if (HDRenderPipeline.assetSupportsRayTracing)
{
PropertyField(m_Enable);

Expand Down
2 changes: 1 addition & 1 deletion com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ internal static HDRenderPipeline currentPipeline
internal static bool pipelineSupportsRayTracing => HDRenderPipeline.currentPipeline != null && HDRenderPipeline.currentPipeline.rayTracingSupported;

#if UNITY_EDITOR
internal static bool buildPipelineSupportsRayTracing => HDRenderPipeline.currentPipeline != null && (HDRenderPipeline.currentPipeline.m_AssetSupportsRayTracing && HDRenderPipeline.buildTargetSupportsRayTracing);
internal static bool assetSupportsRayTracing => HDRenderPipeline.currentPipeline != null && (HDRenderPipeline.currentPipeline.m_AssetSupportsRayTracing);
#endif

internal static bool pipelineSupportsScreenSpaceShadows => GraphicsSettings.currentRenderPipeline is HDRenderPipelineAsset hdrpAsset ? hdrpAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.supportScreenSpaceShadows : false;
Expand Down
12 changes: 6 additions & 6 deletions ...render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,13 +709,13 @@ internal HDRaytracingLightCluster RequestLightCluster()
static internal bool PipelineSupportsRayTracing(RenderPipelineSettings rpSetting)
=> rpSetting.supportRayTracing && currentSystemSupportsRayTracing;

static internal bool currentSystemSupportsRayTracing
=> SystemInfo.supportsRayTracing;

static internal bool currentSystemSupportsRayTracing => SystemInfo.supportsRayTracing
#if UNITY_EDITOR
static internal bool buildTargetSupportsRayTracing
=> (UnityEditor.PlayerSettings.GetGraphicsAPIs(UnityEditor.EditorUserBuildSettings.activeBuildTarget)[0] == GraphicsDeviceType.Direct3D12)
|| (UnityEditor.PlayerSettings.GetGraphicsAPIs(UnityEditor.EditorUserBuildSettings.activeBuildTarget)[0] == GraphicsDeviceType.PlayStation5);
&& ((UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.StandaloneWindows64
|| UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.StandaloneWindows)
|| UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.PS5);
#else
;
#endif

internal BlueNoise GetBlueNoiseManager()
Expand Down