Skip to content

Fixed potential asymmetrical resource release in the volumetric clouds (case 1388218). #6600

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 3 commits into from
Dec 15, 2021
Merged

Fixed potential asymmetrical resource release in the volumetric clouds (case 1388218). #6600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fb3027
Fixed potential asymmetrical resource release in the volumetric cloud…
anisunity Dec 14, 2021
c347967
Merge branch 'master' into HDRP/fix-1388218
anisunity Dec 15, 2021
ed5707d
Merge branch 'master' into HDRP/fix-1388218
anisunity Dec 15, 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
5 changes: 5 additions & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed compilation issue related to shader stripping in ray tracing.
- Fixed flipped UV for directional light cookie on PBR Sky (case 1382656).
- Fixing missing doc API for RTAS Debug display.
- Fixed AO dissapearing when DRS would be turned off through a camera, while hardware drs is active in DX12 or Vulkan (case 1383093).
- Fixed misc shader warnings.
- Fixed a shader warning in UnityInstancing.hlsl
- Fixed for APV debug mode breaking rendering when switching to an asset with APV disabled.
- Fixed potential asymmetrical resource release in the volumetric clouds (case 1388218).
- Fixed the fade in mode of the clouds not impacting the volumetric clouds shadows (case 1381652).

### Changed
Expand Down
7 changes: 5 additions & 2 deletions ....high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public partial class HDRenderPipeline
int m_CombineCloudsKernelColorCopy;
int m_CombineCloudsKernelColorRW;
int m_CombineCloudsSkyKernel;
bool m_ActiveVolumetricClouds;

// Combine pass via hardware blending, used in case of MSAA color target.
Material m_CloudCombinePass;
Expand All @@ -52,7 +53,9 @@ struct VolumetricCloudsCameraData

void InitializeVolumetricClouds()
{
if (!m_Asset.currentPlatformRenderPipelineSettings.supportVolumetricClouds)
// Keep track of the state for the release
m_ActiveVolumetricClouds = m_Asset.currentPlatformRenderPipelineSettings.supportVolumetricClouds;
if (!m_ActiveVolumetricClouds)
return;

// Allocate the buffers for ambient probe evaluation
Expand Down Expand Up @@ -89,7 +92,7 @@ void InitializeVolumetricClouds()

void ReleaseVolumetricClouds()
{
if (!m_Asset.currentPlatformRenderPipelineSettings.supportVolumetricClouds)
if (!m_ActiveVolumetricClouds)
return;

// Destroy the material
Expand Down