Skip to content

Fix APV issue spewing asserts when baking with max subdiv level of 2 #5888

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 4 commits into from
Oct 4, 2021
Merged

Fix APV issue spewing asserts when baking with max subdiv level of 2 #5888

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5013821
Add override checkbox.
FrancescoC-unity Oct 4, 2021
e33a421
Merge branch 'HDRP/add-override-checkbox-for-pv' into HDRP/investigat…
FrancescoC-unity Oct 4, 2021
03feabd
Fix for problem when max subdiv is smaller than index voxel update size.
FrancescoC-unity Oct 4, 2021
526bfec
Revert "Merge branch 'HDRP/add-override-checkbox-for-pv' into HDRP/in…
FrancescoC-unity Oct 4, 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
14 changes: 9 additions & 5 deletions com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeBrickIndex.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ struct BrickMeta
Dictionary<Vector3Int, List<VoxelMeta>> m_VoxelToBricks;
Dictionary<RegId, BrickMeta> m_BricksToVoxels;

int m_VoxelSubdivLevel = 3;
int GetVoxelSubdivLevel()
{
int defaultVoxelSubdivLevel = 3;
return Mathf.Min(defaultVoxelSubdivLevel, ProbeReferenceVolume.instance.GetMaxSubdivision() - 1);
}

bool m_NeedUpdateIndexComputeBuffer;

Expand Down Expand Up @@ -137,11 +141,11 @@ void MapBrickToVoxels(ProbeBrickIndex.Brick brick, HashSet<Vector3Int> voxels)
{
// create a list of all voxels this brick will touch
int brick_subdiv = brick.subdivisionLevel;
int voxels_touched_cnt = (int)Mathf.Pow(3, Mathf.Max(0, brick_subdiv - m_VoxelSubdivLevel));
int voxels_touched_cnt = (int)Mathf.Pow(3, Mathf.Max(0, brick_subdiv - GetVoxelSubdivLevel()));

Vector3Int ipos = brick.position;
int brick_size = ProbeReferenceVolume.CellSize(brick.subdivisionLevel);
int voxel_size = ProbeReferenceVolume.CellSize(m_VoxelSubdivLevel);
int voxel_size = ProbeReferenceVolume.CellSize(GetVoxelSubdivLevel());

if (voxels_touched_cnt <= 1)
{
Expand All @@ -161,7 +165,7 @@ void MapBrickToVoxels(ProbeBrickIndex.Brick brick, HashSet<Vector3Int> voxels)
void ClearVoxel(Vector3Int pos, CellIndexUpdateInfo cellInfo)
{
Vector3Int vx_min, vx_max;
ClipToIndexSpace(pos, m_VoxelSubdivLevel, out vx_min, out vx_max, cellInfo);
ClipToIndexSpace(pos, GetVoxelSubdivLevel(), out vx_min, out vx_max, cellInfo);
UpdatePhysicalIndex(vx_min, vx_max, -1, cellInfo);
}

Expand Down Expand Up @@ -441,7 +445,7 @@ void UpdateIndexForVoxel(Vector3Int voxel, List<ReservedBrick> bricks, List<usho
{
// clip voxel to index space
Vector3Int vx_min, vx_max;
ClipToIndexSpace(voxel, m_VoxelSubdivLevel, out vx_min, out vx_max, cellInfo);
ClipToIndexSpace(voxel, GetVoxelSubdivLevel(), out vx_min, out vx_max, cellInfo);

foreach (var rbrick in bricks)
{
Expand Down