alex/librashader
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

capi(d3d11): take ManuallyDrop<ID3D11ShaderResourceView> directly in libra_d3d11_filter_chain_t

Browse source
This commit is contained in:
chyyran 2024-03-07 20:56:30 -05:00 committed by Ronny Chan
parent 763c05755d
commit f18c22a95a
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
librashader-capi/src/runtime/d3d11/filter_chain.rs
View file

@ -17,17 +17,6 @@ use windows::Win32::Graphics::Direct3D11::{
use crate::LIBRASHADER_API_VERSION; use crate::LIBRASHADER_API_VERSION;
use librashader::runtime::{FilterChainParameters, Viewport}; use librashader::runtime::{FilterChainParameters, Viewport};
/// Direct3D 11 parameters for the source image.
#[repr(C)]
pub struct libra_source_image_d3d11_t {
/// A shader resource view into the source image
pub handle: ManuallyDrop<ID3D11ShaderResourceView>,
/// This is currently ignored.
pub width: u32,
/// This is currently ignored.
pub height: u32,
}
/// Options for Direct3D 11 filter chain creation. /// Options for Direct3D 11 filter chain creation.
#[repr(C)] #[repr(C)]
#[derive(Default, Debug, Clone)] #[derive(Default, Debug, Clone)]
@ -214,7 +203,7 @@ extern_fn! {
// so ManuallyDrop<Option<ID3D11DeviceContext>> doesn't generate correct bindings. // so ManuallyDrop<Option<ID3D11DeviceContext>> doesn't generate correct bindings.
device_context: Option<ManuallyDrop<ID3D11DeviceContext>>, device_context: Option<ManuallyDrop<ID3D11DeviceContext>>,
frame_count: usize, frame_count: usize,
image: libra_source_image_d3d11_t, image: ManuallyDrop<ID3D11ShaderResourceView>,
viewport: libra_viewport_t, viewport: libra_viewport_t,
out: ManuallyDrop<ID3D11RenderTargetView>, out: ManuallyDrop<ID3D11RenderTargetView>,
mvp: *const f32, mvp: *const f32,
@ -244,7 +233,7 @@ extern_fn! {
let options = options.map(FromUninit::from_uninit); let options = options.map(FromUninit::from_uninit);
unsafe { unsafe {
chain.frame(device_context.as_deref(), image.handle.deref(), &viewport, frame_count, options.as_ref())?; chain.frame(device_context.as_deref(), image.deref(), &viewport, frame_count, options.as_ref())?;
} }
} }
} }