Skip to content

Adding support for override of Dots instance ID #6614

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
Dec 16, 2021
Merged

Adding support for override of Dots instance ID #6614

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
8b61a46
** Adding override of dots instance ID for dots instancing **
kecho Dec 14, 2021
5353559
Preserving sampling of index 0 of dots instancing cbuffer: this data …
kecho 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
11 changes: 9 additions & 2 deletions com.unity.render-pipelines.core/ShaderLibrary/UnityDOTSInstancing.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,21 @@ static const uint kDOTSInstancingFlagCameraMotion = (1 << 2); // Object uses
static const uint kDOTSInstancingFlagHasPrevPosition = (1 << 3); // Object has a separate previous frame position vertex streams (e.g. for deformed objects)
static const uint kDOTSInstancingFlagMainLightEnabled = (1 << 4); // Object should receive direct lighting from the main light (e.g. light not baked into lightmap)

static DOTSVisibleData unity_SampledDOTSVisibleData;

void SetupDOTSVisibleInstancingData()
{
unity_SampledDOTSVisibleData = unity_DOTSVisibleInstances[unity_InstanceID];
}

uint GetDOTSInstanceIndex()
{
return unity_DOTSVisibleInstances[unity_InstanceID].VisibleData.x;
return unity_SampledDOTSVisibleData.VisibleData.x;
}

int GetDOTSInstanceCrossfadeSnorm8()
{
return unity_DOTSVisibleInstances[unity_InstanceID].VisibleData.y;
return unity_SampledDOTSVisibleData.VisibleData.y;
}

bool IsDOTSInstancedProperty(uint metadata)
Expand Down
6 changes: 6 additions & 0 deletions com.unity.render-pipelines.core/ShaderLibrary/UnityInstancing.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,12 @@
#define UNITY_ACCESS_INSTANCED_PROP(arr, var) var

#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityDOTSInstancing.hlsl"
#if defined(UNITY_SETUP_INSTANCE_ID)
#undef UNITY_SETUP_INSTANCE_ID
#define UNITY_SETUP_INSTANCE_ID(input) {\
DEFAULT_UNITY_SETUP_INSTANCE_ID(input);\
SetupDOTSVisibleInstancingData();}
#endif

#else
#define UNITY_INSTANCING_BUFFER_START(buf) UNITY_INSTANCING_CBUFFER_SCOPE_BEGIN(UnityInstancing_##buf) struct {
Expand Down