summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authorJeff Gilbert <jgilbert@mozilla.com>2018-03-03 00:50:10 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-03-14 12:41:05 +0100
commitece34cca42e69ed882694a0e735c83a1ab61550e (patch)
treec8c4dbf7743f3194f9a6fd93a0321d992adb97cb /dom
parentc9e08a8af9cc2b9597d75eef1192595252a29550 (diff)
downloadUXP-ece34cca42e69ed882694a0e735c83a1ab61550e.tar
UXP-ece34cca42e69ed882694a0e735c83a1ab61550e.tar.gz
UXP-ece34cca42e69ed882694a0e735c83a1ab61550e.tar.lz
UXP-ece34cca42e69ed882694a0e735c83a1ab61550e.tar.xz
UXP-ece34cca42e69ed882694a0e735c83a1ab61550e.zip
Bug 1442504 - Disable disjoint timer queries. r=milan, a=RyanVM
MozReview-Commit-ID: IurPcGHzAoQ --HG-- extra : source : bef3db82d7ca31a188f902e317713c88001938ed extra : intermediate-source : aeb9e1be02d26d4e21717368755b63821dc2d222
Diffstat (limited to 'dom')
-rw-r--r--dom/canvas/WebGLContextExtensions.cpp4
-rw-r--r--dom/canvas/test/webgl-mochitest/mochitest.ini2
2 files changed, 3 insertions, 3 deletions
diff --git a/dom/canvas/WebGLContextExtensions.cpp b/dom/canvas/WebGLContextExtensions.cpp
index 28ba14fa2..4a5a23274 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 d5bc8701d..ddd0dd762 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]