Skip to content
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.

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

Merge generic2D shader into generic #1483

Merged
merged 1 commit into from
Jan 2, 2025

Conversation

VReaperV
Copy link
Contributor

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.

Copy link
Member

@illwieckz illwieckz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it works, LGTM.

@VReaperV
Copy link
Contributor Author

VReaperV commented Jan 2, 2025

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 VReaperV merged commit 7b21035 into DaemonEngine:master Jan 2, 2025
9 checks passed
@VReaperV VReaperV deleted the shader-merge-2d branch January 2, 2025 23:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants