Bug 1319160 - Remove redundant webgl disjoint timer extension mochitest r=jgilbert
authorChih-Yi Leu <subsevenx2001@gmail.com>
Fri, 01 Sep 2017 11:41:47 +0800
changeset 427949 c4968101edd01a28302aac2a6114f6782b7bd334
parent 427948 b10fd83a7ba55eec5e3ef4d325ded02d97a8ca15
child 427950 39e9a6b187a3f71f46d02af000ff8203abe4fe71
child 427955 83e27f8afa12874d6579490e98571efd26382b6a
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1319160
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1319160 - Remove redundant webgl disjoint timer extension mochitest r=jgilbert MozReview-Commit-ID: GCUNxcIiF8F
dom/canvas/test/webgl-mochitest/mochitest.ini
dom/canvas/test/webgl-mochitest/test_webgl_disjoint_timer_query.html
--- a/dom/canvas/test/webgl-mochitest/mochitest.ini
+++ b/dom/canvas/test/webgl-mochitest/mochitest.ini
@@ -81,17 +81,16 @@ skip-if = android_version == '18' #Andro
 [test_texsubimage_float.html]
 [test_uninit_data.html]
 [test_webgl_available.html]
 #[test_webgl_color_buffer_float.html]
 # We haven't cleaned up the Try results yet, but let's get this on the books first.
 [test_webgl_conformance.html]
 skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [test_webgl_compressed_texture_es3.html]
-[test_webgl_disjoint_timer_query.html]
 [test_webgl_force_enable.html]
 [test_webgl_request_context.html]
 skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [test_webgl_request_mismatch.html]
 skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [test_webgl2_not_exposed.html]
 skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [test_webgl2_invalidate_framebuffer.html]
deleted file mode 100644
--- a/dom/canvas/test/webgl-mochitest/test_webgl_disjoint_timer_query.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-<meta charset='UTF-8'>
-<title>WebGL test: Test EXT_disjoint_timer_query.</title>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<script src="webgl-util.js"></script>
-</head>
-<body>
-<canvas id="c"></canvas>
-
-<script>
-
-function defer(f)
-{
-    setTimeout(f, 0);
-}
-
-function doTest() {
-  var gl = WebGLUtil.getWebGL('c', true);
-  var ext = gl.getExtension('EXT_disjoint_timer_query');
-  if (!ext) {
-    ok(true, "EXT_disjoint_timer_query may be unsupported.");
-    SimpleTest.finish();
-    return;
-  }
-
-  ok(!ext.getQueryEXT(ext.TIME_ELAPSED_EXT, ext.CURRENT_QUERY_EXT),
-     "No query is active initially.");
-
-  var elapsedQuery = ext.createQueryEXT();
-  ok(elapsedQuery, "Query creation works.");
-  ok(!ext.isQueryEXT(elapsedQuery), "isQuery fails after creation but before bind.");
-
-  ext.beginQueryEXT(ext.TIME_ELAPSED_EXT, elapsedQuery);
-  ok(ext.isQueryEXT(elapsedQuery), "isQuery fails after bind.");
-  ok(ext.getQueryEXT(ext.TIME_ELAPSED_EXT, ext.CURRENT_QUERY_EXT) == elapsedQuery,
-     "Query is active after beginQueryEXT.");
-  ext.endQueryEXT(ext.TIME_ELAPSED_EXT);
-  gl.flush();
-
-  ok(!ext.getQueryEXT(ext.TIME_ELAPSED_EXT, ext.CURRENT_QUERY_EXT),
-     "Query is inactive after endQueryEXT.");
-
-  defer(function() {
-    ok(ext.getQueryObjectEXT(elapsedQuery, ext.QUERY_RESULT_AVAILABLE_EXT),
-       "Time elapsed query is available immediately after flush and event loop tick.");
-
-    ext.deleteQueryEXT(elapsedQuery);
-    ok(!ext.isQueryEXT(elapsedQuery), "Query is no longer valid after deletion.");
-
-    ok(ext.getQueryEXT(ext.TIME_ELAPSED_EXT, ext.QUERY_COUNTER_BITS_EXT) >= 30,
-       "Time elapsed must be at least 30 bits to hold at least 1 second of timing.");
-
-    // D3D11 doesn't support TIMESTAMP_EXT so check for it before using it.
-    if (ext.getQueryEXT(ext.TIMESTAMP_EXT, ext.QUERY_COUNTER_BITS_EXT) > 0) {
-        var timestampQuery = ext.createQueryEXT();
-        ext.queryCounterEXT(timestampQuery, ext.TIMESTAMP_EXT);
-        gl.flush();
-        defer(function() {
-          ok(ext.getQueryObjectEXT(timestampQuery, ext.QUERY_RESULT_AVAILABLE_EXT),
-          "Timestamp query should be available immediately after flush and event loop tick.");
-
-          ok(ext.getQueryEXT(ext.TIMESTAMP_EXT, ext.QUERY_COUNTER_BITS_EXT) >= 30,
-          "Time elapsed must be at least 30 bits to hold at least 1 second of timing.");
-
-          SimpleTest.finish();
-        });
-    } else {
-      SimpleTest.finish();
-    }
-  });
-}
-
-SimpleTest.waitForExplicitFinish();
-
-doTest();
-
-</script>
-</body>
-</html>