[HDRP] Fix infitnite material import loop materials #6185

alelievr · 2021-11-02T15:17:58Z

Purpose of this PR

Fix the infinite loop in HDRP material importer when the shader is a ShaderGraph but don't generate any HDMetaData.

Testing status

Manually tested inside the fullscreen feature PR: #6110

…ata asset

github-actions · 2021-11-02T15:18:14Z

Hi! This comment will help you figure out which jobs to run before merging your PR. The suggestions are dynamic based on what files you have changed.
Link to Yamato: https://unity-ci.cds.internal.unity3d.com/project/902/
Search for your PR branch using the search bar at the top, then add the following segment(s) to the end of the URL (you may need multiple tabs depending on how many packages you change)

HDRP
/jobDefinition/.yamato%2Fall-hdrp.yml%23PR_HDRP_trunk
With changes to HDRP packages, you should also run
/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_trunk

Depending on the scope of your PR, you may need to run more jobs than what has been suggested. Please speak to your lead or a Graphics SDET (#devs-graphics-automation) if you are unsure.

sebastienlagarde · 2021-11-02T15:52:26Z

com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs

+                        s_ImportedMaterialCounter.TryGetValue(asset, out var importCounter);
+                        s_ImportedMaterialCounter[asset] = ++importCounter;
+
+                        // CheckHDShaderGraphVersionsForUpgrade always return true if a ShaderGraph don't have an HDMetaData attached


question, can't we check that the shadergraph currently have or not the HDMetaData data instead of relying on importCounter info?

It's complicated because an HD ShaderGraph could not have an HDMetaData if it's old, in this case, the ShaderGraph needs to be reimported along with the material. It's only after this reimport that we can know if the material has or not an HDMetaData (i.e. the second time the material is imported).

* Fix infinite import loop with ShaderGraphs that don't have an HDMetaData asset * Updated changelog

* Increasing HDRP fined pruned light tile count to 63. #5771 * Fix Upscaled Film Grain & Dither in HDRP (#6111) When using particular types of upscaling, (CAS, FSR, Catmull) the film grain quality produced by HDRP was lower than expected. This was caused by errors in the UV scale calculations for the grain texture. This change fixes the issue by modifying the scale calculations to use the final viewport size rather than the size of the current scaled/unscaled viewport. This works because film grain is always handled by "FinalPass" which always renders at final viewport size anyways. This change also fixes a few cases where the current resolution group would have been incorrect when CAS or FSR were being used as the upscaling method. * Update CHANGELOG.md * Fix regression that was introduced in a previous PR on the diffuse denoiser #6119 * Fix Light Loop Variant Warnings (1372256) #6135 * Bump the HDRP Template IET Framework Package Version #6134 * Update ray tracing and path tracing docs regarding custom interpolator limitations (#6126) * [HDRP] Disable DoF for orthographic cameras #6124 * update occlusion radius for directional light sample (#6154) Co-authored-by: Sean Puller <sean.puller@unity3d.com> * Clean up Public API Documentation #6151 * Fix Sky override not taken into account #6127 * [Fogbugz # 1372245] Hdrp/drs fixing pyramid blur #6136 * Improved Area Light Support for Hair (#6157) * Initial commit MRP implementation * Barn door application * Add dominant marschner lobe direction skeleton * Finalize rect light MRP for marschner, handle forward + backward hemisphere scattering. * Force pathtracer to far-field in case users use geometry with bad normals. * com.unity.render-pipelines.high-definition/Runtime/Material/Hair/MultipleScattering/HairMultipleScattering.hlsl * Fix SH ringing for multiple scattering * Add trivial support for cookies * Add Kajiya support for area light approximation (non-LTC) * remove Line area light MRP for now * Remove area rect reference * Update area light hair test scene and reference images * Select cookie mip based on solid angle, rename some functions, temporarily add back rect ref * Remove the useless div-by-1 and add a comment to explain the removal of the divide by PI * Add a comment to further explain the normalization we do on the longitudinal distribution * Remove the ref once again * Update test images for metal and vulkan * Add a zero-div guard to silence compiler warning * Update CHANGELOG.md * [HDRP][Path Tracing] Exposed 3 methods related to path tracing and accumulation. #6197 * [HDRP] Fix infitnite material import loop materials #6185 * fixed typo: users -> uses (#6162) * Don't blur if nothing to blur (saves memory due to RG) (#6183) * Fix local fog volumes z axis calculation #6068 * fixed passive voice (#6092) * Fixed grammar errors * fixed passive voice in decal doc * Update Decal.md * Update Decal.md * Update Decal.md * AxF Raytracing: fix performance mode distillation that was broken and removed in #9d6db83478c213bc066e5f728d94b7faa6662543 (#6104) * Add scale parameter in eye shader #6132 * updated Override Fog page (#6200) * updated fog override screenshot * changed Depth Extent to Volumetric Fog Distance * Fix missing pragma (#6204) * [HDRP] Fix custom pass motion vector texture access #6205 * Fix typo in MipBias tooltip in HDRenderPipelineUI.Skin (#6210) * Replace gizmos FindObjectsOfType with list registrations to avoid constant slowdown in large scenes. Merged editor guards blocks. (#6168) * [HDRP] Fix APV tooltip for Geometry Distance Offset (#6150) * Update tooltip * Update ProbeVolumeUI.Skin.cs * Fixed the point distribution for the diffuse denoiser sometimes not being properly intialized. #6194 * Fixed the bad blending between the sun and the clouds (case 1373282). #6193 * Fix shadow mask fade and optimize it at same time (#6083) * [HDRP][Path Tracing] Minor fix for SSS when combined with fog (#6215) * Minor fix for SSS + fog. * Comments. * Update 1401_HairGraph_Area_Light.png * update screenshots Co-authored-by: Kleber Garcia <kleber.garcia@unity3d.com> Co-authored-by: gmitrano-unity <89797527+gmitrano-unity@users.noreply.github.com> Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com> Co-authored-by: John Parsaie <johnpa@unity3d.com> Co-authored-by: Pavlos Mavridis <pavlos.mavridis@unity3d.com> Co-authored-by: Sean Puller <43151199+SeanPuller@users.noreply.github.com> Co-authored-by: Sean Puller <sean.puller@unity3d.com> Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com> Co-authored-by: Emmanuel Turquin <emmanuel@turquin.org> Co-authored-by: Antoine Lelievre <antoinel@unity3d.com> Co-authored-by: emilybrown1 <88374601+emilybrown1@users.noreply.github.com> Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: RemyUnity <32760367+RemyUnity@users.noreply.github.com> Co-authored-by: slunity <37302815+slunity@users.noreply.github.com> Co-authored-by: James-Burr-Unity <61244495+James-Burr-Unity@users.noreply.github.com> Co-authored-by: Torbjorn Laedre <271210+tlaedre@users.noreply.github.com>

alelievr added 2 commits November 2, 2021 14:47

Fix infinite import loop with ShaderGraphs that don't have an HDMetaD…

7218255

…ata asset

Updated changelog

f656526

alelievr requested review from sebastienlagarde and a team November 2, 2021 15:17

alelievr self-assigned this Nov 2, 2021

github-actions bot added the HDRP label Nov 2, 2021

alelievr marked this pull request as ready for review November 2, 2021 15:20

sebastienlagarde added the needs-backport-2021.2 label Nov 2, 2021

sebastienlagarde reviewed Nov 2, 2021

View reviewed changes

remi-chapelain approved these changes Nov 2, 2021

View reviewed changes

sebastienlagarde merged commit 8c9f6a8 into master Nov 4, 2021

sebastienlagarde deleted the hd/fix/import-loop-materials branch November 4, 2021 09:25

alelievr added a commit that referenced this pull request Nov 4, 2021

[HDRP] Fix infitnite material import loop materials (#6185)

6e33bf0

* Fix infinite import loop with ShaderGraphs that don't have an HDMetaData asset * Updated changelog

sebastienlagarde added backported-2021.2 and removed needs-backport-2021.2 labels Nov 7, 2021

sebastienlagarde pushed a commit that referenced this pull request Nov 7, 2021

[HDRP] Fix infitnite material import loop materials #6185

6399d24

sebastienlagarde mentioned this pull request Nov 7, 2021

[HDRP][Backport 21.2] Backport various PRs #6231

Merged

RSlysz mentioned this pull request Apr 22, 2022

[HOLD][case 1347209] Only process materials of the same SRP that the MaterialPostProcessor #5071

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[HDRP] Fix infitnite material import loop materials #6185

[HDRP] Fix infitnite material import loop materials #6185

Uh oh!

alelievr commented Nov 2, 2021

Uh oh!

github-actions bot commented Nov 2, 2021

Uh oh!

sebastienlagarde Nov 2, 2021

Uh oh!

alelievr Nov 2, 2021

Uh oh!

Uh oh!

[HDRP] Fix infitnite material import loop materials #6185

[HDRP] Fix infitnite material import loop materials #6185

Uh oh!

Conversation

alelievr commented Nov 2, 2021

Purpose of this PR

Testing status

Uh oh!

github-actions bot commented Nov 2, 2021

Uh oh!

sebastienlagarde Nov 2, 2021

Choose a reason for hiding this comment

Uh oh!

alelievr Nov 2, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!