diff options
author | Eric Anholt <eric@anholt.net> | 2016-08-28 16:34:39 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2016-08-28 17:18:09 -0700 |
commit | 847ab63de63343e767265d2825bbed7869358884 (patch) | |
tree | fa9c8d50abbb51c4a88d5b29560594c344a18672 /components/script/dom | |
parent | 1f2346d3b6fa6405df7b4f5be90c4076678875f0 (diff) | |
download | servo-847ab63de63343e767265d2825bbed7869358884.tar.gz servo-847ab63de63343e767265d2825bbed7869358884.zip |
webgl: Add isProgram() support.
There's one failure still, where a deleted program should still be
considered to be a program until it's unbound. However, I recently
made it so that we unbind at delete time, and we may need to partially
back that change out.
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/webglprogram.rs | 4 | ||||
-rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 5 | ||||
-rw-r--r-- | components/script/dom/webidls/WebGLRenderingContext.webidl | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs index 543a551ee17..9ac3f4e1ad4 100644 --- a/components/script/dom/webglprogram.rs +++ b/components/script/dom/webglprogram.rs @@ -87,6 +87,10 @@ impl WebGLProgram { } } + pub fn is_deleted(&self) -> bool { + self.is_deleted.get() + } + /// glLinkProgram pub fn link(&self) { self.linked.set(false); diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 7814296c38a..35647a252ab 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -1403,6 +1403,11 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { frame_buffer.map_or(false, |buf| buf.target().is_some() && !buf.is_deleted()) } + // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 + fn IsProgram(&self, program: Option<&WebGLProgram>) -> bool { + program.map_or(false, |p| !p.is_deleted()) + } + // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.7 fn IsRenderbuffer(&self, render_buffer: Option<&WebGLRenderbuffer>) -> bool { render_buffer.map_or(false, |buf| buf.ever_bound() && !buf.is_deleted()) diff --git a/components/script/dom/webidls/WebGLRenderingContext.webidl b/components/script/dom/webidls/WebGLRenderingContext.webidl index eea550a5bc0..e95ce00e5e5 100644 --- a/components/script/dom/webidls/WebGLRenderingContext.webidl +++ b/components/script/dom/webidls/WebGLRenderingContext.webidl @@ -605,7 +605,7 @@ interface WebGLRenderingContextBase [WebGLHandlesContextLoss] GLboolean isBuffer(WebGLBuffer? buffer); //[WebGLHandlesContextLoss] GLboolean isEnabled(GLenum cap); [WebGLHandlesContextLoss] GLboolean isFramebuffer(WebGLFramebuffer? framebuffer); - //[WebGLHandlesContextLoss] GLboolean isProgram(WebGLProgram? program); + [WebGLHandlesContextLoss] GLboolean isProgram(WebGLProgram? program); [WebGLHandlesContextLoss] GLboolean isRenderbuffer(WebGLRenderbuffer? renderbuffer); [WebGLHandlesContextLoss] GLboolean isShader(WebGLShader? shader); [WebGLHandlesContextLoss] GLboolean isTexture(WebGLTexture? texture); |