Skip to content

Merge generic2D shader into generic - #1483

Merged
VReaperV merged 1 commit into
DaemonEngine:masterfrom
VReaperV:shader-merge-2d
Jan 2, 2025
Merged

Merge generic2D shader into generic#1483
VReaperV merged 1 commit into
DaemonEngine:masterfrom
VReaperV:shader-merge-2d

Conversation

@VReaperV

Copy link
Copy Markdown
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.

@illwieckz illwieckz left a comment

Copy link
Copy Markdown
Member

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

VReaperV commented Jan 2, 2025

Copy link
Copy Markdown
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
VReaperV merged commit 7b21035 into DaemonEngine:master Jan 2, 2025
@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