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

all: syncobj is one word

Browse source
This commit is contained in:
Julian Orth 2026-03-02 15:56:14 +01:00
parent 949ff558fd
commit 7a891a6131
20 changed files with 199 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/it/test_gfx_api.rs
View file

@ -13,7 +13,7 @@ use {
},
rect::{Rect, Region},
theme::Color,
video::{LINEAR_MODIFIER, dmabuf::DmaBuf, drm::sync_obj::SyncObjCtx},
video::{LINEAR_MODIFIER, dmabuf::DmaBuf, drm::syncobj::SyncobjCtx},
},
ahash::AHashMap,
indexmap::IndexSet,
@ -194,7 +194,7 @@ impl GfxContext for TestGfxCtx {
}))
}
fn sync_obj_ctx(&self) -> Option<&Rc<SyncObjCtx>> {
fn syncobj_ctx(&self) -> Option<&Rc<SyncobjCtx>> {
None
}

4
src/it/test_ifs/test_syncobj_manager.rs
View file

@ -9,7 +9,7 @@ use {
test_object::TestObject,
test_transport::TestTransport,
},
video::drm::sync_obj::SyncObj,
video::drm::syncobj::Syncobj,
wire::{WpLinuxDrmSyncobjManagerV1Id, wp_linux_drm_syncobj_manager_v1::*},
},
std::{cell::Cell, rc::Rc},
@ -52,7 +52,7 @@ impl TestSyncobjManager {
Ok(obj)
}
pub fn import_timeline(&self, syncobj: &SyncObj) -> TestResult<Rc<TestSyncobjTimeline>> {
pub fn import_timeline(&self, syncobj: &Syncobj) -> TestResult<Rc<TestSyncobjTimeline>> {
let obj = Rc::new(TestSyncobjTimeline {
id: self.tran.id(),
tran: self.tran.clone(),

14
src/it/tests/t0031_syncobj.rs
View file

@ -3,7 +3,7 @@ use {
it::{test_error::TestResult, testrun::TestRun},
theme::Color,
utils::errorfmt::ErrorFmt,
video::drm::{DrmError, sync_obj::SyncObjPoint, wait_for_sync_obj::SyncObjWaiter},
video::drm::{DrmError, syncobj::SyncobjPoint, wait_for_syncobj::SyncobjWaiter},
},
std::{cell::Cell, rc::Rc},
};
@ -14,7 +14,7 @@ async fn test(run: Rc<TestRun>) -> TestResult {
let _ds = run.create_default_setup2(true).await?;
struct Waiter(Cell<bool>);
impl SyncObjWaiter for Waiter {
impl SyncobjWaiter for Waiter {
fn done(self: Rc<Self>, result: Result<(), DrmError>) {
result.unwrap();
self.0.set(true);
@ -23,13 +23,13 @@ async fn test(run: Rc<TestRun>) -> TestResult {
let waiter = Rc::new(Waiter(Cell::new(false)));
let eng = run.state.render_ctx.get().unwrap();
let Some(ctx) = eng.sync_obj_ctx() else {
let Some(ctx) = eng.syncobj_ctx() else {
log::warn!(
"Cannot test explicit sync on this system: render context does not support sync objects"
);
return Ok(());
};
let syncobj = match ctx.create_sync_obj() {
let syncobj = match ctx.create_syncobj() {
Ok(s) => Rc::new(s),
Err(e) => {
log::warn!("Cannot test explicit sync on this system: {}", ErrorFmt(e));
@ -38,8 +38,8 @@ async fn test(run: Rc<TestRun>) -> TestResult {
};
let _wait_handle =
run.state
.wait_for_sync_obj
.wait(&syncobj, SyncObjPoint(2), true, waiter.clone())?;
.wait_for_syncobj
.wait(&syncobj, SyncobjPoint(2), true, waiter.clone())?;
let client = run.create_client().await?;
@ -62,7 +62,7 @@ async fn test(run: Rc<TestRun>) -> TestResult {
client.sync().await;
tassert_eq!(waiter.0.get(), false);
ctx.signal(&syncobj, SyncObjPoint(1))?;
ctx.signal(&syncobj, SyncobjPoint(1))?;
client.sync().await;
tassert_eq!(waiter.0.get(), true);