Skip to content
This repository was archived by the owner on Aug 3, 2024. It is now read-only.

Privatize the renderer in Compositor #298

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
privatize the renderer
SethBarberee committed Apr 9, 2019
commit 61ec8de13481b52283dffb543645a73da0c0ea08
7 changes: 6 additions & 1 deletion src/compositor.rs
Original file line number Diff line number Diff line change
@@ -140,7 +140,7 @@ pub struct Compositor {
/// Optional screenshooter manager extension
pub screenshooter: Option<screenshooter::Screenshooter>,
/// The renderer used to draw things to the screen.
pub renderer: Option<GenericRenderer>,
renderer: Option<GenericRenderer>,
/// XWayland server, only Some if it is enabled
pub xwayland: Option<xwayland::Server>,
/// The DnD manager
@@ -693,6 +693,11 @@ impl Compositor {
self.socket_name.as_str()
}

/// Returns a reference to the Renderer for the Compositor
pub fn get_renderer(&self) -> &Option<GenericRenderer> {
&self.renderer
}

/// Enters the wayland event loop. Won't return until the compositor is
/// shut off.
pub fn run(self) {
2 changes: 1 addition & 1 deletion src/types/dmabuf.rs
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ impl Dmabuf {
pub fn new(compositor: &Compositor) -> Option<Self> {
unsafe {
// Get the renderer from compositor
let renderer: Option<&GenericRenderer> = compositor.renderer.as_ref();
let renderer: Option<&GenericRenderer> = compositor.get_renderer().as_ref();
match renderer {
Some(ref renderer) => {
let dmabuf_raw = wlr_linux_dmabuf_v1_create(compositor.display as *mut wl_display, renderer.as_ptr());