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

Advertise support for extension VK_KHR_spirv_1_4. #1724

Merged
merged 2 commits into from
Sep 24, 2022

Conversation

billhollings
Copy link
Contributor

@billhollings billhollings commented Sep 23, 2022

  • Advertise support for extension VK_KHR_spirv_1_4.
  • MoltenVKShaderConverter automatically map bindings when converting GLSL.
  • MoltenVKShaderConverter improvements to diagnostic logging.
  • Update Whats_New.md document.

Support for SPIR-V 1.4 features added in recent updates to SPRIV-Cross.

- Advertise support for extension VK_KHR_spirv_1_4.
- MoltenVKShaderConverter automatically map bindings when converting GLSL.
- MoltenVKShaderConverter improvements to diagnostic logging.
- Update Whats_New.md document.
GitHub CI has deprecated and removed support for the macos-10.15 runner image.
@@ -97,16 +98,25 @@ void mvk::logSPIRV(vector<uint32_t>& spirv, string& spvLog) {
uint32_t options = (SPV_BINARY_TO_TEXT_OPTION_INDENT);
spv_text text;
spv_diagnostic diagnostic = nullptr;
spv_context context = spvContextCreate(SPV_ENV_VULKAN_1_0);
spv_context context = spvContextCreate(SPV_ENV_VULKAN_1_2);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Doesn't that allow SPIR-V 1.5? I guess it doesn't really matter much at this point, given that this function just logs the SPIR-V it was given.

Copy link
Collaborator

Choose a reason for hiding this comment

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

According to KhronosGroup/SPIRV-Cross#2004 SPIRV-Cross now also supports 1.5, so this should be perfectly fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. That particular line change was primarily about allowing spirv-tools to log v1.4 (and v1.5) SPIR-V (I guess I could have identified that in the commit note).

And also yes. Both SPIR-V 1.4 and 1.5 are effectively supported by SPIRV-Cross now. There is no specific Vulkan extension to be identified to indicate SPIR-V 1.5 support in MoltenVK, otherwise this PR would have included that.

Next stop Vulkan 1.2!

@billhollings billhollings merged commit daea6b3 into KhronosGroup:master Sep 24, 2022
@billhollings billhollings deleted the VK_KHR_spirv_1_4 branch September 24, 2022 16:53
@spnda spnda mentioned this pull request Sep 25, 2022
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.

3 participants