aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2018-03-23 02:47:39 +0100
committerAnthony Ramine <n.oxyde@gmail.com>2018-03-23 02:47:39 +0100
commit838d1305cabea1296b6d87dd31e810b0338704a1 (patch)
tree8df3c01a2be97461fd4dfad7cbce56a49640ef2e /components/script/dom
parent8061d8c3d291c27754f321997d30282563d1a228 (diff)
downloadservo-838d1305cabea1296b6d87dd31e810b0338704a1.tar.gz
servo-838d1305cabea1296b6d87dd31e810b0338704a1.zip
Implement OES_element_index_uint (fixes #20384)
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/webgl_extensions/ext/mod.rs1
-rw-r--r--components/script/dom/webgl_extensions/ext/oeselementindexuint.rs50
-rw-r--r--components/script/dom/webgl_extensions/extensions.rs20
-rw-r--r--components/script/dom/webglrenderingcontext.rs1
-rw-r--r--components/script/dom/webidls/OESElementIndexUint.webidl11
5 files changed, 79 insertions, 4 deletions
diff --git a/components/script/dom/webgl_extensions/ext/mod.rs b/components/script/dom/webgl_extensions/ext/mod.rs
index 1c3994fba40..71713a45a47 100644
--- a/components/script/dom/webgl_extensions/ext/mod.rs
+++ b/components/script/dom/webgl_extensions/ext/mod.rs
@@ -5,6 +5,7 @@
use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants;
use super::{ext_constants, WebGLExtension, WebGLExtensions, WebGLExtensionSpec};
+pub mod oeselementindexuint;
pub mod oesstandardderivatives;
pub mod oestexturefloat;
pub mod oestexturefloatlinear;
diff --git a/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs b/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs
new file mode 100644
index 00000000000..007cd72d18f
--- /dev/null
+++ b/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs
@@ -0,0 +1,50 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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 canvas_traits::webgl::WebGLVersion;
+use dom::bindings::codegen::Bindings::OESElementIndexUintBinding;
+use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
+use dom::bindings::root::DomRoot;
+use dom::webglrenderingcontext::WebGLRenderingContext;
+use dom_struct::dom_struct;
+use super::{WebGLExtension, WebGLExtensions, WebGLExtensionSpec};
+
+#[dom_struct]
+pub struct OESElementIndexUint {
+ reflector_: Reflector,
+}
+
+impl OESElementIndexUint {
+ fn new_inherited() -> Self {
+ Self { reflector_: Reflector::new() }
+ }
+}
+
+impl WebGLExtension for OESElementIndexUint {
+ type Extension = Self;
+
+ fn new(ctx: &WebGLRenderingContext) -> DomRoot<Self> {
+ reflect_dom_object(
+ Box::new(OESElementIndexUint::new_inherited()),
+ &*ctx.global(),
+ OESElementIndexUintBinding::Wrap,
+ )
+ }
+
+ fn spec() -> WebGLExtensionSpec {
+ WebGLExtensionSpec::Specific(WebGLVersion::WebGL1)
+ }
+
+ fn is_supported(ext: &WebGLExtensions) -> bool {
+ ext.supports_gl_extension("GL_OES_element_index_uint")
+ }
+
+ fn enable(ext: &WebGLExtensions) {
+ ext.enable_element_index_uint();
+ }
+
+ fn name() -> &'static str {
+ "OES_element_index_uint"
+ }
+}
diff --git a/components/script/dom/webgl_extensions/extensions.rs b/components/script/dom/webgl_extensions/extensions.rs
index 3c22817d555..7e7ccf301e7 100644
--- a/components/script/dom/webgl_extensions/extensions.rs
+++ b/components/script/dom/webgl_extensions/extensions.rs
@@ -57,17 +57,20 @@ struct WebGLExtensionFeatures {
hint_targets: FnvHashSet<GLenum>,
/// WebGL GetParameter() names enabled by extensions.
disabled_get_parameter_names: FnvHashSet<GLenum>,
+ /// WebGL OES_element_index_uint extension.
+ element_index_uint_enabled: bool,
}
impl WebGLExtensionFeatures {
fn new(webgl_version: WebGLVersion) -> Self {
- let (disabled_tex_types, disabled_get_parameter_names) = match webgl_version {
+ let (disabled_tex_types, disabled_get_parameter_names, element_index_uint_enabled) = match webgl_version {
WebGLVersion::WebGL1 => {
(DEFAULT_DISABLED_TEX_TYPES_WEBGL1.iter().cloned().collect(),
- DEFAULT_DISABLED_GET_PARAMETER_NAMES_WEBGL1.iter().cloned().collect())
+ DEFAULT_DISABLED_GET_PARAMETER_NAMES_WEBGL1.iter().cloned().collect(),
+ false)
},
WebGLVersion::WebGL2 => {
- (Default::default(), Default::default())
+ (Default::default(), Default::default(), true)
}
};
Self {
@@ -78,6 +81,7 @@ impl WebGLExtensionFeatures {
query_parameter_handlers: Default::default(),
hint_targets: Default::default(),
disabled_get_parameter_names,
+ element_index_uint_enabled,
}
}
}
@@ -96,7 +100,7 @@ impl WebGLExtensions {
Self {
extensions: DomRefCell::new(HashMap::new()),
features: DomRefCell::new(WebGLExtensionFeatures::new(webgl_version)),
- webgl_version
+ webgl_version,
}
}
@@ -240,6 +244,14 @@ impl WebGLExtensions {
self.register::<ext::oestexturehalffloatlinear::OESTextureHalfFloatLinear>();
self.register::<ext::oesvertexarrayobject::OESVertexArrayObject>();
}
+
+ pub fn enable_element_index_uint(&self) {
+ self.features.borrow_mut().element_index_uint_enabled = true;
+ }
+
+ pub fn is_element_index_uint_enabled(&self) -> bool {
+ self.features.borrow().element_index_uint_enabled
+ }
}
// Helper structs
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 806fee89899..37d117a93fd 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -2163,6 +2163,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
let type_size = match type_ {
constants::UNSIGNED_BYTE => 1,
constants::UNSIGNED_SHORT => 2,
+ constants::UNSIGNED_INT if self.extension_manager.is_element_index_uint_enabled() => 4,
_ => return self.webgl_error(InvalidEnum),
};
diff --git a/components/script/dom/webidls/OESElementIndexUint.webidl b/components/script/dom/webidls/OESElementIndexUint.webidl
new file mode 100644
index 00000000000..b1d34ca957c
--- /dev/null
+++ b/components/script/dom/webidls/OESElementIndexUint.webidl
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+/*
+ * WebGL IDL definitions from the Khronos specification:
+ * https://www.khronos.org/registry/webgl/extensions/OES_element_index_uint/
+ */
+
+[NoInterfaceObject]
+interface OESElementIndexUint {
+};