Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

webgl: Remove unnecessary Option from texture API.

Browse source
This commit is contained in:
Josh Matthews 2018-08-15 13:13:26 -04:00
parent f37124563b
commit 03f6ce292e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/webgltexture.rs
View file

@ -146,7 +146,7 @@ impl WebGLTexture {
} }
}; };
let base_image_info = self.base_image_info().unwrap(); let base_image_info = self.base_image_info();
if !base_image_info.is_initialized() { if !base_image_info.is_initialized() {
return Err(WebGLError::InvalidOperation); return Err(WebGLError::InvalidOperation);
} }
@ -327,7 +327,7 @@ impl WebGLTexture {
fn is_cube_complete(&self) -> bool { fn is_cube_complete(&self) -> bool {
debug_assert_eq!(self.face_count.get(), 6); debug_assert_eq!(self.face_count.get(), 6);
let image_info = self.base_image_info().unwrap(); let image_info = self.base_image_info();
if !image_info.is_defined() { if !image_info.is_defined() {
return false; return false;
} }
@ -389,10 +389,10 @@ impl WebGLTexture {
self.image_info_array.borrow_mut()[pos as usize] = image_info; self.image_info_array.borrow_mut()[pos as usize] = image_info;
} }
fn base_image_info(&self) -> Option<ImageInfo> { fn base_image_info(&self) -> ImageInfo {
assert!((self.base_mipmap_level as usize) < MAX_LEVEL_COUNT); assert!((self.base_mipmap_level as usize) < MAX_LEVEL_COUNT);
Some(self.image_info_at_face(0, self.base_mipmap_level)) self.image_info_at_face(0, self.base_mipmap_level)
} }
pub fn set_attached_to_dom(&self) { pub fn set_attached_to_dom(&self) {