nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2025-02-18 01:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update spirv grammar JSON file (#2315)

Browse Source
This commit is contained in:
Rua 2023-09-01 21:53:22 +02:00 committed by GitHub
parent e1acf31a2e
commit fe7b2371a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4580 additions and 728 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vulkano/autogen/spirv_parse.rs
View File

@ -219,7 +219,7 @@ fn instruction_output(members: &[InstructionMember], spec_constant: bool) -> Tok
}; };
quote! { quote! {
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug, PartialEq)]
#[doc=#doc] #[doc=#doc]
pub enum #enum_name { pub enum #enum_name {
#(#struct_items)* #(#struct_items)*
@ -522,7 +522,7 @@ fn value_enum_output(enums: &[(Ident, Vec<KindEnumMember>)]) -> TokenStream {
let derives = match name_string.as_str() { let derives = match name_string.as_str() {
"ExecutionModel" => quote! { #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)] }, "ExecutionModel" => quote! { #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)] },
"Decoration" => quote! { #[derive(Clone, Debug, PartialEq, Eq)] }, "Decoration" => quote! { #[derive(Clone, Debug, PartialEq)] },
_ => quote! { #[derive(Clone, Copy, Debug, PartialEq, Eq)] }, _ => quote! { #[derive(Clone, Copy, Debug, PartialEq, Eq)] },
}; };
@ -614,6 +614,7 @@ fn to_member_name(kind: &str, name: Option<&str>) -> Ident {
"the_name_of_the_opaque_type" => format_ident!("name"), "the_name_of_the_opaque_type" => format_ident!("name"),
"d_ref" => format_ident!("dref"), "d_ref" => format_ident!("dref"),
"type" => format_ident!("ty"), // type is a keyword "type" => format_ident!("ty"), // type is a keyword
"use" => format_ident!("usage"), // use is a keyword
_ => format_ident!("{}", name.replace("operand_", "operand")), _ => format_ident!("{}", name.replace("operand_", "operand")),
} }
} else { } else {
@ -630,18 +631,9 @@ fn kinds_to_types(grammar: &SpirvGrammar) -> HashMap<&str, (TokenStream, TokenSt
"LiteralContextDependentNumber" => { "LiteralContextDependentNumber" => {
(quote! { Vec<u32> }, quote! { reader.remainder() }) (quote! { Vec<u32> }, quote! { reader.remainder() })
} }
"LiteralExtInstInteger" | "LiteralInteger" | "LiteralInt32" => { "LiteralInteger" | "LiteralExtInstInteger" => {
(quote! { u32 }, quote! { reader.next_u32()? }) (quote! { u32 }, quote! { reader.next_u32()? })
} }
"LiteralInt64" => (quote! { u64 }, quote! { reader.next_u64()? }),
"LiteralFloat32" => (
quote! { f32 },
quote! { f32::from_bits(reader.next_u32()?) },
),
"LiteralFloat64" => (
quote! { f64 },
quote! { f64::from_bits(reader.next_u64()?) },
),
"LiteralSpecConstantOpInteger" => ( "LiteralSpecConstantOpInteger" => (
quote! { SpecConstantInstruction }, quote! { SpecConstantInstruction },
quote! { SpecConstantInstruction::parse(reader)? }, quote! { SpecConstantInstruction::parse(reader)? },
@ -682,5 +674,12 @@ fn kinds_to_types(grammar: &SpirvGrammar) -> HashMap<&str, (TokenStream, TokenSt
(k.kind.as_str(), (ty, parse)) (k.kind.as_str(), (ty, parse))
}) })
.chain([(
"LiteralFloat",
(
quote! { f32 },
quote! { f32::from_bits(reader.next_u32()?) },
),
)])
.collect() .collect()
} }

1
vulkano/build.rs
View File

@ -26,5 +26,6 @@ fn main() {
// Run autogen // Run autogen
println!("cargo:rerun-if-changed=vk.xml"); println!("cargo:rerun-if-changed=vk.xml");
println!("cargo:rerun-if-changed=spirv-core.grammar.json");
autogen::autogen(); autogen::autogen();
} }

5274
vulkano/spirv.core.grammar.json
View File

File diff suppressed because it is too large Load Diff

6
vulkano/src/shader/reflect.rs
View File

@ -407,8 +407,10 @@ fn shader_execution(
ExecutionModel::MissKHR => ShaderExecution::Miss, ExecutionModel::MissKHR => ShaderExecution::Miss,
ExecutionModel::CallableKHR => ShaderExecution::Callable, ExecutionModel::CallableKHR => ShaderExecution::Callable,
ExecutionModel::TaskNV => ShaderExecution::Task, ExecutionModel::TaskEXT => ShaderExecution::Task,
ExecutionModel::MeshNV => ShaderExecution::Mesh, ExecutionModel::TaskNV => todo!(),
ExecutionModel::MeshEXT => ShaderExecution::Mesh,
ExecutionModel::MeshNV => todo!(),
ExecutionModel::Kernel => todo!(), ExecutionModel::Kernel => todo!(),
} }