aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Meissl <meissl.christian@gmail.com>2024-01-24 20:58:58 +0100
committerIvan Molodetskikh <yalterz@gmail.com>2024-01-25 07:49:51 +0400
commit20326b093c57bed7a3e423a16c202a69d3ad8c09 (patch)
tree04f04c8beb03b0a36f083960072c5611ab52f296
parent467d92a4b448b4cb28a18e0d468c48984869c0b7 (diff)
downloadniri-20326b093c57bed7a3e423a16c202a69d3ad8c09.tar.gz
niri-20326b093c57bed7a3e423a16c202a69d3ad8c09.tar.bz2
niri-20326b093c57bed7a3e423a16c202a69d3ad8c09.zip
Update smithay
-rw-r--r--Cargo.lock4
-rw-r--r--src/backend/tty.rs6
-rw-r--r--src/config_error_notification.rs2
-rw-r--r--src/exit_confirm_dialog.rs2
-rw-r--r--src/hotkey_overlay.rs2
5 files changed, 8 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 52297757..4344b8aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2692,7 +2692,7 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
[[package]]
name = "smithay"
version = "0.3.0"
-source = "git+https://github.com/Smithay/smithay.git#599fdecf11e0e1efc919f12f6de81a0d5ac23252"
+source = "git+https://github.com/Smithay/smithay.git#8854dee7c2f49e9077f10d484b0de9a8e81c587c"
dependencies = [
"appendlist",
"bitflags 2.4.2",
@@ -2763,7 +2763,7 @@ dependencies = [
[[package]]
name = "smithay-drm-extras"
version = "0.1.0"
-source = "git+https://github.com/Smithay/smithay.git#599fdecf11e0e1efc919f12f6de81a0d5ac23252"
+source = "git+https://github.com/Smithay/smithay.git#8854dee7c2f49e9077f10d484b0de9a8e81c587c"
dependencies = [
"drm",
"edid-rs",
diff --git a/src/backend/tty.rs b/src/backend/tty.rs
index f85b8d7b..d5c51d96 100644
--- a/src/backend/tty.rs
+++ b/src/backend/tty.rs
@@ -20,7 +20,7 @@ use smithay::backend::drm::{
use smithay::backend::egl::context::ContextPriority;
use smithay::backend::egl::{EGLContext, EGLDevice, EGLDisplay};
use smithay::backend::libinput::{LibinputInputBackend, LibinputSessionInterface};
-use smithay::backend::renderer::gles::{Capability, GlesRenderer, GlesTexture};
+use smithay::backend::renderer::gles::{Capability, GlesRenderer};
use smithay::backend::renderer::multigpu::gbm::GbmGlesBackend;
use smithay::backend::renderer::multigpu::{GpuManager, MultiFrame, MultiRenderer};
use smithay::backend::renderer::{DebugFlags, ImportDma, ImportEgl, Renderer};
@@ -367,7 +367,7 @@ impl Tty {
let (drm, drm_notifier) = DrmDevice::new(device_fd.clone(), true)?;
let gbm = GbmDevice::new(device_fd)?;
- let display = EGLDisplay::new(gbm.clone())?;
+ let display = unsafe { EGLDisplay::new(gbm.clone())? };
let egl_device = EGLDevice::device_for_display(&display)?;
// HACK: There's an issue in Smithay where the display created by GpuManager will be the
@@ -1018,7 +1018,7 @@ impl Tty {
// Hand them over to the DRM.
let drm_compositor = &mut surface.compositor;
- match drm_compositor.render_frame::<_, _, GlesTexture>(&mut renderer, &elements, [0.; 4]) {
+ match drm_compositor.render_frame::<_, _>(&mut renderer, &elements, [0.; 4]) {
Ok(res) => {
if self
.config
diff --git a/src/config_error_notification.rs b/src/config_error_notification.rs
index 6e54ead6..37e0f2e8 100644
--- a/src/config_error_notification.rs
+++ b/src/config_error_notification.rs
@@ -184,7 +184,7 @@ fn render(scale: i32) -> anyhow::Result<MemoryRenderBuffer> {
drop(cr);
let data = surface.take_data().unwrap();
- let buffer = MemoryRenderBuffer::from_memory(
+ let buffer = MemoryRenderBuffer::from_slice(
&data,
Fourcc::Argb8888,
(width, height),
diff --git a/src/exit_confirm_dialog.rs b/src/exit_confirm_dialog.rs
index d3464e04..fd9a24af 100644
--- a/src/exit_confirm_dialog.rs
+++ b/src/exit_confirm_dialog.rs
@@ -149,7 +149,7 @@ fn render(scale: i32) -> anyhow::Result<MemoryRenderBuffer> {
drop(cr);
let data = surface.take_data().unwrap();
- let buffer = MemoryRenderBuffer::from_memory(
+ let buffer = MemoryRenderBuffer::from_slice(
&data,
Fourcc::Argb8888,
(width, height),
diff --git a/src/hotkey_overlay.rs b/src/hotkey_overlay.rs
index 84601277..bffec58b 100644
--- a/src/hotkey_overlay.rs
+++ b/src/hotkey_overlay.rs
@@ -338,7 +338,7 @@ fn render(config: &Config, comp_mod: CompositorMod, scale: i32) -> anyhow::Resul
drop(cr);
let data = surface.take_data().unwrap();
- let buffer = MemoryRenderBuffer::from_memory(
+ let buffer = MemoryRenderBuffer::from_slice(
&data,
Fourcc::Argb8888,
(width, height),