From 44edc73d99420371a4272ffdabeb7fd5bba8892f Mon Sep 17 00:00:00 2001 From: Jubilee Young Date: Mon, 17 Jun 2024 17:43:41 -0700 Subject: [PATCH] Make compile_fxc accept full_stage: &CStr --- wgpu-hal/src/dx12/device.rs | 1 + wgpu-hal/src/dx12/shader_compilation.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wgpu-hal/src/dx12/device.rs b/wgpu-hal/src/dx12/device.rs index 81674ea8b11..98aa230f36c 100644 --- a/wgpu-hal/src/dx12/device.rs +++ b/wgpu-hal/src/dx12/device.rs @@ -273,6 +273,7 @@ impl super::Device { dxc_container, ) } else { + let full_stage = CStr::from_bytes_with_nul(full_stage.as_bytes()).unwrap(); shader_compilation::compile_fxc( self, &source, diff --git a/wgpu-hal/src/dx12/shader_compilation.rs b/wgpu-hal/src/dx12/shader_compilation.rs index 4eb88019904..f290861d35f 100644 --- a/wgpu-hal/src/dx12/shader_compilation.rs +++ b/wgpu-hal/src/dx12/shader_compilation.rs @@ -18,7 +18,7 @@ pub(super) fn compile_fxc( source_name: Option<&CStr>, raw_ep: &std::ffi::CString, stage_bit: wgt::ShaderStages, - full_stage: String, + full_stage: &CStr, ) -> ( Result, log::Level,