Merge branch 'master' into clippy
This commit is contained in:
commit
af9aa0efc1
|
@ -537,8 +537,7 @@ impl Program {
|
|||
|
||||
pub fn uniform_location(&self, name: &str) -> Option<Uniform> {
|
||||
let c_name = ffi::CString::new(name).unwrap();
|
||||
let u =
|
||||
unsafe { gl::GetUniformLocation(self.0, c_name.as_ptr()) };
|
||||
let u = unsafe { gl::GetUniformLocation(self.0, c_name.as_ptr()) };
|
||||
if u != -1 {
|
||||
Some(Uniform(u))
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue