Skip to content

[22.1] Fix HDRP build issues with DOTS_INSTANCING_ON shader variant #6531

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 1 commit into from
Dec 9, 2021
Merged

[22.1] Fix HDRP build issues with DOTS_INSTANCING_ON shader variant #6531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -50,6 +50,7 @@ The version number for this package has increased due to a version update of a r
- Fixed atmospheric scattering being incorrectly enabled when scene lighting is disabled.
- Fixed for changes of color curves not being applied immediately.
- Fixed the rendering order of decals that have a similar draw order value.
- Fixed HDRP build issues with DOTS_INSTANCING_ON shader variant.

## [13.1.2] - 2021-11-05

Expand Down
13 changes: 9 additions & 4 deletions com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/PickingSpaceTransforms.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
#undef SHADEROPTIONS_CAMERA_RELATIVE_RENDERING

// Define the correct matrices
#ifndef UNITY_DOTS_INSTANCING_ENABLED

#undef unity_ObjectToWorld
#undef unity_MatrixPreviousM
#undef unity_MatrixVP
float4x4 unity_MatrixV;
float4x4 unity_MatrixVP;
float4x4 glstate_matrix_projection;

#undef UNITY_MATRIX_M
#define UNITY_MATRIX_M unity_ObjectToWorld
Expand All @@ -29,6 +27,13 @@ float4x4 glstate_matrix_projection;
#undef UNITY_PREV_MATRIX_I_M
#define UNITY_PREV_MATRIX_I_M Inverse(unity_MatrixPreviousM)

#endif

#undef unity_MatrixVP
float4x4 unity_MatrixV;
float4x4 unity_MatrixVP;
float4x4 glstate_matrix_projection;

#undef UNITY_MATRIX_V
#define UNITY_MATRIX_V unity_MatrixV

Expand Down