entailz/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

8
src/gfx_apis/gl/renderer/context.rs
View file

@ -20,7 +20,7 @@ use {
rect::Rect,
video::{
dmabuf::DmaBuf,
drm::{Drm, sync_obj::SyncObjCtx},
drm::{Drm, syncobj::SyncobjCtx},
gbm::GbmDevice,
},
},
@ -75,7 +75,7 @@ pub(in crate::gfx_apis::gl) enum TexSourceType {
pub(in crate::gfx_apis::gl) struct GlRenderContext {
pub(crate) ctx: Rc<EglContext>,
pub gbm: Rc<GbmDevice>,
pub sync_ctx: Rc<SyncObjCtx>,
pub sync_ctx: Rc<SyncobjCtx>,
pub(crate) render_node: Rc<CString>,
@ -166,7 +166,7 @@ impl GlRenderContext {
Ok(Self {
ctx: ctx.clone(),
gbm: ctx.dpy.gbm.clone(),
sync_ctx: Rc::new(SyncObjCtx::new(ctx.dpy.gbm.drm.fd())),
sync_ctx: Rc::new(SyncobjCtx::new(ctx.dpy.gbm.drm.fd())),
render_node: node.clone(),
@ -343,7 +343,7 @@ impl GfxContext for GlRenderContext {
Ok(Rc::new(Framebuffer { ctx: self, gl: fb }))
}
fn sync_obj_ctx(&self) -> Option<&Rc<SyncObjCtx>> {
fn syncobj_ctx(&self) -> Option<&Rc<SyncobjCtx>> {
Some(&self.sync_ctx)
}

4
src/gfx_apis/vulkan.rs
View file

@ -43,7 +43,7 @@ use {
utils::{errorfmt::ErrorFmt, oserror::OsError},
video::{
dmabuf::DmaBuf,
drm::{Drm, DrmError, sync_obj::SyncObjCtx},
drm::{Drm, DrmError, syncobj::SyncobjCtx},
gbm::GbmError,
},
vulkan_core::VulkanCoreError,
@ -358,7 +358,7 @@ impl GfxContext for Context {
Ok(fb)
}
fn sync_obj_ctx(&self) -> Option<&Rc<SyncObjCtx>> {
fn syncobj_ctx(&self) -> Option<&Rc<SyncobjCtx>> {
Some(&self.0.device.sync_ctx)
}

6
src/gfx_apis/vulkan/device.rs
View file

@ -10,7 +10,7 @@ use {
utils::bitflags::BitflagsExt,
video::{
dmabuf::DmaBufIds,
drm::{Drm, sync_obj::SyncObjCtx},
drm::{Drm, syncobj::SyncobjCtx},
gbm::{GBM_BO_USE_RENDERING, GbmDevice},
},
vulkan_core::{
@ -60,7 +60,7 @@ pub struct VulkanDevice {
pub(super) physical_device: PhysicalDevice,
pub(super) render_node: Rc<CString>,
pub(super) gbm: Rc<GbmDevice>,
pub(super) sync_ctx: Rc<SyncObjCtx>,
pub(super) sync_ctx: Rc<SyncobjCtx>,
pub(super) instance: Rc<VulkanInstance>,
pub(super) device: Arc<Device>,
pub(super) external_memory_fd: external_memory_fd::Device,
@ -553,7 +553,7 @@ impl VulkanInstance {
Ok(Rc::new(VulkanDevice {
physical_device: phy_dev,
render_node,
sync_ctx: Rc::new(SyncObjCtx::new(gbm.drm.fd())),
sync_ctx: Rc::new(SyncobjCtx::new(gbm.drm.fd())),
gbm: Rc::new(gbm),
instance: self.clone(),
device: Arc::new(device),