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] Improve naming of allocation functions

Browse Source
This commit is contained in:
Connor Fitzgerald
2025-04-03 18:30:07 -04:00
committed by Teodor Tanasoaia
parent 0f4d1f2284
commit 840dbd5385
2 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -430,11 +430,8 @@ impl crate::Device for super::Device {
Flags: conv::map_buffer_usage_to_resource_flags(desc.usage),
};
let (resource, allocation) = suballocation::create_buffer_resource(
DeviceAllocationContext::from(self),
desc,
raw_desc,
)?;
let (resource, allocation) =
suballocation::create_buffer(DeviceAllocationContext::from(self), desc, raw_desc)?;
if let Some(label) = desc.label {
unsafe { resource.SetName(&windows::core::HSTRING::from(label)) }
@@ -514,11 +511,8 @@ impl crate::Device for super::Device {
Flags: conv::map_texture_usage_to_resource_flags(desc.usage),
};
let (resource, allocation) = suballocation::create_texture_resource(
DeviceAllocationContext::from(self),
desc,
raw_desc,
)?;
let (resource, allocation) =
suballocation::create_texture(DeviceAllocationContext::from(self), desc, raw_desc)?;
if let Some(label) = desc.label {
unsafe { resource.SetName(&windows::core::HSTRING::from(label)) }
@@ -1586,7 +1580,7 @@ impl crate::Device for super::Device {
Flags: Direct3D12::D3D12_RESOURCE_FLAG_NONE,
};
let (buffer, allocation) = suballocation::create_buffer_resource(
let (buffer, allocation) = suballocation::create_buffer(
DeviceAllocationContext::from(self),
&buffer_desc,
raw_buffer_desc,
@@ -2294,7 +2288,7 @@ impl crate::Device for super::Device {
Flags: Direct3D12::D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS,
};
let (resource, allocation) = suballocation::create_acceleration_structure_resource(
let (resource, allocation) = suballocation::create_acceleration_structure(
DeviceAllocationContext::from(self),
desc,
raw_desc,

18
wgpu-hal/src/dx12/suballocation.rs
View File

@@ -92,7 +92,7 @@ impl<'a> From<&'a super::CommandEncoder> for DeviceAllocationContext<'a> {
}
}
pub(crate) fn create_buffer_resource(
pub(crate) fn create_buffer(
ctx: DeviceAllocationContext,
desc: &crate::BufferDescriptor,
raw_desc: Direct3D12::D3D12_RESOURCE_DESC,
@@ -102,7 +102,7 @@ pub(crate) fn create_buffer_resource(
// Workaround for Intel Xe drivers
if !ctx.shared.private_caps.suballocation_supported {
let resource = create_committed_buffer_resource(ctx, desc, raw_desc)?;
let resource = create_committed_buffer(ctx, desc, raw_desc)?;
return Ok((resource, Allocation::none(AllocationType::Buffer)));
}
@@ -151,14 +151,14 @@ pub(crate) fn create_buffer_resource(
))
}
pub(crate) fn create_texture_resource(
pub(crate) fn create_texture(
ctx: DeviceAllocationContext,
desc: &crate::TextureDescriptor,
raw_desc: Direct3D12::D3D12_RESOURCE_DESC,
) -> Result<(Direct3D12::ID3D12Resource, Allocation), crate::DeviceError> {
// Workaround for Intel Xe drivers
if !ctx.shared.private_caps.suballocation_supported {
let resource = create_committed_texture_resource(ctx, desc, raw_desc)?;
let resource = create_committed_texture(ctx, desc, raw_desc)?;
return Ok((resource, Allocation::none(AllocationType::Texture)));
}
@@ -201,14 +201,14 @@ pub(crate) fn create_texture_resource(
))
}
pub(crate) fn create_acceleration_structure_resource(
pub(crate) fn create_acceleration_structure(
ctx: DeviceAllocationContext,
desc: &crate::AccelerationStructureDescriptor,
raw_desc: Direct3D12::D3D12_RESOURCE_DESC,
) -> Result<(Direct3D12::ID3D12Resource, Allocation), crate::DeviceError> {
// Workaround for Intel Xe drivers
if !ctx.shared.private_caps.suballocation_supported {
let resource = create_committed_acceleration_structure_resource(ctx, desc, raw_desc)?;
let resource = create_committed_acceleration_structure(ctx, desc, raw_desc)?;
return Ok((
resource,
Allocation::none(AllocationType::AccelerationStructure),
@@ -317,7 +317,7 @@ impl From<gpu_allocator::AllocationError> for crate::DeviceError {
}
}
pub(crate) fn create_committed_buffer_resource(
pub(crate) fn create_committed_buffer(
ctx: DeviceAllocationContext,
desc: &crate::BufferDescriptor,
raw_desc: Direct3D12::D3D12_RESOURCE_DESC,
@@ -365,7 +365,7 @@ pub(crate) fn create_committed_buffer_resource(
resource.ok_or(crate::DeviceError::Unexpected)
}
pub(crate) fn create_committed_texture_resource(
pub(crate) fn create_committed_texture(
ctx: DeviceAllocationContext,
_desc: &crate::TextureDescriptor,
raw_desc: Direct3D12::D3D12_RESOURCE_DESC,
@@ -402,7 +402,7 @@ pub(crate) fn create_committed_texture_resource(
resource.ok_or(crate::DeviceError::Unexpected)
}
pub(crate) fn create_committed_acceleration_structure_resource(
pub(crate) fn create_committed_acceleration_structure(
ctx: DeviceAllocationContext,
_desc: &crate::AccelerationStructureDescriptor,
raw_desc: Direct3D12::D3D12_RESOURCE_DESC,