nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-25 16:25:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed structs from NV to KHR (#50)

Browse Source 
* Renamed structs from NV to KHR
This commit is contained in:
Jasper Bekkers 2020-10-12 17:16:59 +02:00 committed by GitHub
parent c04ac95860
commit b7aa6f310d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rustc_codegen_spirv/src/symbols.rs
View File

@ -38,12 +38,21 @@ fn make_storage_classes() -> HashMap<Symbol, StorageClass> {
("atomic_counter", AtomicCounter), ("atomic_counter", AtomicCounter),
("image", Image), ("image", Image),
("storage_buffer", StorageBuffer), ("storage_buffer", StorageBuffer),
("callable_data_nv", CallableDataNV), ("callable_data_khr", StorageClass::CallableDataKHR),
("incoming_callable_data_nv", IncomingCallableDataNV), (
("ray_payload_nv", RayPayloadNV), "incoming_callable_data_khr",
("hit_attribute_nv", HitAttributeNV), StorageClass::IncomingCallableDataKHR,
("incoming_ray_payload_nv", IncomingRayPayloadNV), ),
("shader_record_buffer_nv", ShaderRecordBufferNV), ("ray_payload_khr", StorageClass::RayPayloadKHR),
("hit_attribute_khr", StorageClass::HitAttributeKHR),
(
"incoming_ray_payload_khr",
StorageClass::IncomingRayPayloadKHR,
),
(
"shader_record_buffer_khr",
StorageClass::ShaderRecordBufferKHR,
),
("physical_storage_buffer", PhysicalStorageBuffer), ("physical_storage_buffer", PhysicalStorageBuffer),
] ]
.iter() .iter()

12
spirv-std/src/lib.rs
View File

@ -50,12 +50,12 @@ pointer_addrspace!("push_constant", PushConstant, false);
pointer_addrspace!("atomic_counter", AtomicCounter, true); pointer_addrspace!("atomic_counter", AtomicCounter, true);
pointer_addrspace!("image", Image, true); pointer_addrspace!("image", Image, true);
pointer_addrspace!("storage_buffer", StorageBuffer, true); pointer_addrspace!("storage_buffer", StorageBuffer, true);
pointer_addrspace!("callable_data_nv", CallableDataNV, true); pointer_addrspace!("callable_data_khr", CallableDataKHR, true);
pointer_addrspace!("incoming_callable_data_nv", IncomingCallableDataNV, true); pointer_addrspace!("incoming_callable_data_khr", IncomingCallableDataKHR, true);
pointer_addrspace!("ray_payload_nv", RayPayloadNV, true); pointer_addrspace!("ray_payload_khr", RayPayloadKHR, true);
pointer_addrspace!("hit_attribute_nv", HitAttributeNV, true); pointer_addrspace!("hit_attribute_khr", HitAttributeKHR, true);
pointer_addrspace!("incoming_ray_payload_nv", IncomingRayPayloadNV, true); pointer_addrspace!("incoming_ray_payload_khr", IncomingRayPayloadKHR, true);
pointer_addrspace!("shader_record_buffer_nv", ShaderRecordBufferNV, true); pointer_addrspace!("shader_record_buffer_khr", ShaderRecordBufferKHR, true);
pointer_addrspace!("physical_storage_buffer", PhysicalStorageBuffer, true); pointer_addrspace!("physical_storage_buffer", PhysicalStorageBuffer, true);
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]