github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[d3d12] Isolate buffer descriptor mapping

Browse Source
This commit is contained in:
Connor Fitzgerald
2025-04-07 16:24:46 -04:00
committed by Erich Gubler
parent b57ec2c9e0
commit 4fce269b1d
2 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wgpu-hal/src/dx12/conv.rs
View File

@@ -1,4 +1,4 @@
use windows::Win32::Graphics::{Direct3D, Direct3D12};
use windows::Win32::Graphics::{Direct3D, Direct3D12, Dxgi};
pub fn map_buffer_usage_to_resource_flags(
usage: wgt::BufferUses,
@@ -12,6 +12,26 @@ pub fn map_buffer_usage_to_resource_flags(
flags
}
pub fn map_buffer_descriptor(
desc: &crate::BufferDescriptor<'_>,
) -> Direct3D12::D3D12_RESOURCE_DESC {
Direct3D12::D3D12_RESOURCE_DESC {
Dimension: Direct3D12::D3D12_RESOURCE_DIMENSION_BUFFER,
Alignment: 0,
Width: desc.size,
Height: 1,
DepthOrArraySize: 1,
MipLevels: 1,
Format: Dxgi::Common::DXGI_FORMAT_UNKNOWN,
SampleDesc: Dxgi::Common::DXGI_SAMPLE_DESC {
Count: 1,
Quality: 0,
},
Layout: Direct3D12::D3D12_TEXTURE_LAYOUT_ROW_MAJOR,
Flags: map_buffer_usage_to_resource_flags(desc.usage),
}
}
pub fn map_texture_dimension(dim: wgt::TextureDimension) -> Direct3D12::D3D12_RESOURCE_DIMENSION {
match dim {
wgt::TextureDimension::D1 => Direct3D12::D3D12_RESOURCE_DIMENSION_TEXTURE1D,

47
wgpu-hal/src/dx12/device.rs
View File

@@ -406,31 +406,18 @@ impl crate::Device for super::Device {
&self,
desc: &crate::BufferDescriptor,
) -> Result<super::Buffer, crate::DeviceError> {
let alloc_size = if desc.usage.contains(wgt::BufferUses::UNIFORM) {
desc.size
.next_multiple_of(Direct3D12::D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT.into())
} else {
desc.size
};
let mut desc = desc.clone();
let raw_desc = Direct3D12::D3D12_RESOURCE_DESC {
Dimension: Direct3D12::D3D12_RESOURCE_DIMENSION_BUFFER,
Alignment: 0,
Width: alloc_size,
Height: 1,
DepthOrArraySize: 1,
MipLevels: 1,
Format: Dxgi::Common::DXGI_FORMAT_UNKNOWN,
SampleDesc: Dxgi::Common::DXGI_SAMPLE_DESC {
Count: 1,
Quality: 0,
},
Layout: Direct3D12::D3D12_TEXTURE_LAYOUT_ROW_MAJOR,
Flags: conv::map_buffer_usage_to_resource_flags(desc.usage),
};
if desc.usage.contains(wgt::BufferUses::UNIFORM) {
desc.size = desc
.size
.next_multiple_of(Direct3D12::D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT.into())
}
let raw_desc = conv::map_buffer_descriptor(&desc);
let (resource, allocation) =
suballocation::DeviceAllocationContext::from(self).create_buffer(desc, raw_desc)?;
suballocation::DeviceAllocationContext::from(self).create_buffer(&desc, raw_desc)?;
if let Some(label) = desc.label {
unsafe { resource.SetName(&windows::core::HSTRING::from(label)) }
@@ -1555,21 +1542,7 @@ impl crate::Device for super::Device {
memory_flags: crate::MemoryFlags::empty(),
};
let raw_buffer_desc = Direct3D12::D3D12_RESOURCE_DESC {
Dimension: Direct3D12::D3D12_RESOURCE_DIMENSION_BUFFER,
Alignment: 0,
Width: buffer_size,
Height: 1,
DepthOrArraySize: 1,
MipLevels: 1,
Format: Dxgi::Common::DXGI_FORMAT_UNKNOWN,
SampleDesc: Dxgi::Common::DXGI_SAMPLE_DESC {
Count: 1,
Quality: 0,
},
Layout: Direct3D12::D3D12_TEXTURE_LAYOUT_ROW_MAJOR,
Flags: Direct3D12::D3D12_RESOURCE_FLAG_NONE,
};
let raw_buffer_desc = conv::map_buffer_descriptor(&buffer_desc);
let (buffer, allocation) = suballocation::DeviceAllocationContext::from(self)
.create_buffer(&buffer_desc, raw_buffer_desc)?;