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

Update SPIR-V to 1.4.1 #115

Merged
merged 6 commits into from
Oct 25, 2019
Merged

Conversation

Jasper-Bekkers
Copy link
Collaborator

Some legwork for #108 somebody will still need to fix the submodule to point to KhronosGroup/SPIRV-Headers@c4f8f65

@@ -132,7 +132,7 @@
{ "kind" : "IdResult" },
{ "kind" : "IdRef", "name" : "'Set'" },
{ "kind" : "LiteralExtInstInteger", "name" : "'Instruction'" },
{ "kind" : "IdRef", "quantifier" : "*", "name" : "Operands" }
{ "kind" : "IdRef", "quantifier" : "*", "name" : "'Operand 1', +\n'Operand 2', +\n..." }
Copy link
Member

Choose a reason for hiding this comment

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

is this really the name of an operand? We have some code that tries to make decisions based on that field.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

That's what's in upstream, so I suggest we patch up that code to make it easier to merge in the future.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

If it's a massive complication I can ping Khronos internally and see if we can change it back.

Copy link
Member

Choose a reason for hiding this comment

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

I think we can get around by checking the Op itself instead of the argument name

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes. That field is used to generate the spec. So I'm not sure we can convince upstream to change it.

@Jasper-Bekkers
Copy link
Collaborator Author

Jasper-Bekkers commented Oct 21, 2019 via email

@Jasper-Bekkers
Copy link
Collaborator Author

I think I finished up the rest of the upgrade; I'm not sure if anything else needs to be done but I'd be willing to put in some more time if needed.

@Jasper-Bekkers
Copy link
Collaborator Author

It might make sense to add @antiagainst as a reviewer as well in this case.

@Jasper-Bekkers Jasper-Bekkers changed the title Update json to 1.4.1 Update SPIR-V to 1.4.1 Oct 23, 2019
@kvark kvark requested review from antiagainst and removed request for kvark October 25, 2019 15:51
Copy link
Collaborator

@antiagainst antiagainst left a comment

Choose a reason for hiding this comment

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

Awesome, thanks!

@antiagainst antiagainst merged commit 07be249 into gfx-rs:master Oct 25, 2019
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