D3D12: Fix out of bounds root parameter index when per-pixel lighting is disabled #13275
+7
−8
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ROOT_PARAMETER
statically allocates root parameter indexes, butDXContext::CreateGXRootSignature
tries to skip ones that aren't relevant (those for bounding box and per-pixel lighting). b6d321b added an additional index for data related to graphics mods, which is always present (even if there are no graphics mods).However, the logic for choosing what index to use didn't correctly handle per-pixel lighting being disabled, only bounding box being disabled. I've fixed that by moving the graphics mod one to the start of the list, so it doesn't have a dynamic offset. (I think it'd be better to make it optional too, but I'm not confident in my D3D12 abilities to do that right.)
Before:
No per-pixel lighting, no BB:
No per-pixel lighting, yes BB:
With per-pixel lighting enabled, this stopped happening. Now, things work properly in both cases.