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

Fix issue with slang-embed & include ordering #5680

Merged
merged 2 commits into from
Nov 26, 2024

Conversation

saipraveenb25
Copy link
Collaborator

@saipraveenb25 saipraveenb25 commented Nov 26, 2024

Related: shader-slang/slang-torch#23

Our slang-torch repository keeps breaking due to relative paths being occasionally re-written (e.g.
#include "slang.h" vs. #include "../../include/slang.h"), exacerbated by the fact that we don't have slang-torch on CI yet.

This PR adds an include directory to the slang-embed tool to avoid this issue in the future.

@saipraveenb25 saipraveenb25 requested a review from a team as a code owner November 26, 2024 01:31
@saipraveenb25 saipraveenb25 added the pr: non-breaking PRs without breaking changes label Nov 26, 2024
@saipraveenb25 saipraveenb25 enabled auto-merge (squash) November 26, 2024 02:21
@@ -91,7 +98,7 @@ struct App

if (!inputPath || (argc != 0))
{
fprintf(stderr, "usage: %s inputPath [outputPath]\n", appName);
fprintf(stderr, "usage: %s inputPath includeDir [outputPath]\n", appName);
Copy link
Collaborator

Choose a reason for hiding this comment

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

If includeDir is required, maybe add "|| !includeDir" to the condition above, otherwise if includeDir is optional, it should be shown in brackets here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Uh-oh, I think auto-merge merged it in before I could react to the comment..

Let me open another PR for the fix

@saipraveenb25 saipraveenb25 merged commit e6cf93e into shader-slang:master Nov 26, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: non-breaking PRs without breaking changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants