autocommit 2022-01-29 00:49:52 CET

src/render/gl/sys.rs

@@ -7,6 +7,7 @@ pub type GLenum = c::c_uint;
 pub type GLfloat = f32;
 pub type GLint = c::c_int;
 pub type GLsizei = c::c_int;
+#[allow(dead_code)]
 pub type GLubyte = u8;
 pub type GLuint = c::c_uint;
 
@@ -29,6 +30,7 @@ pub const GL_RENDERBUFFER: GLenum = 0x8D41;
 pub const GL_SCISSOR_TEST: GLenum = 0x0C11;
 pub const GL_TEXTURE0: GLenum = 0x84C0;
 pub const GL_TEXTURE_2D: GLenum = 0x0DE1;
+#[allow(dead_code)]
 pub const GL_TEXTURE_MAG_FILTER: GLenum = 0x2800;
 pub const GL_TEXTURE_MIN_FILTER: GLenum = 0x2801;
 pub const GL_TEXTURE_WRAP_S: GLenum = 0x2802;
@@ -54,6 +56,7 @@ extern "C" {
         renderbuffertarget: GLenum,
         renderbuffer: GLuint,
     );
+    #[allow(dead_code)]
     pub fn glFramebufferTexture2D(
         target: GLenum,
         attachment: GLenum,
@@ -64,6 +67,7 @@ extern "C" {
     pub fn glCheckFramebufferStatus(target: GLenum) -> GLenum;
     pub fn glClear(mask: GLbitfield);
     pub fn glClearColor(red: GLfloat, green: GLfloat, blue: GLfloat, alpha: GLfloat);
+    #[allow(dead_code)]
     pub fn glFlush();
 
     pub fn glGenTextures(n: GLsizei, textures: *mut GLuint);
@@ -112,6 +116,7 @@ extern "C" {
     pub fn glGetUniformLocation(prog: GLuint, name: *const GLchar) -> GLint;
     pub fn glGetAttribLocation(prog: GLuint, name: *const GLchar) -> GLint;
     pub fn glUniform1i(location: GLint, v0: GLint);
+    #[allow(dead_code)]
     pub fn glUniform1f(location: GLint, v0: GLfloat);
     pub fn glUniform4f(location: GLint, v0: GLfloat, v1: GLfloat, v2: GLfloat, v3: GLfloat);
     pub fn glVertexAttribPointer(

src/render/gl/texture.rs

@@ -1,5 +1,7 @@
 use crate::format::Format;
 use crate::render::egl::context::EglContext;
+use crate::render::egl::image::EglImage;
+use crate::render::egl::PROCS;
 use crate::render::gl::frame_buffer::GlFrameBuffer;
 use crate::render::gl::sys::{
     glBindFramebuffer, glBindTexture, glCheckFramebufferStatus, glDeleteTextures,
@@ -8,6 +10,7 @@ use crate::render::gl::sys::{
     GL_FRAMEBUFFER_COMPLETE, GL_LINEAR, GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
     GL_TEXTURE_MIN_FILTER, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_UNPACK_ROW_LENGTH_EXT,
 };
+use crate::render::sys::GLeglImageOES;
 use crate::render::RenderError;
 use std::cell::Cell;
 use std::ptr;
@@ -15,12 +18,14 @@ use std::rc::Rc;
 
 pub struct GlTexture {
     pub(super) ctx: Rc<EglContext>,
+    pub img: Option<Rc<EglImage>>,
     pub tex: GLuint,
     pub width: i32,
     pub height: i32,
 }
 
 impl GlTexture {
+    #[allow(dead_code)]
     pub fn new(
         ctx: &Rc<EglContext>,
         format: &'static Format,
@@ -49,12 +54,14 @@ impl GlTexture {
         })?;
         Ok(Rc::new(GlTexture {
             ctx: ctx.clone(),
+            img: None,
             tex,
             width,
             height,
         }))
     }
 
+    #[allow(dead_code)]
     pub unsafe fn to_framebuffer(self: &Rc<Self>) -> Result<Rc<GlFrameBuffer>, RenderError> {
         self.ctx.with_current(|| unsafe {
             let mut fbo = 0;
@@ -84,7 +91,27 @@ impl GlTexture {
         })
     }
 
-    pub fn import_texture(
+    pub fn import_img(ctx: &Rc<EglContext>, img: &Rc<EglImage>) -> Result<GlTexture, RenderError> {
+        let tex = ctx.with_current(|| unsafe {
+            let mut tex = 0;
+            glGenTextures(1, &mut tex);
+            glBindTexture(GL_TEXTURE_2D, tex);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+            PROCS.glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, GLeglImageOES(img.img.0));
+            glBindTexture(GL_TEXTURE_2D, 0);
+            Ok(tex)
+        })?;
+        Ok(GlTexture {
+            ctx: ctx.clone(),
+            img: Some(img.clone()),
+            tex,
+            width: img.width,
+            height: img.height,
+        })
+    }
+
+    pub fn import_shm(
         ctx: &Rc<EglContext>,
         data: &[Cell<u8>],
         format: &'static Format,
@@ -119,6 +146,7 @@ impl GlTexture {
         })?;
         Ok(GlTexture {
             ctx: ctx.clone(),
+            img: None,
             tex,
             width,
             height,
@@ -128,11 +156,9 @@ impl GlTexture {
 
 impl Drop for GlTexture {
     fn drop(&mut self) {
-        unsafe {
-            self.ctx.with_current(|| {
-                glDeleteTextures(1, &self.tex);
-                Ok(())
-            });
-        }
+        let _ = self.ctx.with_current(|| unsafe {
+            glDeleteTextures(1, &self.tex);
+            Ok(())
+        });
     }
 }