texture_program

Author: ids1024

src/backend/renderer/gles/mod.rs

@@ -1977,16 +1977,15 @@ impl GlesRenderer {
         shader: impl AsRef<str>,
         additional_uniforms: &[UniformName<'_>],
     ) -> Result<GlesTexProgram, GlesError> {
-        unsafe {
-            self.context.egl().make_current()?;
-        }
+        let destruction_callback_sender = self.gles_cleanup().sender.clone();
+        let gl = unsafe { self.context.make_current()? };
 
         unsafe {
             texture_program(
-                &self.context.gl,
+                &gl,
                 shader.as_ref(),
                 additional_uniforms,
-                self.gles_cleanup().sender.clone(),
+                destruction_callback_sender,
             )
         }
     }

src/backend/renderer/gles/shaders/mod.rs

@@ -115,7 +115,7 @@ pub unsafe fn link_program(
 }
 
 pub(super) unsafe fn texture_program(
-    gl: &ffi::Gles2,
+    gl: &CurrentGlesContext<'_>,
     src: &str,
     additional_uniforms: &[UniformName<'_>],
     destruction_callback_sender: Sender<CleanupResource>,
@@ -220,7 +220,7 @@ pub(super) unsafe fn texture_program(
     })))
 }
 
-pub(super) unsafe fn solid_program(gl: &ffi::Gles2) -> Result<GlesSolidProgram, GlesError> {
+pub(super) unsafe fn solid_program(gl: &CurrentGlesContext<'_>) -> Result<GlesSolidProgram, GlesError> {
     let program = link_program(gl, shaders::VERTEX_SHADER_SOLID, shaders::FRAGMENT_SHADER_SOLID)?;
 
     let matrix = c"matrix";