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

Do not feed &"" to D3DCompile #5812

Merged
merged 2 commits into from
Jun 14, 2024
Merged

Do not feed &"" to D3DCompile #5812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6d3d13
Do not feed &"" to D3DCompile
workingjubilee Jun 14, 2024
b0f603f
Alter compile_{d,f}xc to take `Option<&CStr>`
workingjubilee Jun 14, 2024
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
7 changes: 1 addition & 6 deletions wgpu-hal/src/dx12/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,7 @@ impl super::Device {
.as_ref()
.map_err(|e| crate::PipelineError::Linkage(stage_bit, format!("{e}")))?;

let source_name = stage
.module
.raw_name
.as_ref()
.and_then(|cstr| cstr.to_str().ok())
.unwrap_or_default();
let source_name = stage.module.raw_name.as_deref();

// Compile with DXC if available, otherwise fall back to FXC
let (result, log_level) = if let Some(ref dxc_container) = self.dxc_container {
Expand Down
19 changes: 15 additions & 4 deletions wgpu-hal/src/dx12/shader_compilation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::ffi::CStr;
use std::ptr;

pub(super) use dxc::{compile_dxc, get_dxc_container, DxcContainer};
Expand All @@ -14,7 +15,7 @@ use crate::auxil::dxgi::result::HResult;
pub(super) fn compile_fxc(
device: &super::Device,
source: &str,
source_name: &str,
source_name: Option<&CStr>,
raw_ep: &std::ffi::CString,
stage_bit: wgt::ShaderStages,
full_stage: String,
Expand All @@ -32,13 +33,17 @@ pub(super) fn compile_fxc(
{
compile_flags |= d3dcompiler::D3DCOMPILE_DEBUG | d3dcompiler::D3DCOMPILE_SKIP_OPTIMIZATION;
}

// If no name has been set, D3DCompile wants the null pointer.
let source_name = source_name.map(|cstr| cstr.as_ptr()).unwrap_or(ptr::null());

let mut error = d3d12::Blob::null();
let hr = unsafe {
profiling::scope!("d3dcompiler::D3DCompile");
d3dcompiler::D3DCompile(
source.as_ptr().cast(),
teoxoy marked this conversation as resolved.
Show resolved Hide resolved
source.len(),
source_name.as_ptr().cast(),
source_name.cast(),
ptr::null(),
ptr::null_mut(),
raw_ep.as_ptr(),
Expand Down Expand Up @@ -78,6 +83,7 @@ pub(super) fn compile_fxc(
// The Dxc implementation is behind a feature flag so that users who don't want to use dxc can disable the feature.
#[cfg(feature = "dxc_shader_compiler")]
mod dxc {
use std::ffi::CStr;
use std::path::PathBuf;

// Destructor order should be fine since _dxil and _dxc don't rely on each other.
Expand Down Expand Up @@ -132,7 +138,7 @@ mod dxc {
pub(crate) fn compile_dxc(
device: &crate::dx12::Device,
source: &str,
source_name: &str,
source_name: Option<&CStr>,
raw_ep: &str,
stage_bit: wgt::ShaderStages,
full_stage: String,
Expand Down Expand Up @@ -166,6 +172,10 @@ mod dxc {
Err(e) => return (Err(e), log::Level::Error),
};

let source_name = source_name
.and_then(|cstr| cstr.to_str().ok())
.unwrap_or("");

let compiled = dxc_container.compiler.compile(
&blob,
source_name,
Expand Down Expand Up @@ -263,6 +273,7 @@ mod dxc {
// These are stubs for when the `dxc_shader_compiler` feature is disabled.
#[cfg(not(feature = "dxc_shader_compiler"))]
mod dxc {
use std::ffi::CStr;
use std::path::PathBuf;

pub(crate) struct DxcContainer {}
Expand All @@ -280,7 +291,7 @@ mod dxc {
pub(crate) fn compile_dxc(
_device: &crate::dx12::Device,
_source: &str,
_source_name: &str,
_source_name: Option<&CStr>,
_raw_ep: &str,
_stage_bit: wgt::ShaderStages,
_full_stage: String,
Expand Down
Loading