Some material system fixes and cleanup #1416
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix `fogSurface` index and material SSBO offset.
VReaperV
force-pushed
the
material-misc
branch
from
633f379
to
c977287
Compare
slipher
reviewed
Nov 5, 2024
|
|
||
| // Make sure padding is taken into account for dynamicDrawSurfsOffset | ||
| if ( !dynamicDrawSurfOffsetSet ) { | ||
| dynamicDrawSurfsOffset = offset; |
There was a problem hiding this comment.
So this variable needs to point to the end of the first material? That seems weird.
There was a problem hiding this comment.
To the start of the first dynamic material, rather. Since the buffer is structured like this:
staticMaterial_0
...
staticMaterial_last
padding
dynamicMaterial_0
...
Padding after material n depends on the material n + 1, and is added at the offset += padding; line (last dynamic material never has any padding after it). dynamicDrawSurfsOffset is then used as the start of the range when mapping the buffer to update it, so it has to point to the index directly after the last static material padding.
VReaperV
force-pushed
the
material-misc
branch
from
c977287
to
e94ef0c
Compare
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes a material system crash where the first dynamic surface shader has a non-0 padding.
Fixes incorrect drawSurf index being returned by
R_AddDrawSurf().Made
u_DepthMapandu_PortalMapinto global uniforms, and cleaned up some of the material system code.