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

Merge #1724

Browse Source 
1724: hal/dx12: compact register allocation, naga update r=kvark a=kvark

**Connections**
Heavily depends on https://github.com/gfx-rs/naga/pull/1136

**Description**
Makes DX12 to run all of the examples 🎉 .

**Testing**
Re-enables DX12 in `PRIMARY` set, which also enables the reference tests on it.

![wgpu-dx12-shadow](https://user-images.githubusercontent.com/107301/126940717-aefad5b2-1eba-4523-ba6a-53a5744ba313.JPG)



Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
This commit is contained in:
bors[bot]
2021-07-26 06:14:05 +00:00
committed by GitHub
parent 3eb3eed8cf 405cf57955
commit 6cfe8bdb28
9 changed files with 119 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -965,7 +965,7 @@ dependencies = [
[[package]]
name = "naga"
version = "0.5.0"
source = "git+https://github.com/gfx-rs/naga?rev=bbfa9a0#bbfa9a0f9e0599fe09ad9428bf359e6dea2664c6"
source = "git+https://github.com/gfx-rs/naga?rev=e97c8f9#e97c8f944121a58bbc908ecb64bdf97d4ada039d"
dependencies = [
"bit-set",
"bitflags",

2
wgpu-core/Cargo.toml
View File

@@ -36,7 +36,7 @@ thiserror = "1"
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "bbfa9a0"
rev = "e97c8f9"
features = ["wgsl-in"]
[dependencies.wgt]

4
wgpu-hal/Cargo.toml
View File

@@ -65,11 +65,11 @@ core-graphics-types = "0.1"
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "bbfa9a0"
rev = "e97c8f9"
[dev-dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "bbfa9a0"
rev = "e97c8f9"
features = ["wgsl-in"]
[dev-dependencies]

30
wgpu-hal/src/dx12/adapter.rs
View File

@@ -1,12 +1,23 @@
use super::{conv, HResult as _};
use std::{mem, sync::Arc};
use std::{mem, sync::Arc, thread};
use winapi::{
shared::{dxgi, dxgi1_2, dxgi1_5, minwindef, windef, winerror},
um::{d3d12, winuser},
um::{d3d12, d3d12sdklayers, winuser},
};
impl Drop for super::Adapter {
fn drop(&mut self) {
// Debug tracking alive objects
if !thread::panicking()
&& self
.private_caps
.instance_flags
.contains(crate::InstanceFlags::VALIDATION)
{
unsafe {
self.report_live_objects();
}
}
unsafe {
self.raw.destroy();
}
@@ -14,6 +25,19 @@ impl Drop for super::Adapter {
}
impl super::Adapter {
pub unsafe fn report_live_objects(&self) {
if let Ok(debug_device) = self
.raw
.cast::<d3d12sdklayers::ID3D12DebugDevice>()
.into_result()
{
debug_device.ReportLiveDeviceObjects(
d3d12sdklayers::D3D12_RLDO_SUMMARY | d3d12sdklayers::D3D12_RLDO_IGNORE_INTERNAL,
);
debug_device.destroy();
}
}
#[allow(trivial_casts)]
pub(super) fn expose(
adapter: native::WeakPtr<dxgi1_2::IDXGIAdapter2>,
@@ -98,6 +122,7 @@ impl super::Adapter {
};
let private_caps = super::PrivateCapabilities {
instance_flags,
heterogeneous_resource_heaps: options.ResourceHeapTier
!= d3d12::D3D12_RESOURCE_HEAP_TIER_1,
memory_architecture: if features_architecture.UMA != 0 {
@@ -107,7 +132,6 @@ impl super::Adapter {
} else {
super::MemoryArchitecture::NonUnified
},
shader_debug_info: instance_flags.contains(crate::InstanceFlags::DEBUG),
heap_create_not_zeroed: false, //TODO: winapi support for Options7
};

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

@@ -1,9 +1,9 @@
use super::{conv, descriptor, view, HResult as _};
use parking_lot::Mutex;
use std::{ffi, mem, num::NonZeroU32, ptr, slice, sync::Arc, thread};
use std::{ffi, mem, num::NonZeroU32, ptr, slice, sync::Arc};
use winapi::{
shared::{dxgiformat, dxgitype, winerror},
um::{d3d12, d3d12sdklayers, d3dcompiler, synchapi, winbase},
um::{d3d12, d3dcompiler, synchapi, winbase},
Interface,
};
@@ -204,7 +204,11 @@ impl super::Device {
let mut shader_data = native::Blob::null();
let mut error = native::Blob::null();
let mut compile_flags = d3dcompiler::D3DCOMPILE_ENABLE_STRICTNESS;
if self.private_caps.shader_debug_info {
if self
.private_caps
.instance_flags
.contains(crate::InstanceFlags::DEBUG)
{
compile_flags |=
d3dcompiler::D3DCOMPILE_DEBUG | d3dcompiler::D3DCOMPILE_SKIP_OPTIMIZATION;
}
@@ -237,15 +241,9 @@ impl super::Device {
)
};
match hr.into_result() {
Ok(()) => Ok(shader_data),
let (result, log_level) = match hr.into_result() {
Ok(()) => (Ok(shader_data), log::Level::Info),
Err(e) => {
log::warn!(
"Naga generated shader for {:?} at {:?}:\n{}",
raw_ep,
naga_stage,
source
);
let message = unsafe {
let slice = slice::from_raw_parts(
error.GetBufferPointer() as *const u8,
@@ -257,9 +255,21 @@ impl super::Device {
unsafe {
error.destroy();
}
Err(crate::PipelineError::Linkage(stage_bit, full_msg))
(
Err(crate::PipelineError::Linkage(stage_bit, full_msg)),
log::Level::Warn,
)
}
}
};
log::log!(
log_level,
"Naga generated shader for {:?} at {:?}:\n{}",
raw_ep,
naga_stage,
source
);
result
}
}
@@ -272,22 +282,6 @@ impl crate::Device<super::Api> for super::Device {
self.shared.destroy();
self.idler.destroy();
queue.raw.destroy();
// Debug tracking alive objects
if !thread::panicking() {
if let Ok(debug_device) = self
.raw
.cast::<d3d12sdklayers::ID3D12DebugDevice>()
.into_result()
{
debug_device.ReportLiveDeviceObjects(
d3d12sdklayers::D3D12_RLDO_SUMMARY | d3d12sdklayers::D3D12_RLDO_IGNORE_INTERNAL,
);
debug_device.destroy();
}
}
self.raw.destroy();
}
unsafe fn create_buffer(
@@ -773,6 +767,8 @@ impl crate::Device<super::Api> for super::Device {
}
}
let (mut num_cbv, mut num_srv, mut num_uav) = (0, 0, 0);
// SRV/CBV/UAV descriptor tables
let mut range_base = ranges.len();
for entry in bgl.entries.iter() {
@@ -784,7 +780,15 @@ impl crate::Device<super::Api> for super::Device {
| wgt::BindingType::Sampler { .. } => continue,
ref other => conv::map_binding_type(other),
};
let register = (ranges.len() - range_base) as u32;
let reg_ref = match range_ty {
native::DescriptorRangeType::CBV => &mut num_cbv,
native::DescriptorRangeType::SRV => &mut num_srv,
native::DescriptorRangeType::UAV => &mut num_uav,
native::DescriptorRangeType::Sampler => unreachable!(),
};
let register = *reg_ref;
*reg_ref += 1;
binding_map.insert(
naga::ResourceBinding {
group: index as u32,
@@ -802,7 +806,6 @@ impl crate::Device<super::Api> for super::Device {
d3d12::D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND,
));
}
let base_view_register = ranges.len() - range_base;
if ranges.len() > range_base {
parameters.push(native::RootParameter::descriptor_table(
conv::map_visibility(visibility_view_static),
@@ -845,7 +848,6 @@ impl crate::Device<super::Api> for super::Device {
}
// Root (dynamic) descriptor tables
let parameter_base = parameters.len();
let dynamic_buffers_visibility = conv::map_visibility(visibility_view_dynamic);
for entry in bgl.entries.iter() {
let buffer_ty = match entry.ty {
@@ -856,7 +858,52 @@ impl crate::Device<super::Api> for super::Device {
} => ty,
_ => continue,
};
let register = (base_view_register + parameters.len() - parameter_base) as u32;
let (kind, param, register) = match buffer_ty {
wgt::BufferBindingType::Uniform => {
let binding = native::Binding {
space,
register: num_cbv,
};
(
super::BufferViewKind::Constant,
native::RootParameter::cbv_descriptor(
dynamic_buffers_visibility,
binding,
),
&mut num_cbv,
)
}
wgt::BufferBindingType::Storage { read_only: true } => {
let binding = native::Binding {
space,
register: num_srv,
};
(
super::BufferViewKind::ShaderResource,
native::RootParameter::srv_descriptor(
dynamic_buffers_visibility,
binding,
),
&mut num_srv,
)
}
wgt::BufferBindingType::Storage { read_only: false } => {
let binding = native::Binding {
space,
register: num_uav,
};
(
super::BufferViewKind::UnorderedAccess,
native::RootParameter::uav_descriptor(
dynamic_buffers_visibility,
binding,
),
&mut num_uav,
)
}
};
binding_map.insert(
naga::ResourceBinding {
group: index as u32,
@@ -864,24 +911,11 @@ impl crate::Device<super::Api> for super::Device {
},
hlsl::BindTarget {
space: space as u8,
register,
register: *register,
},
);
let binding = native::Binding { space, register };
let (kind, param) = match buffer_ty {
wgt::BufferBindingType::Uniform => (
super::BufferViewKind::Constant,
native::RootParameter::cbv_descriptor(dynamic_buffers_visibility, binding),
),
wgt::BufferBindingType::Storage { read_only: true } => (
super::BufferViewKind::ShaderResource,
native::RootParameter::srv_descriptor(dynamic_buffers_visibility, binding),
),
wgt::BufferBindingType::Storage { read_only: false } => (
super::BufferViewKind::UnorderedAccess,
native::RootParameter::uav_descriptor(dynamic_buffers_visibility, binding),
),
};
*register += 1;
info.dynamic_buffers.push(kind);
parameters.push(param);
}

2
wgpu-hal/src/dx12/mod.rs
View File

@@ -161,9 +161,9 @@ enum MemoryArchitecture {
#[derive(Debug, Clone, Copy)]
struct PrivateCapabilities {
instance_flags: crate::InstanceFlags,
heterogeneous_resource_heaps: bool,
memory_architecture: MemoryArchitecture,
shader_debug_info: bool,
heap_create_not_zeroed: bool,
}

2
wgpu-types/src/lib.rs
View File

@@ -110,7 +110,7 @@ bitflags::bitflags! {
/// Vulkan + Metal + DX12 + Browser WebGPU
const PRIMARY = Self::VULKAN.bits
| Self::METAL.bits
//| Self::DX12.bits // enable when Naga is polished
| Self::DX12.bits
| Self::BROWSER_WEBGPU.bits;
/// All the apis that wgpu offers second tier of support for. These may
/// be unsupported/still experimental.

4
wgpu/Cargo.toml
View File

@@ -75,13 +75,13 @@ env_logger = "0.8"
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "bbfa9a0"
rev = "e97c8f9"
optional = true
# used to test all the example shaders
[dev-dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "bbfa9a0"
rev = "e97c8f9"
features = ["wgsl-in"]
[[example]]

2
wgpu/examples/water/main.rs
View File

@@ -800,6 +800,6 @@ fn water() {
base_test_parameters: framework::test_common::TestParameters::default()
.downlevel_flags(wgpu::DownlevelFlags::READ_ONLY_DEPTH_STENCIL),
tolerance: 5,
max_outliers: 300, // bounded by rpi4 on vk
max_outliers: 460, // bounded by DX12, then rpi4 on vk
});
}