Skip to content

Commit fcc6b5a

Browse files
alex-vazquez-unity3dEvergreen
authored andcommitted
[RPW] Fix reset of GraphicsSettings asset.
Rendering was broken and exceptions were shown when Reset was being triggered for GraphicsSettings.asset.
1 parent 6a64c72 commit fcc6b5a

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ public UniversalRenderPipeline(UniversalRenderPipelineAsset asset)
280280
#pragma warning restore 618
281281
});
282282
}
283+
284+
GPUResidentDrawer.ReinitializeIfNeeded();
283285
}
284286

285287
/// <inheritdoc/>
@@ -364,8 +366,6 @@ protected override void Render(ScriptableRenderContext renderContext, Camera[] c
364366
// For XR, HDR and no camera cases, UI Overlay ownership must be enforced
365367
AdjustUIOverlayOwnership(cameraCount);
366368

367-
GPUResidentDrawer.ReinitializeIfNeeded();
368-
369369
// TODO: Would be better to add Profiling name hooks into RenderPipelineManager.
370370
// C#8 feature, only in >= 2020.2
371371
using var profScope = new ProfilingScope(ProfilingSampler.Get(URPProfileId.UniversalRenderTotal));
@@ -1352,8 +1352,12 @@ static void InitializeStackedCameraData(Camera baseCamera, UniversalAdditionalCa
13521352
bool disableRenderScale = ((Mathf.Abs(1.0f - settings.renderScale) < kRenderScaleThreshold) || isScenePreviewOrReflectionCamera);
13531353
cameraData.renderScale = disableRenderScale ? 1.0f : settings.renderScale;
13541354

1355+
bool enableRenderGraph =
1356+
GraphicsSettings.TryGetRenderPipelineSettings<RenderGraphSettings>(out var renderGraphSettings) &&
1357+
!renderGraphSettings.enableRenderCompatibilityMode;
1358+
13551359
// Convert the upscaling filter selection from the pipeline asset into an image upscaling filter
1356-
cameraData.upscalingFilter = ResolveUpscalingFilterSelection(new Vector2(cameraData.pixelWidth, cameraData.pixelHeight), cameraData.renderScale, settings.upscalingFilter, !GraphicsSettings.GetRenderPipelineSettings<RenderGraphSettings>().enableRenderCompatibilityMode);
1360+
cameraData.upscalingFilter = ResolveUpscalingFilterSelection(new Vector2(cameraData.pixelWidth, cameraData.pixelHeight), cameraData.renderScale, settings.upscalingFilter, enableRenderGraph);
13571361

13581362
if (cameraData.renderScale > 1.0f)
13591363
{

0 commit comments

Comments
 (0)