Merge generic2D shader into generic#1483
Merged
VReaperV merged 1 commit intoDaemonEngine:masterfrom Jan 2, 2025
Merged
Conversation
VReaperV
force-pushed
the
shader-merge-2d
branch
from
1860424 to
70c0ba4
Compare
Contributor
Author
|
Alright, I just need to rebase without #1479's commits... I thought I did some changes to the generic shader there, but apparently not. |
The only difference is in a compile macro that's used to skip UI for subgroup profiling.
VReaperV
force-pushed
the
shader-merge-2d
branch
from
70c0ba4 to
180cfb3
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Based on #1479.
The only difference is in a compile macro that's used to skip UI for subgroup profiling, which doesn't require a whole new shader.