Pass raw pointers in FFI, generalize generator type handling #352
Conversation
generator/src/lib.rs
Outdated
| for elem in &mut spec.elements { | ||
| match elem { | ||
| vkxml::RegistryElement::Definitions(definitions) => { | ||
| for el in &mut definitions.elements { | ||
| match el { | ||
| vkxml::DefinitionsElement::Struct(_struct) => { | ||
| for mem in &mut _struct.elements { | ||
| match mem { | ||
| vkxml::StructElement::Member(field) => { | ||
| if matches!(field.array, Some(vkxml::ArrayType::Dynamic)) | ||
| && field | ||
| .size | ||
| .as_ref() | ||
| // TODO: Should rather check if no identifier is a member variable | ||
| .map_or(false, |s| s.contains('*')) | ||
| { | ||
| field.array = Some(vkxml::ArrayType::Static); | ||
| } | ||
| } | ||
| _ => {} | ||
| } | ||
| } | ||
| } | ||
| _ => {} | ||
| } | ||
| } | ||
| } | ||
| _ => {} | ||
| } | ||
| } |
There was a problem hiding this comment.
This entire bit is here because vk.xml does not contain something like type_t (*myvariable)[sz], where [ is the only way to get it detected as a static-length array. Instead, pointers to static sized arrays are represented as a single pointer with static length (len= and altlen= fields in vk.xml).
It should be moved to vkxml/vk_parse.
Uhh that is really bad. Can't really release a new version with that bug. I'll try to hammer out the generator in the next couple of days, otherwise we might have to get in the fix for the "old" generator. |
|
@MaikKlein It shouldn't be a problem here because fat pointers are only used for DSTs: slice and trait types. Blend constants are in the current release already. We can possibly go through this PR and merge it after cleaning up the override (eg. move it to an ash fork of vkxml/vk_parse?) or remove it altogether for the time being. Anyway, this issue is trivial to fix with just a single line, I'll PR it. |
|
Ah puh hehe. I just skimmed the source code and thought that would be slices instead of arrays. Okay then we are good for now. |
|
@MaikKlein Pushed a PR to clean it up (trivial fix) and to prevent such confusion in the future. My bad for writing it like that without clarifying what "certain scenarios" means, on master as well as in 358f480 the situation is clearly around static-sized arrays anyway. |
Insert returns true when the value was inserted, false when it was already present in the set.
This way we are sure only the expected prefix ("Vk" or "vk") is
stripped, anything else panics the generator.
This reverts commit 392f943.
|
Most of these patches have made it in one way or another, only type unification which is just unnecessary noise in the generator that's set for a rewrite only. Closing. |
Similar to #351 this change was already well in the works when a shift to a second generator was announced. Submitting a PR here just to not loose the concepts, even if it might end up not getting reviewed/merged.
The main goal of this PR is to unify handling of types between unsafe (FFI) types and their "safe" counterpart (builder functions), and remove some case-specific broken code introduced in previous PRs again. Vkxml arrays versus references are pretty troublesome to deal with, here's hoping that can be dealt with in the pure vk_parse implementation of the new generator :)
Finally, FFI signatures are adjusted to use
*constinstead of&which represents a "fat" pointer in certain scenarios (16-bytes).