From 3d7c8ccdbf3d23b788fb977124959e7b279ce5d9 Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Sat, 29 Jan 2022 12:13:10 +0100 Subject: [PATCH] autocommit 2022-01-29 12:13:10 CET --- src/backends/xorg/mod.rs | 8 -------- src/render/renderer/mod.rs | 2 +- src/render/renderer/renderer.rs | 4 ++-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/backends/xorg/mod.rs b/src/backends/xorg/mod.rs index a6e4db1f..e39ce595 100644 --- a/src/backends/xorg/mod.rs +++ b/src/backends/xorg/mod.rs @@ -72,7 +72,6 @@ efrom!(XorgBackendError, WheelError, WheelError); struct XcbCon { xcb: Box, - shm: Box, input: Box, dri: Box, present: Box, @@ -88,7 +87,6 @@ impl XcbCon { fn new() -> Result { unsafe { let xcb = Box::new(Xcb::load_loose()?); - let shm = Box::new(XcbShm::load_loose()?); let input = Box::new(XcbXinput::load_loose()?); let xkb = Box::new(XcbXkb::load_loose()?); let dri = Box::new(XcbDri3::load_loose()?); @@ -100,7 +98,6 @@ impl XcbCon { let mut con = Self { screen: *xcb.xcb_setup_roots_iterator(xcb.xcb_get_setup(c)).data, xcb, - shm, input, dri, present, @@ -115,11 +112,6 @@ impl XcbCon { let mut err = ptr::null_mut(); - let res = - con.shm - .xcb_shm_query_version_reply(c, con.shm.xcb_shm_query_version(c), &mut err); - con.errors.check(&con.xcb, res, err)?; - let res = con.input.xcb_input_xi_query_version_reply( c, con.input.xcb_input_xi_query_version(c, 2, 2), diff --git a/src/render/renderer/mod.rs b/src/render/renderer/mod.rs index b77e7657..f43b7541 100644 --- a/src/render/renderer/mod.rs +++ b/src/render/renderer/mod.rs @@ -10,4 +10,4 @@ mod image; mod renderer; mod texture; -pub const RENDERDOC: bool = true; +pub const RENDERDOC: bool = false; diff --git a/src/render/renderer/renderer.rs b/src/render/renderer/renderer.rs index 2f76cf7b..85171aa4 100644 --- a/src/render/renderer/renderer.rs +++ b/src/render/renderer/renderer.rs @@ -198,9 +198,9 @@ impl Renderer<'_> { } }; } - render!(&children.above); - self.render_buffer(&buffer, x, y); render!(&children.below); + self.render_buffer(&buffer, x, y); + render!(&children.above); } else { self.render_buffer(&buffer, x, y); }