diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-05-25 00:45:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 00:45:33 -0400 |
| commit | 31f91ec3e1871ace39bad2207c2d15b22fd09e33 (patch) | |
| tree | 293728808238b4903e2162933b8b6d439feec553 | |
| parent | f63284efc04b298b010f34f5225a3fa9014bf763 (diff) | |
| parent | b5232673491572733123383920aafc9a92f6e540 (diff) | |
| download | servo-31f91ec3e1871ace39bad2207c2d15b22fd09e33.tar.gz servo-31f91ec3e1871ace39bad2207c2d15b22fd09e33.zip | |
Auto merge of #20854 - servo:webgl, r=emilio
Drive-by fixes in WebGL
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20854)
<!-- Reviewable:end -->
| -rw-r--r-- | components/script/dom/mod.rs | 1 | ||||
| -rw-r--r-- | components/script/dom/webgl_extensions/ext/mod.rs | 1 | ||||
| -rw-r--r-- | components/script/dom/webgl_extensions/extensions.rs | 1 | ||||
| -rw-r--r-- | components/script/dom/webglvertexarrayobjectoes.rs (renamed from components/script/dom/webgl_extensions/ext/webglvertexarrayobjectoes.rs) | 0 |
4 files changed, 2 insertions, 1 deletions
diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs index 73293342ac8..61e7522cfcf 100644 --- a/components/script/dom/mod.rs +++ b/components/script/dom/mod.rs @@ -481,6 +481,7 @@ pub mod webglshader; pub mod webglshaderprecisionformat; pub mod webgltexture; pub mod webgluniformlocation; +pub mod webglvertexarrayobjectoes; pub mod websocket; pub mod window; pub mod windowproxy; diff --git a/components/script/dom/webgl_extensions/ext/mod.rs b/components/script/dom/webgl_extensions/ext/mod.rs index 71713a45a47..e64ffb9aa40 100644 --- a/components/script/dom/webgl_extensions/ext/mod.rs +++ b/components/script/dom/webgl_extensions/ext/mod.rs @@ -12,4 +12,3 @@ pub mod oestexturefloatlinear; pub mod oestexturehalffloat; pub mod oestexturehalffloatlinear; pub mod oesvertexarrayobject; -pub mod webglvertexarrayobjectoes; diff --git a/components/script/dom/webgl_extensions/extensions.rs b/components/script/dom/webgl_extensions/extensions.rs index 7e7ccf301e7..92a34bac23e 100644 --- a/components/script/dom/webgl_extensions/extensions.rs +++ b/components/script/dom/webgl_extensions/extensions.rs @@ -237,6 +237,7 @@ impl WebGLExtensions { } fn register_all_extensions(&self) { + self.register::<ext::oeselementindexuint::OESElementIndexUint>(); self.register::<ext::oesstandardderivatives::OESStandardDerivatives>(); self.register::<ext::oestexturefloat::OESTextureFloat>(); self.register::<ext::oestexturefloatlinear::OESTextureFloatLinear>(); diff --git a/components/script/dom/webgl_extensions/ext/webglvertexarrayobjectoes.rs b/components/script/dom/webglvertexarrayobjectoes.rs index 4ca8c7b7add..4ca8c7b7add 100644 --- a/components/script/dom/webgl_extensions/ext/webglvertexarrayobjectoes.rs +++ b/components/script/dom/webglvertexarrayobjectoes.rs |