entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

autocommit 2022-04-21 17:40:28 CEST

Browse source
This commit is contained in:
Julian Orth 2022-04-21 17:40:28 +02:00
parent 939d20eab4
commit 0d414a5336
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/video/drm.rs
View file

@ -272,11 +272,13 @@ impl DrmMaster {
} }
let mut strides = [0; 4]; let mut strides = [0; 4];
let mut offsets = [0; 4]; let mut offsets = [0; 4];
let mut modifiers = [0; 4];
let mut handles = [0; 4]; let mut handles = [0; 4];
let mut handles_ = vec![]; let mut handles_ = vec![];
for (idx, plane) in dma.planes.iter().enumerate() { for (idx, plane) in dma.planes.iter().enumerate() {
strides[idx] = plane.stride; strides[idx] = plane.stride;
offsets[idx] = plane.offset; offsets[idx] = plane.offset;
modifiers[idx] = modifier;
let handle = self.gem_handle(plane.fd.raw())?; let handle = self.gem_handle(plane.fd.raw())?;
handles[idx] = handle.handle(); handles[idx] = handle.handle();
handles_.push(handle); handles_.push(handle);
@ -290,7 +292,7 @@ impl DrmMaster {
handles, handles,
strides, strides,
offsets, offsets,
modifier, modifiers,
) { ) {
Ok(fb) => Ok(DrmFramebuffer { Ok(fb) => Ok(DrmFramebuffer {
master: self.clone(), master: self.clone(),

6
src/video/drm/sys.rs
View file

@ -935,7 +935,7 @@ struct drm_mode_fb_cmd2 {
handles: [u32; 4], handles: [u32; 4],
pitches: [u32; 4], pitches: [u32; 4],
offsets: [u32; 4], offsets: [u32; 4],
modifier: [u64; 4], modifiers: [u64; 4],
} }
#[allow(dead_code)] #[allow(dead_code)]
@ -953,7 +953,7 @@ pub fn mode_addfb2(
handles: [u32; 4], handles: [u32; 4],
strides: [u32; 4], strides: [u32; 4],
offsets: [u32; 4], offsets: [u32; 4],
modifier: u64, modifiers: [u64; 4],
) -> Result<DrmFb, OsError> { ) -> Result<DrmFb, OsError> {
let mut res = drm_mode_fb_cmd2 { let mut res = drm_mode_fb_cmd2 {
fb_id: 0, fb_id: 0,
@ -964,7 +964,7 @@ pub fn mode_addfb2(
handles, handles,
pitches: strides, pitches: strides,
offsets, offsets,
modifier: [modifier; 4], modifiers,
}; };
log::info!("{:#?}", res); log::info!("{:#?}", res);