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

autocommit 2022-03-29 15:40:59 CEST

Browse source
This commit is contained in:
Julian Orth 2022-03-29 15:40:59 +02:00
parent 6ebf731aea
commit 9842264fad
39 changed files with 121 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/render/egl.rs
View file

@ -28,9 +28,9 @@ pub mod display;
pub mod image;
pub mod sys;
pub(super) static PROCS: Lazy<ExtProc> = Lazy::new(|| ExtProc::load());
pub(super) static PROCS: Lazy<ExtProc> = Lazy::new(ExtProc::load);
pub(super) static EXTS: Lazy<ClientExt> = Lazy::new(|| get_client_ext());
pub(super) static EXTS: Lazy<ClientExt> = Lazy::new(get_client_ext);
pub fn init() -> Result<(), RenderError> {
if !EXTS.contains(ClientExt::EXT_PLATFORM_BASE) {

2
src/render/proc.rs
View file

@ -1,3 +1,3 @@
#![allow(non_snake_case, dead_code)]
#![allow(non_snake_case, dead_code, clippy::unused_unit)]
include!(concat!(env!("OUT_DIR"), "/egl_procs.rs"));

3
src/render/renderer/renderer.rs
View file

@ -19,6 +19,7 @@ use crate::theme::Color;
use crate::tree::{ContainerNode, FloatNode, Node, OutputNode, WorkspaceNode};
use std::ops::Deref;
use std::rc::Rc;
use crate::utils::rc_eq::rc_eq;
pub struct Renderer<'a> {
pub(super) ctx: &'a Rc<RenderContext>,
@ -201,7 +202,7 @@ impl Renderer<'_> {
}
pub fn render_texture(&mut self, texture: &Texture, x: i32, y: i32, format: &Format) {
assert!(Rc::ptr_eq(&self.ctx.ctx, &texture.ctx.ctx));
assert!(rc_eq(&self.ctx.ctx, &texture.ctx.ctx));
unsafe {
glActiveTexture(GL_TEXTURE0);