mirror of
https://github.com/gfx-rs/wgpu.git
synced 2024-11-22 06:44:14 +00:00
Add a vulkan workaround for large buffers. (#2796)
* Add Limit::max_buffer_size. * Prevent very large buffer with some drivers. Some drivers run into issues when buffer sizes and ranges are larger than what fits signed 32 bit integer. Adapt the maximum buffer size accordingly.
This commit is contained in:
parent
a9f1b4f8e0
commit
5dcd19c167
@ -576,6 +576,14 @@ impl<A: HalApi> Device<A> {
|
|||||||
transient: bool,
|
transient: bool,
|
||||||
) -> Result<resource::Buffer<A>, resource::CreateBufferError> {
|
) -> Result<resource::Buffer<A>, resource::CreateBufferError> {
|
||||||
debug_assert_eq!(self_id.backend(), A::VARIANT);
|
debug_assert_eq!(self_id.backend(), A::VARIANT);
|
||||||
|
|
||||||
|
if desc.size > self.limits.max_buffer_size {
|
||||||
|
return Err(resource::CreateBufferError::MaxBufferSize {
|
||||||
|
requested: desc.size,
|
||||||
|
maximum: self.limits.max_buffer_size,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
let mut usage = conv::map_buffer_usage(desc.usage);
|
let mut usage = conv::map_buffer_usage(desc.usage);
|
||||||
|
|
||||||
if desc.usage.is_empty() {
|
if desc.usage.is_empty() {
|
||||||
|
@ -23,8 +23,8 @@ pub struct HalSurface<A: hal::Api> {
|
|||||||
#[error("Limit '{name}' value {requested} is better than allowed {allowed}")]
|
#[error("Limit '{name}' value {requested} is better than allowed {allowed}")]
|
||||||
pub struct FailedLimit {
|
pub struct FailedLimit {
|
||||||
name: &'static str,
|
name: &'static str,
|
||||||
requested: u32,
|
requested: u64,
|
||||||
allowed: u32,
|
allowed: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_limits(requested: &wgt::Limits, allowed: &wgt::Limits) -> Vec<FailedLimit> {
|
fn check_limits(requested: &wgt::Limits, allowed: &wgt::Limits) -> Vec<FailedLimit> {
|
||||||
|
@ -174,6 +174,8 @@ pub enum CreateBufferError {
|
|||||||
EmptyUsage,
|
EmptyUsage,
|
||||||
#[error("`MAP` usage can only be combined with the opposite `COPY`, requested {0:?}")]
|
#[error("`MAP` usage can only be combined with the opposite `COPY`, requested {0:?}")]
|
||||||
UsageMismatch(wgt::BufferUsages),
|
UsageMismatch(wgt::BufferUsages),
|
||||||
|
#[error("Buffer size {requested} is greater than the maximum buffer size ({maximum})")]
|
||||||
|
MaxBufferSize { requested: u64, maximum: u64 },
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<A: hal::Api> Resource for Buffer<A> {
|
impl<A: hal::Api> Resource for Buffer<A> {
|
||||||
|
@ -220,6 +220,8 @@ impl super::Adapter {
|
|||||||
max_compute_workgroup_size_y: max_workgroup_size_xy,
|
max_compute_workgroup_size_y: max_workgroup_size_xy,
|
||||||
max_compute_workgroup_size_z: max_workgroup_size_z,
|
max_compute_workgroup_size_z: max_workgroup_size_z,
|
||||||
max_compute_workgroups_per_dimension,
|
max_compute_workgroups_per_dimension,
|
||||||
|
// D3D11_BUFFER_DESC represents the buffer size as a 32 bit int.
|
||||||
|
max_buffer_size: u32::MAX as u64,
|
||||||
};
|
};
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -282,6 +282,7 @@ impl super::Adapter {
|
|||||||
max_compute_workgroup_size_z: d3d12::D3D12_CS_THREAD_GROUP_MAX_Z,
|
max_compute_workgroup_size_z: d3d12::D3D12_CS_THREAD_GROUP_MAX_Z,
|
||||||
max_compute_workgroups_per_dimension:
|
max_compute_workgroups_per_dimension:
|
||||||
d3d12::D3D12_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION,
|
d3d12::D3D12_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION,
|
||||||
|
max_buffer_size: u64::MAX,
|
||||||
},
|
},
|
||||||
alignments: crate::Alignments {
|
alignments: crate::Alignments {
|
||||||
buffer_copy_offset: wgt::BufferSize::new(
|
buffer_copy_offset: wgt::BufferSize::new(
|
||||||
|
@ -461,6 +461,7 @@ impl super::Adapter {
|
|||||||
0
|
0
|
||||||
},
|
},
|
||||||
max_compute_workgroups_per_dimension,
|
max_compute_workgroups_per_dimension,
|
||||||
|
max_buffer_size: i32::MAX as u64,
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut workarounds = super::Workarounds::empty();
|
let mut workarounds = super::Workarounds::empty();
|
||||||
|
@ -847,6 +847,7 @@ impl super::PrivateCapabilities {
|
|||||||
max_compute_workgroup_size_y: self.max_threads_per_group,
|
max_compute_workgroup_size_y: self.max_threads_per_group,
|
||||||
max_compute_workgroup_size_z: self.max_threads_per_group,
|
max_compute_workgroup_size_z: self.max_threads_per_group,
|
||||||
max_compute_workgroups_per_dimension: 0xFFFF,
|
max_compute_workgroups_per_dimension: 0xFFFF,
|
||||||
|
max_buffer_size: self.max_buffer_size,
|
||||||
},
|
},
|
||||||
alignments: crate::Alignments {
|
alignments: crate::Alignments {
|
||||||
buffer_copy_offset: wgt::BufferSize::new(self.buffer_alignment).unwrap(),
|
buffer_copy_offset: wgt::BufferSize::new(self.buffer_alignment).unwrap(),
|
||||||
|
@ -768,6 +768,15 @@ impl PhysicalDeviceCapabilities {
|
|||||||
.min(limits.max_compute_work_group_count[1])
|
.min(limits.max_compute_work_group_count[1])
|
||||||
.min(limits.max_compute_work_group_count[2]);
|
.min(limits.max_compute_work_group_count[2]);
|
||||||
|
|
||||||
|
// Prevent very large buffers on mesa and most android devices.
|
||||||
|
let is_nvidia = self.properties.vendor_id == crate::auxil::db::nvidia::VENDOR;
|
||||||
|
let max_buffer_size =
|
||||||
|
if (cfg!(target_os = "linux") || cfg!(target_os = "android")) && !is_nvidia {
|
||||||
|
i32::MAX as u64
|
||||||
|
} else {
|
||||||
|
u64::MAX
|
||||||
|
};
|
||||||
|
|
||||||
wgt::Limits {
|
wgt::Limits {
|
||||||
max_texture_dimension_1d: limits.max_image_dimension1_d,
|
max_texture_dimension_1d: limits.max_image_dimension1_d,
|
||||||
max_texture_dimension_2d: limits.max_image_dimension2_d,
|
max_texture_dimension_2d: limits.max_image_dimension2_d,
|
||||||
@ -808,6 +817,7 @@ impl PhysicalDeviceCapabilities {
|
|||||||
max_compute_workgroup_size_y: max_compute_workgroup_sizes[1],
|
max_compute_workgroup_size_y: max_compute_workgroup_sizes[1],
|
||||||
max_compute_workgroup_size_z: max_compute_workgroup_sizes[2],
|
max_compute_workgroup_size_z: max_compute_workgroup_sizes[2],
|
||||||
max_compute_workgroups_per_dimension,
|
max_compute_workgroups_per_dimension,
|
||||||
|
max_buffer_size,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,6 +47,7 @@ mod inner {
|
|||||||
max_uniform_buffers_per_shader_stage,
|
max_uniform_buffers_per_shader_stage,
|
||||||
max_uniform_buffer_binding_size,
|
max_uniform_buffer_binding_size,
|
||||||
max_storage_buffer_binding_size,
|
max_storage_buffer_binding_size,
|
||||||
|
max_buffer_size,
|
||||||
max_vertex_buffers,
|
max_vertex_buffers,
|
||||||
max_vertex_attributes,
|
max_vertex_attributes,
|
||||||
max_vertex_buffer_array_stride,
|
max_vertex_buffer_array_stride,
|
||||||
@ -75,6 +76,7 @@ mod inner {
|
|||||||
println!("\t\tMax Uniform Buffers Per Shader Stage: {}", max_uniform_buffers_per_shader_stage);
|
println!("\t\tMax Uniform Buffers Per Shader Stage: {}", max_uniform_buffers_per_shader_stage);
|
||||||
println!("\t\tMax Uniform Buffer Binding Size: {}", max_uniform_buffer_binding_size);
|
println!("\t\tMax Uniform Buffer Binding Size: {}", max_uniform_buffer_binding_size);
|
||||||
println!("\t\tMax Storage Buffer Binding Size: {}", max_storage_buffer_binding_size);
|
println!("\t\tMax Storage Buffer Binding Size: {}", max_storage_buffer_binding_size);
|
||||||
|
println!("\t\tMax Buffer Size: {}", max_buffer_size);
|
||||||
println!("\t\tMax Vertex Buffers: {}", max_vertex_buffers);
|
println!("\t\tMax Vertex Buffers: {}", max_vertex_buffers);
|
||||||
println!("\t\tMax Vertex Attributes: {}", max_vertex_attributes);
|
println!("\t\tMax Vertex Attributes: {}", max_vertex_attributes);
|
||||||
println!("\t\tMax Vertex Buffer Array Stride: {}", max_vertex_buffer_array_stride);
|
println!("\t\tMax Vertex Buffer Array Stride: {}", max_vertex_buffer_array_stride);
|
||||||
|
@ -737,6 +737,11 @@ pub struct Limits {
|
|||||||
/// The maximum value for each dimension of a `ComputePass::dispatch(x, y, z)` operation.
|
/// The maximum value for each dimension of a `ComputePass::dispatch(x, y, z)` operation.
|
||||||
/// Defaults to 65535.
|
/// Defaults to 65535.
|
||||||
pub max_compute_workgroups_per_dimension: u32,
|
pub max_compute_workgroups_per_dimension: u32,
|
||||||
|
/// A limit above which buffer allocations are guaranteed to fail.
|
||||||
|
///
|
||||||
|
/// Buffer allocations below the maximum buffer size may not succed depending on available memory,
|
||||||
|
/// fragmentation and other factors.
|
||||||
|
pub max_buffer_size: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Limits {
|
impl Default for Limits {
|
||||||
@ -769,6 +774,7 @@ impl Default for Limits {
|
|||||||
max_compute_workgroup_size_y: 256,
|
max_compute_workgroup_size_y: 256,
|
||||||
max_compute_workgroup_size_z: 64,
|
max_compute_workgroup_size_z: 64,
|
||||||
max_compute_workgroups_per_dimension: 65535,
|
max_compute_workgroups_per_dimension: 65535,
|
||||||
|
max_buffer_size: 1 << 30,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -804,6 +810,7 @@ impl Limits {
|
|||||||
max_compute_workgroup_size_y: 256,
|
max_compute_workgroup_size_y: 256,
|
||||||
max_compute_workgroup_size_z: 64,
|
max_compute_workgroup_size_z: 64,
|
||||||
max_compute_workgroups_per_dimension: 65535,
|
max_compute_workgroups_per_dimension: 65535,
|
||||||
|
max_buffer_size: 1 << 28,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -876,7 +883,7 @@ impl Limits {
|
|||||||
&self,
|
&self,
|
||||||
allowed: &Self,
|
allowed: &Self,
|
||||||
fatal: bool,
|
fatal: bool,
|
||||||
mut fail_fn: impl FnMut(&'static str, u32, u32),
|
mut fail_fn: impl FnMut(&'static str, u64, u64),
|
||||||
) {
|
) {
|
||||||
use std::cmp::Ordering;
|
use std::cmp::Ordering;
|
||||||
|
|
||||||
@ -885,7 +892,7 @@ impl Limits {
|
|||||||
match self.$name.cmp(&allowed.$name) {
|
match self.$name.cmp(&allowed.$name) {
|
||||||
Ordering::$ordering | Ordering::Equal => (),
|
Ordering::$ordering | Ordering::Equal => (),
|
||||||
_ => {
|
_ => {
|
||||||
fail_fn(stringify!($name), self.$name, allowed.$name);
|
fail_fn(stringify!($name), self.$name as u64, allowed.$name as u64);
|
||||||
if fatal {
|
if fatal {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -921,6 +928,7 @@ impl Limits {
|
|||||||
compare!(max_compute_workgroup_size_y, Less);
|
compare!(max_compute_workgroup_size_y, Less);
|
||||||
compare!(max_compute_workgroup_size_z, Less);
|
compare!(max_compute_workgroup_size_z, Less);
|
||||||
compare!(max_compute_workgroups_per_dimension, Less);
|
compare!(max_compute_workgroups_per_dimension, Less);
|
||||||
|
compare!(max_buffer_size, Less);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user