Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move prepare_pixels helper functions to canvas_traits

Browse source
This commit is contained in:
Anthony Ramine 2018-11-15 10:01:19 +01:00
parent 86987ed75d
commit adf363a208
12 changed files with 481 additions and 476 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/webgl_validations/tex_image_2d.rs
View file

@ -2,9 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use super::types::{TexDataType, TexFormat, TexImageTarget};
use super::types::TexImageTarget;
use super::WebGLValidator;
use canvas_traits::webgl::WebGLError::*;
use canvas_traits::webgl::{TexDataType, TexFormat, WebGLError::*};
use crate::dom::bindings::root::DomRoot;
use crate::dom::webglrenderingcontext::WebGLRenderingContext;
use crate::dom::webgltexture::WebGLTexture;

109
components/script/dom/webgl_validations/types.rs
View file

@ -2,47 +2,21 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use crate::dom::bindings::codegen::Bindings::OESTextureHalfFloatBinding::OESTextureHalfFloatConstants;
use crate::dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants;
use canvas_traits::gl_enums;
use crate::dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants;
/// This macro creates type-safe wrappers for WebGL types, associating variants
/// with gl constants.
macro_rules! type_safe_wrapper {
($name: ident, $($variant:ident => $mod:ident::$constant:ident, )+) => {
#[derive(Clone, Copy, Debug, Eq, Hash, JSTraceable, MallocSizeOf, PartialEq)]
#[repr(u32)]
pub enum $name {
$(
$variant = $mod::$constant,
)+
}
impl $name {
pub fn from_gl_constant(constant: u32) -> Option<Self> {
Some(match constant {
$($mod::$constant => $name::$variant, )+
_ => return None,
})
}
#[inline]
pub fn as_gl_constant(&self) -> u32 {
*self as u32
}
}
gl_enums! {
pub enum TexImageTarget {
Texture2D = WebGLRenderingContextConstants::TEXTURE_2D,
CubeMapPositiveX = WebGLRenderingContextConstants::TEXTURE_CUBE_MAP_POSITIVE_X,
CubeMapNegativeX = WebGLRenderingContextConstants::TEXTURE_CUBE_MAP_NEGATIVE_X,
CubeMapPositiveY = WebGLRenderingContextConstants::TEXTURE_CUBE_MAP_POSITIVE_Y,
CubeMapNegativeY = WebGLRenderingContextConstants::TEXTURE_CUBE_MAP_NEGATIVE_Y,
CubeMapPositiveZ = WebGLRenderingContextConstants::TEXTURE_CUBE_MAP_POSITIVE_Z,
CubeMapNegativeZ = WebGLRenderingContextConstants::TEXTURE_CUBE_MAP_NEGATIVE_Z,
}
}
type_safe_wrapper! { TexImageTarget,
Texture2D => constants::TEXTURE_2D,
CubeMapPositiveX => constants::TEXTURE_CUBE_MAP_POSITIVE_X,
CubeMapNegativeX => constants::TEXTURE_CUBE_MAP_NEGATIVE_X,
CubeMapPositiveY => constants::TEXTURE_CUBE_MAP_POSITIVE_Y,
CubeMapNegativeY => constants::TEXTURE_CUBE_MAP_NEGATIVE_Y,
CubeMapPositiveZ => constants::TEXTURE_CUBE_MAP_POSITIVE_Z,
CubeMapNegativeZ => constants::TEXTURE_CUBE_MAP_NEGATIVE_Z,
}
impl TexImageTarget {
pub fn is_cubic(&self) -> bool {
match *self {
@ -51,64 +25,3 @@ impl TexImageTarget {
}
}
}
type_safe_wrapper! { TexDataType,
UnsignedByte => constants::UNSIGNED_BYTE,
UnsignedShort4444 => constants::UNSIGNED_SHORT_4_4_4_4,
UnsignedShort5551 => constants::UNSIGNED_SHORT_5_5_5_1,
UnsignedShort565 => constants::UNSIGNED_SHORT_5_6_5,
Float => constants::FLOAT,
HalfFloat => OESTextureHalfFloatConstants::HALF_FLOAT_OES,
}
impl TexDataType {
/// Returns the size in bytes of each element of data.
pub fn element_size(&self) -> u32 {
use self::TexDataType::*;
match *self {
UnsignedByte => 1,
UnsignedShort4444 | UnsignedShort5551 | UnsignedShort565 => 2,
Float => 4,
HalfFloat => 2,
}
}
/// Returns how many components a single element may hold. For example, a
/// UnsignedShort4444 holds four components, each with 4 bits of data.
pub fn components_per_element(&self) -> u32 {
use self::TexDataType::*;
match *self {
UnsignedByte => 1,
UnsignedShort565 => 3,
UnsignedShort5551 => 4,
UnsignedShort4444 => 4,
Float => 1,
HalfFloat => 1,
}
}
}
type_safe_wrapper! { TexFormat,
DepthComponent => constants::DEPTH_COMPONENT,
Alpha => constants::ALPHA,
RGB => constants::RGB,
RGBA => constants::RGBA,
Luminance => constants::LUMINANCE,
LuminanceAlpha => constants::LUMINANCE_ALPHA,
}
impl TexFormat {
/// Returns how many components does this format need. For example, RGBA
/// needs 4 components, while RGB requires 3.
pub fn components(&self) -> u32 {
use self::TexFormat::*;
match *self {
DepthComponent => 1,
Alpha => 1,
Luminance => 1,
LuminanceAlpha => 2,
RGB => 3,
RGBA => 4,
}
}
}