diff options
author | Istvan Miklos <istvan.miklos@h-lab.eu> | 2019-09-16 10:21:50 +0200 |
---|---|---|
committer | Istvan Miklos <istvan.miklos@h-lab.eu> | 2019-10-02 12:51:32 +0200 |
commit | 248545ddda503e06bc59b5274c63a6c25da4b355 (patch) | |
tree | b1c7614309ab6d6d6eef5630d989405fe8b97631 /components/script/dom/webgl2renderingcontext.rs | |
parent | 9706cd497da0fcc30c9af04b7d3dc0d4e9d7c8fb (diff) | |
download | servo-248545ddda503e06bc59b5274c63a6c25da4b355.tar.gz servo-248545ddda503e06bc59b5274c63a6c25da4b355.zip |
Initial implementation of WebGLSync
This patch adds initial support for WebGLSync.
Note:
There is no test for the isSync, deleteSync and waitSync functions in the `conformance2/sync/sync-webgl-specific.html`.
Diffstat (limited to 'components/script/dom/webgl2renderingcontext.rs')
-rw-r--r-- | components/script/dom/webgl2renderingcontext.rs | 132 |
1 files changed, 128 insertions, 4 deletions
diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl2renderingcontext.rs index f33b10f7931..ec959177d32 100644 --- a/components/script/dom/webgl2renderingcontext.rs +++ b/components/script/dom/webgl2renderingcontext.rs @@ -28,17 +28,18 @@ use crate::dom::webglrenderingcontext::{ }; use crate::dom::webglshader::WebGLShader; use crate::dom::webglshaderprecisionformat::WebGLShaderPrecisionFormat; +use crate::dom::webglsync::WebGLSync; use crate::dom::webgltexture::WebGLTexture; use crate::dom::webgluniformlocation::WebGLUniformLocation; use crate::dom::window::Window; use crate::script_runtime::JSContext; -/// https://www.khronos.org/registry/webgl/specs/latest/2.0/webgl.idl use canvas_traits::webgl::WebGLError::*; -use canvas_traits::webgl::{GLContextAttributes, WebGLVersion}; +/// https://www.khronos.org/registry/webgl/specs/latest/2.0/webgl.idl +use canvas_traits::webgl::{webgl_channel, GLContextAttributes, WebGLCommand, WebGLVersion}; use dom_struct::dom_struct; use euclid::default::Size2D; use js::jsapi::JSObject; -use js::jsval::{BooleanValue, JSVal, NullValue, UInt32Value}; +use js::jsval::{BooleanValue, Int32Value, JSVal, NullValue, UInt32Value}; use js::rust::CustomAutoRooterGuard; use js::typedarray::ArrayBufferView; use script_layout_interface::HTMLCanvasDataSource; @@ -125,7 +126,12 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext { #[allow(unsafe_code)] /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn GetParameter(&self, cx: JSContext, parameter: u32) -> JSVal { - self.base.GetParameter(cx, parameter) + match parameter { + constants::MAX_CLIENT_WAIT_TIMEOUT_WEBGL => { + Int32Value(self.base.limits().max_client_wait_timeout_webgl.as_nanos() as i32) + }, + _ => self.base.GetParameter(cx, parameter), + } } /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.8 @@ -1197,6 +1203,124 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext { }, } } + + /// https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.14 + fn FenceSync(&self, condition: u32, flags: u32) -> Option<DomRoot<WebGLSync>> { + if flags != 0 { + self.base.webgl_error(InvalidValue); + return None; + } + if condition != constants::SYNC_GPU_COMMANDS_COMPLETE { + self.base.webgl_error(InvalidEnum); + return None; + } + + Some(WebGLSync::new(&self.base)) + } + + /// https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.14 + fn IsSync(&self, sync: Option<&WebGLSync>) -> bool { + match sync { + Some(sync) => { + if !sync.is_valid() { + return false; + } + handle_potential_webgl_error!( + self.base, + self.base.validate_ownership(sync), + return false + ); + let (sender, receiver) = webgl_channel().unwrap(); + self.base + .send_command(WebGLCommand::IsSync(sync.id(), sender)); + receiver.recv().unwrap() + }, + None => false, + } + } + + /// https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.14 + fn ClientWaitSync(&self, sync: &WebGLSync, flags: u32, timeout: u64) -> u32 { + if !sync.is_valid() { + self.base.webgl_error(InvalidOperation); + return constants::WAIT_FAILED; + } + handle_potential_webgl_error!( + self.base, + self.base.validate_ownership(sync), + return constants::WAIT_FAILED + ); + if flags != 0 && flags != constants::SYNC_FLUSH_COMMANDS_BIT { + self.base.webgl_error(InvalidValue); + return constants::WAIT_FAILED; + } + if timeout > self.base.limits().max_client_wait_timeout_webgl.as_nanos() as u64 { + self.base.webgl_error(InvalidOperation); + return constants::WAIT_FAILED; + } + + match sync.client_wait_sync(&self.base, flags, timeout) { + Some(status) => status, + None => constants::WAIT_FAILED, + } + } + + /// https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.14 + fn WaitSync(&self, sync: &WebGLSync, flags: u32, timeout: i64) { + if !sync.is_valid() { + self.base.webgl_error(InvalidOperation); + return; + } + handle_potential_webgl_error!(self.base, self.base.validate_ownership(sync), return); + if flags != 0 { + self.base.webgl_error(InvalidValue); + return; + } + if timeout != constants::TIMEOUT_IGNORED { + self.base.webgl_error(InvalidValue); + return; + } + + self.base + .send_command(WebGLCommand::WaitSync(sync.id(), flags, timeout)); + } + + /// https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.14 + fn GetSyncParameter(&self, _cx: JSContext, sync: &WebGLSync, pname: u32) -> JSVal { + if !sync.is_valid() { + self.base.webgl_error(InvalidOperation); + return NullValue(); + } + handle_potential_webgl_error!( + self.base, + self.base.validate_ownership(sync), + return NullValue() + ); + match pname { + constants::OBJECT_TYPE | constants::SYNC_CONDITION | constants::SYNC_FLAGS => { + let (sender, receiver) = webgl_channel().unwrap(); + self.base + .send_command(WebGLCommand::GetSyncParameter(sync.id(), pname, sender)); + UInt32Value(receiver.recv().unwrap()) + }, + constants::SYNC_STATUS => match sync.get_sync_status(pname, &self.base) { + Some(status) => UInt32Value(status), + None => UInt32Value(constants::UNSIGNALED), + }, + _ => { + self.base.webgl_error(InvalidEnum); + NullValue() + }, + } + } + + /// https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.14 + fn DeleteSync(&self, sync: Option<&WebGLSync>) { + if let Some(sync) = sync { + handle_potential_webgl_error!(self.base, self.base.validate_ownership(sync), return); + sync.delete(false); + } + } } impl LayoutCanvasWebGLRenderingContextHelpers for LayoutDom<WebGL2RenderingContext> { |