diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2018-07-07 21:52:10 +0200 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2018-07-08 10:11:44 +0200 |
| commit | 6996d1ce369f8335ffa9e303fbcf1c917fe7c3e9 (patch) | |
| tree | b6c16e6348d2078e44f60a2cc25339afc27c409b /components/script/dom/webglrenderingcontext.rs | |
| parent | 0e93f06d8dcf04a50571c525aa2b6f767ef734ff (diff) | |
| download | servo-6996d1ce369f8335ffa9e303fbcf1c917fe7c3e9.tar.gz servo-6996d1ce369f8335ffa9e303fbcf1c917fe7c3e9.zip | |
Fix gl.getShaderSource and gl.getShaderInfoLog
It only returns null if there was an error, and the only error isn't
implemented yet.
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
| -rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 8ea538c8c92..26b033ae321 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -2527,7 +2527,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 fn GetShaderInfoLog(&self, shader: &WebGLShader) -> Option<DOMString> { - shader.info_log().map(DOMString::from) + // TODO(nox): https://github.com/servo/servo/issues/21133 + Some(shader.info_log()) } #[allow(unsafe_code)] @@ -2973,7 +2974,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 fn GetShaderSource(&self, shader: &WebGLShader) -> Option<DOMString> { - shader.source() + // TODO(nox): https://github.com/servo/servo/issues/21133 + Some(shader.source()) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 |