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

Remove project qualifiers from references to SPIRV-Cross and glslang header files. #1287

Merged
merged 3 commits into from
Mar 2, 2021

Conversation

billhollings
Copy link
Contributor

Remove SPIRV-Cross/ qualifier from include references to SPIRV-Cross header files.
Remove glslang/ qualifier from include references to glslang header files.
This change allows easier integration with app build scripts.

Fixes issue #1279.

…header files.

Remove SPIRV-Cross/ qualifier from include references to SPIRV-Cross header files.
Remove glslang/ qualifier from include references to glslang header files.
This change allows easier integration with app build scripts.
Copy link

@SpaceIm SpaceIm left a comment

Choose a reason for hiding this comment

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

@billhollings glslang qualifier shouldn't be removed.

glslang installs its public headers under <include install dir>/glslang, and defines <include install dir> as include directory:
https://github.com/KhronosGroup/glslang/blob/e04a046ce7c2ce6d37cc7a28802c167d84ffabf3/glslang/CMakeLists.txt#L174
https://github.com/KhronosGroup/glslang/blob/e04a046ce7c2ce6d37cc7a28802c167d84ffabf3/glslang/CMakeLists.txt#L215-L224

Otherwise, LGTM for spirv-cross

@billhollings billhollings removed the request for review from cdavis5e March 1, 2021 22:49
@cdavis5e
Copy link
Collaborator

cdavis5e commented Mar 1, 2021

Well, I was waiting for @SpaceIm, so 🤷‍♂️ .

@billhollings
Copy link
Contributor Author

Well, I was waiting for @SpaceIm, so 🤷‍♂️ .

Sorry...I was trying to re-request @SpaceIm and ended up taking you off by mistake in my fumbling. The re-request button wasn't taking for them. Maybe because they hadn't been originally requested? Meh.

@SpaceIm
Copy link

SpaceIm commented Mar 1, 2021

LGTM 👍

Copy link
Collaborator

@cdavis5e cdavis5e left a comment

Choose a reason for hiding this comment

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

Formal approval. :)

@billhollings billhollings merged commit 4cd8532 into KhronosGroup:master Mar 2, 2021
@billhollings billhollings deleted the spvx-integration branch March 2, 2021 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants