vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace hardcoded type casts... 

...with platform types in the gles2 renderer
This commit is contained in:
Christian Meissl 2021-05-13 13:20:40 +02:00 committed by Victor Brekenfeld
parent 5245595037
commit 7016e82bed
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/backend/renderer/gles2/mod.rs
View File

@ -1,6 +1,6 @@
//! Implementation of the rendering traits using OpenGL ES 2 //! Implementation of the rendering traits using OpenGL ES 2
use std::collections::HashSet; use std::{collections::HashSet, os::raw::c_char};
use std::fmt; use std::fmt;
use std::ffi::CStr; use std::ffi::CStr;
use std::ptr; use std::ptr;
@ -189,7 +189,7 @@ unsafe fn compile_shader(
gl.ShaderSource( gl.ShaderSource(
shader, shader,
1, 1,
&src.as_ptr() as *const *const u8 as *const *const i8, &src.as_ptr() as *const *const u8 as *const *const ffi::types::GLchar,
&(src.len() as i32) as *const _, &(src.len() as i32) as *const _,
); );
gl.CompileShader(shader); gl.CompileShader(shader);
@ -242,12 +242,12 @@ unsafe fn texture_program(gl: &ffi::Gles2, frag: &'static str) -> Result<Gles2Pr
Ok(Gles2Program { Ok(Gles2Program {
program, program,
uniform_tex: gl.GetUniformLocation(program, tex.as_ptr() as *const i8), uniform_tex: gl.GetUniformLocation(program, tex.as_ptr() as *const ffi::types::GLchar),
uniform_matrix: gl.GetUniformLocation(program, matrix.as_ptr() as *const i8), uniform_matrix: gl.GetUniformLocation(program, matrix.as_ptr() as *const ffi::types::GLchar),
uniform_invert_y: gl.GetUniformLocation(program, invert_y.as_ptr() as *const i8), uniform_invert_y: gl.GetUniformLocation(program, invert_y.as_ptr() as *const ffi::types::GLchar),
uniform_alpha: gl.GetUniformLocation(program, alpha.as_ptr() as *const i8), uniform_alpha: gl.GetUniformLocation(program, alpha.as_ptr() as *const ffi::types::GLchar),
attrib_position: gl.GetAttribLocation(program, position.as_ptr() as *const i8), attrib_position: gl.GetAttribLocation(program, position.as_ptr() as *const ffi::types::GLchar),
attrib_tex_coords: gl.GetAttribLocation(program, tex_coords.as_ptr() as *const i8), attrib_tex_coords: gl.GetAttribLocation(program, tex_coords.as_ptr() as *const ffi::types::GLchar),
}) })
} }
@ -275,7 +275,7 @@ impl Gles2Renderer {
let (gl, exts, logger) = { let (gl, exts, logger) = {
let gl = ffi::Gles2::load_with(|s| crate::backend::egl::get_proc_address(s) as *const _); let gl = ffi::Gles2::load_with(|s| crate::backend::egl::get_proc_address(s) as *const _);
let ext_ptr = gl.GetString(ffi::EXTENSIONS) as *const i8; let ext_ptr = gl.GetString(ffi::EXTENSIONS) as *const c_char;
if ext_ptr.is_null() { if ext_ptr.is_null() {
return Err(Gles2Error::GLFunctionLoaderError); return Err(Gles2Error::GLFunctionLoaderError);
} }
@ -290,17 +290,17 @@ impl Gles2Renderer {
info!( info!(
log, log,
"GL Version: {:?}", "GL Version: {:?}",
CStr::from_ptr(gl.GetString(ffi::VERSION) as *const i8) CStr::from_ptr(gl.GetString(ffi::VERSION) as *const c_char)
); );
info!( info!(
log, log,
"GL Vendor: {:?}", "GL Vendor: {:?}",
CStr::from_ptr(gl.GetString(ffi::VENDOR) as *const i8) CStr::from_ptr(gl.GetString(ffi::VENDOR) as *const c_char)
); );
info!( info!(
log, log,
"GL Renderer: {:?}", "GL Renderer: {:?}",
CStr::from_ptr(gl.GetString(ffi::RENDERER) as *const i8) CStr::from_ptr(gl.GetString(ffi::RENDERER) as *const c_char)
); );
info!(log, "Supported GL Extensions: {:?}", exts); info!(log, "Supported GL Extensions: {:?}", exts);