Skip to content

Remove unused references of the HDRP asset in decal code #2326

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
Oct 23, 2020
Merged

Remove unused references of the HDRP asset in decal code #2326

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
5bce0a4
Remove perChannelMask
FrancescoC-unity Oct 22, 2020
a1ac823
changelog
FrancescoC-unity Oct 22, 2020
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
1 change: 1 addition & 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 @@ -25,6 +25,7 @@ The version number for this package has increased due to a version update of a r
- Fixed precision issue with the atmospheric fog.
- Claryfied doc for the LayeredLit material.
- Fixing exceptions in the console when putting the SSGI in low quality mode (render graph).
- Fixed NullRef Exception when decals are in the scene, no asset is set and HDRP wizard is run.

### Changed
- Combined occlusion meshes into one to reduce draw calls and state changes with XR single-pass.
Expand Down
3 changes: 0 additions & 3 deletions com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,6 @@ public void InitializeMaterialValues()
if (m_Material == null)
return;

bool perChannelMask = HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.decalSettings.perChannelMask;

// TODO: this test is ambiguous, it should say, I am decal or not.
// We should have 2 function: I am decal or not and I am a SG or not...
m_IsHDRenderPipelineDecal = IsHDRenderPipelineDecal(m_Material);
Expand Down Expand Up @@ -694,7 +692,6 @@ public void CreateDrawData()
Vector3 cameraPos = instance.CurrentCamera.transform.position;
var camera = instance.CurrentCamera;
Matrix4x4 worldToView = HDRenderPipeline.WorldToCamera(camera);
bool perChannelMask = instance.perChannelMask;
int cullingMask = camera.cullingMask;
ulong sceneCullingMask = HDUtils.GetSceneCullingMaskFromCamera(camera);

Expand Down