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.

Sign up for GitHub

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

Jump to bottom

avoid creating unnecessary owned strings & fix limits #281

Merged
merged 3 commits into from
Jul 23, 2023
Merged

avoid creating unnecessary owned strings & fix limits #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
635dad3
update limits
rajveermalviya Jul 19, 2023
642e333
use smallvec
rajveermalviya Jul 20, 2023
95ca981
avoid creating owned `String`s unnecessarily
rajveermalviya Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ paste = "1.0"
log = "0.4"
thiserror = "1"
parking_lot = "0.12"
smallvec = "1"

[build-dependencies]
bindgen = "0.66"
Expand Down
88 changes: 48 additions & 40 deletions src/conv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
use wgc::Label;

use crate::native;
use crate::utils::{make_slice, OwnedLabel};
use crate::utils::{make_slice, ptr_into_label, ptr_into_pathbuf};
use crate::{follow_chain, map_enum};
use std::path::Path;
use std::{borrow::Cow, ffi::CStr};

map_enum!(
Expand Down Expand Up @@ -253,12 +252,8 @@ pub fn map_instance_descriptor(
let dx12_shader_compiler = match extras.dx12ShaderCompiler {
native::WGPUDx12Compiler_Fxc => wgt::Dx12Compiler::Fxc,
native::WGPUDx12Compiler_Dxc => wgt::Dx12Compiler::Dxc {
dxil_path: unsafe { extras.dxilPath.as_ref() }
.and_then(|v| unsafe { OwnedLabel::new(v) }.into_inner())
.map(|v| Path::new(&v).to_path_buf()),
dxc_path: unsafe { extras.dxcPath.as_ref() }
.and_then(|v| unsafe { OwnedLabel::new(v) }.into_inner())
.map(|v| Path::new(&v).to_path_buf()),
dxil_path: ptr_into_pathbuf(extras.dxilPath),
dxc_path: ptr_into_pathbuf(extras.dxcPath),
},
_ => wgt::Dx12Compiler::default(),
};
Expand All @@ -276,7 +271,7 @@ pub fn map_instance_descriptor(
pub fn map_device_descriptor<'a>(
des: &native::WGPUDeviceDescriptor,
extras: Option<&native::WGPUDeviceExtras>,
) -> (wgt::DeviceDescriptor<Label<'a>>, Option<String>) {
) -> (wgt::DeviceDescriptor<Label<'a>>, *const std::ffi::c_char) {
let limits = unsafe { des.requiredLimits.as_ref() }.map_or(
wgt::Limits::default(),
|required_limits| unsafe {
Expand All @@ -289,13 +284,14 @@ pub fn map_device_descriptor<'a>(

(
wgt::DeviceDescriptor {
label: unsafe { OwnedLabel::new(des.label) }.into_cow(),
features: map_features(unsafe {
make_slice(des.requiredFeatures, des.requiredFeaturesCount)
}),
label: ptr_into_label(des.label),
features: map_features(make_slice(des.requiredFeatures, des.requiredFeaturesCount)),
limits,
},
extras.and_then(|extras| unsafe { OwnedLabel::new(extras.tracePath) }.into_inner()),
match extras {
Some(extras) => extras.tracePath,
None => std::ptr::null(),
},
)
}

Expand All @@ -304,7 +300,7 @@ pub unsafe fn map_pipeline_layout_descriptor<'a>(
des: &native::WGPUPipelineLayoutDescriptor,
extras: Option<&native::WGPUPipelineLayoutExtras>,
) -> wgc::binding_model::PipelineLayoutDescriptor<'a> {
let bind_group_layouts = unsafe { make_slice(des.bindGroupLayouts, des.bindGroupLayoutCount) }
let bind_group_layouts = make_slice(des.bindGroupLayouts, des.bindGroupLayoutCount)
.iter()
.map(|layout| {
layout
Expand All @@ -315,12 +311,10 @@ pub unsafe fn map_pipeline_layout_descriptor<'a>(
.collect::<Vec<_>>();

let push_constant_ranges = extras.map_or(Vec::new(), |extras| {
unsafe {
make_slice(
extras.pushConstantRanges,
extras.pushConstantRangeCount as usize,
)
}
make_slice(
extras.pushConstantRanges,
extras.pushConstantRangeCount as usize,
)
.iter()
.map(|range| wgt::PushConstantRange {
stages: wgt::ShaderStages::from_bits(range.stages)
Expand All @@ -331,7 +325,7 @@ pub unsafe fn map_pipeline_layout_descriptor<'a>(
});

return wgc::binding_model::PipelineLayoutDescriptor {
label: OwnedLabel::new(des.label).into_cow(),
label: ptr_into_label(des.label),
bind_group_layouts: Cow::from(bind_group_layouts),
push_constant_ranges: Cow::from(push_constant_ranges),
};
Expand All @@ -342,12 +336,13 @@ pub fn write_limits_struct(
wgt_limits: wgt::Limits,
supported_limits: &mut native::WGPUSupportedLimits,
) {
let mut limits = supported_limits.limits; // This makes a copy - we copy back at the end
let mut limits = supported_limits.limits;
limits.maxTextureDimension1D = wgt_limits.max_texture_dimension_1d;
limits.maxTextureDimension2D = wgt_limits.max_texture_dimension_2d;
limits.maxTextureDimension3D = wgt_limits.max_texture_dimension_3d;
limits.maxTextureArrayLayers = wgt_limits.max_texture_array_layers;
limits.maxBindGroups = wgt_limits.max_bind_groups;
limits.maxBindingsPerBindGroup = wgt_limits.max_bindings_per_bind_group;
limits.maxDynamicUniformBuffersPerPipelineLayout =
wgt_limits.max_dynamic_uniform_buffers_per_pipeline_layout;
limits.maxDynamicStorageBuffersPerPipelineLayout =
Expand All @@ -357,15 +352,21 @@ pub fn write_limits_struct(
limits.maxStorageBuffersPerShaderStage = wgt_limits.max_storage_buffers_per_shader_stage;
limits.maxStorageTexturesPerShaderStage = wgt_limits.max_storage_textures_per_shader_stage;
limits.maxUniformBuffersPerShaderStage = wgt_limits.max_uniform_buffers_per_shader_stage;
limits.maxUniformBufferBindingSize = wgt_limits.max_uniform_buffer_binding_size as u64;
limits.maxStorageBufferBindingSize = wgt_limits.max_storage_buffer_binding_size as u64;
limits.maxUniformBufferBindingSize = wgt_limits.max_uniform_buffer_binding_size as _;
limits.maxStorageBufferBindingSize = wgt_limits.max_storage_buffer_binding_size as _;
limits.minUniformBufferOffsetAlignment = wgt_limits.min_uniform_buffer_offset_alignment;
limits.minStorageBufferOffsetAlignment = wgt_limits.min_storage_buffer_offset_alignment;
limits.maxVertexBuffers = wgt_limits.max_vertex_buffers;
limits.maxBufferSize = wgt_limits.max_buffer_size;
limits.maxVertexAttributes = wgt_limits.max_vertex_attributes;
limits.maxVertexBufferArrayStride = wgt_limits.max_vertex_buffer_array_stride;
limits.maxInterStageShaderComponents = wgt_limits.max_inter_stage_shader_components;
// TODO: not yet in wgt
// limits.maxInterStageShaderVariables = wgt_limits.max_inter_stage_shader_variables;
// TODO: not yet in wgt
// limits.maxColorAttachments = wgt_limits.max_color_attachments;
// TODO: not yet in wgt
// limits.maxColorAttachmentBytesPerSample = wgt_limits.max_color_attachment_bytes_per_sample;
limits.maxComputeWorkgroupStorageSize = wgt_limits.max_compute_workgroup_storage_size;
limits.maxComputeInvocationsPerWorkgroup = wgt_limits.max_compute_invocations_per_workgroup;
limits.maxComputeWorkgroupSizeX = wgt_limits.max_compute_workgroup_size_x;
Expand All @@ -376,7 +377,7 @@ pub fn write_limits_struct(

if !supported_limits.nextInChain.is_null() {
unsafe {
let mut extras = std::mem::transmute::<
let extras = std::mem::transmute::<
*mut native::WGPUChainedStructOut,
*mut native::WGPUSupportedLimitsExtras,
>(supported_limits.nextInChain);
Expand Down Expand Up @@ -411,9 +412,9 @@ pub fn map_required_limits(
if limits.maxBindGroups != native::WGPU_LIMIT_U32_UNDEFINED {
wgt_limits.max_bind_groups = limits.maxBindGroups;
}
//if limits.maxBindingsPerBindGroup != native::WGPU_LIMIT_U32_UNDEFINED {
// wgt_limits.max_bindings_per_bind_group = limits.maxBindingsPerBindGroup;
//} not yet supportted in wgt
if limits.maxBindingsPerBindGroup != native::WGPU_LIMIT_U32_UNDEFINED {
wgt_limits.max_bindings_per_bind_group = limits.maxBindingsPerBindGroup;
}
if limits.maxDynamicUniformBuffersPerPipelineLayout != native::WGPU_LIMIT_U32_UNDEFINED {
wgt_limits.max_dynamic_uniform_buffers_per_pipeline_layout =
limits.maxDynamicUniformBuffersPerPipelineLayout;
Expand Down Expand Up @@ -464,12 +465,19 @@ pub fn map_required_limits(
if limits.maxInterStageShaderComponents != native::WGPU_LIMIT_U32_UNDEFINED {
wgt_limits.max_inter_stage_shader_components = limits.maxInterStageShaderComponents;
}
//if limits.maxInterStageShaderVariables != native::WGPU_LIMIT_U32_UNDEFINED {
// wgt_limits.max_inter_stage_shader_variables = limits.maxIntmaxInterStageShaderVariableserStageShaderComponents;
//} not yet in wgt
//if limits.maxColorAttachments != native::WGPU_LIMIT_U32_UNDEFINED {
// wgt_limits.max_color_attachments = limits.maxColorAttachments;
//} not yet in wgt
// TODO: not yet in wgt
// if limits.maxInterStageShaderVariables != native::WGPU_LIMIT_U32_UNDEFINED {
// wgt_limits.max_inter_stage_shader_variables =
// limits.maxInterStageShaderVariables;
// }
// TODO: not yet in wgt
// if limits.maxColorAttachments != native::WGPU_LIMIT_U32_UNDEFINED {
// wgt_limits.max_color_attachments = limits.maxColorAttachments;
// }
// TODO: not yet in wgt
// if limits.maxColorAttachmentBytesPerSample != native::WGPU_LIMIT_U32_UNDEFINED {
// wgt_limits.max_color_attachment_bytes_per_sample = limits.maxColorAttachmentBytesPerSample;
// }
if limits.maxComputeWorkgroupStorageSize != native::WGPU_LIMIT_U32_UNDEFINED {
wgt_limits.max_compute_workgroup_storage_size = limits.maxComputeWorkgroupStorageSize;
}
Expand Down Expand Up @@ -512,7 +520,7 @@ pub fn map_shader_module<'a>(

#[cfg(feature = "spirv")]
if let Some(spirv) = spirv {
let slice = unsafe { make_slice(spirv.code, spirv.codeSize as usize) };
let slice = make_slice(spirv.code, spirv.codeSize as usize);
// Parse the given shader code and store its representation.
let options = naga::front::spv::Options {
adjust_coordinate_space: false, // we require NDC_Y_UP feature
Expand All @@ -532,7 +540,7 @@ pub fn map_shader_module<'a>(
map_shader_stage(glsl.stage).expect("Unknown shader stage"),
);

let raw_defines = unsafe { make_slice(glsl.defines, glsl.defineCount as usize) };
let raw_defines = make_slice(glsl.defines, glsl.defineCount as usize);
for define in raw_defines {
let name_c_str: &CStr = unsafe { CStr::from_ptr(define.name) };
let name_str_slice: &str = name_c_str.to_str().expect("not a valid utf-8 string");
Expand Down Expand Up @@ -1112,7 +1120,7 @@ pub fn map_swapchain_descriptor(
native::WGPUCompositeAlphaMode_Inherit => wgt::CompositeAlphaMode::Inherit,
_ => panic!("invalid alpha mode for swapchain descriptor"),
},
unsafe { make_slice(extras.viewFormats, extras.viewFormatCount) }
make_slice(extras.viewFormats, extras.viewFormatCount)
.iter()
.map(|f| {
map_texture_format(*f).expect("invalid view format for swapchain descriptor")
Expand All @@ -1138,15 +1146,15 @@ pub fn map_query_set_descriptor<'a>(
desc: &native::WGPUQuerySetDescriptor,
) -> wgt::QuerySetDescriptor<wgc::Label<'a>> {
wgt::QuerySetDescriptor {
label: unsafe { OwnedLabel::new(desc.label) }.into_cow(),
label: ptr_into_label(desc.label),
count: desc.count,
ty: match desc.type_ {
native::WGPUQueryType_Occlusion => wgt::QueryType::Occlusion,
native::WGPUQueryType_Timestamp => wgt::QueryType::Timestamp,
native::WGPUQueryType_PipelineStatistics => {
let mut types = wgt::PipelineStatisticsTypes::empty();

unsafe { make_slice(desc.pipelineStatistics, desc.pipelineStatisticsCount) }
make_slice(desc.pipelineStatistics, desc.pipelineStatisticsCount)
.iter()
.for_each(|f| {
types.insert(match *f {
Expand Down
Loading
Loading