diff options
| author | Jeff Gilbert <jgilbert@mozilla.com> | 2018-03-03 00:50:10 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-03-14 12:41:05 +0100 |
| commit | ece34cca42e69ed882694a0e735c83a1ab61550e (patch) | |
| tree | c8c4dbf7743f3194f9a6fd93a0321d992adb97cb | |
| parent | c9e08a8af9cc2b9597d75eef1192595252a29550 (diff) | |
| download | uxp-ece34cca42e69ed882694a0e735c83a1ab61550e.tar.gz | |
Bug 1442504 - Disable disjoint timer queries. r=milan, a=RyanVM
MozReview-Commit-ID: IurPcGHzAoQ
--HG--
extra : source : bef3db82d7ca31a188f902e317713c88001938ed
extra : intermediate-source : aeb9e1be02d26d4e21717368755b63821dc2d222
| -rw-r--r-- | dom/canvas/WebGLContextExtensions.cpp | 4 | ||||
| -rw-r--r-- | dom/canvas/test/webgl-mochitest/mochitest.ini | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dom/canvas/WebGLContextExtensions.cpp b/dom/canvas/WebGLContextExtensions.cpp index 28ba14fa22..4a5a232749 100644 --- a/dom/canvas/WebGLContextExtensions.cpp +++ b/dom/canvas/WebGLContextExtensions.cpp @@ -89,6 +89,8 @@ bool WebGLContext::IsExtensionSupported(dom::CallerType callerType, if (allowPrivilegedExts) { switch (ext) { + case WebGLExtensionID::EXT_disjoint_timer_query: + return WebGLExtensionDisjointTimerQuery::IsSupported(this); case WebGLExtensionID::WEBGL_debug_renderer_info: return true; case WebGLExtensionID::WEBGL_debug_shaders: @@ -112,8 +114,6 @@ WebGLContext::IsExtensionSupported(WebGLExtensionID ext) const switch (ext) { // In alphabetical order // EXT_ - case WebGLExtensionID::EXT_disjoint_timer_query: - return WebGLExtensionDisjointTimerQuery::IsSupported(this); case WebGLExtensionID::EXT_texture_filter_anisotropic: return gl->IsExtensionSupported(gl::GLContext::EXT_texture_filter_anisotropic); diff --git a/dom/canvas/test/webgl-mochitest/mochitest.ini b/dom/canvas/test/webgl-mochitest/mochitest.ini index d5bc8701d0..ddd0dd7626 100644 --- a/dom/canvas/test/webgl-mochitest/mochitest.ini +++ b/dom/canvas/test/webgl-mochitest/mochitest.ini @@ -14,7 +14,7 @@ fail-if = (os == 'android') [ensure-exts/test_EXT_color_buffer_half_float.html] fail-if = (os == 'android') [ensure-exts/test_EXT_disjoint_timer_query.html] -fail-if = (os == 'android') || (os == 'mac') || (os == 'win' && os_version == '5.1') +fail-if = 1 [ensure-exts/test_EXT_frag_depth.html] fail-if = (os == 'android') [ensure-exts/test_EXT_sRGB.html] |