Closed Bug 1271830 Opened 4 years ago Closed 4 years ago

Ensure webgl1- and 2-only extensions in tests

Categories

(Core :: Canvas: WebGL, defect)

defect
Not set

Tracking

()

RESOLVED FIXED
mozilla49
Tracking Status
firefox49 --- fixed

People

(Reporter: jgilbert, Assigned: jgilbert)

References

Details

Attachments

(2 files)

Right now we only ensure-test for webgl1.
Some exts (EXT_color_buffer_float) are webgl2-only.
Many exts are core in webgl2, so should no longer be present there.
From 6487eed79e4a360d9f92c3d5636ec34ab3d3b0cd Mon Sep 17 00:00:00 2001
 contexts.
---
 .../test/webgl-mochitest/ensure-exts/ensure-ext.js |  26 +++-
 .../ensure-exts/test_ANGLE_instanced_arrays.html   |   2 +-
 .../ensure-exts/test_EXT_blend_minmax.html         |   2 +-
 .../ensure-exts/test_EXT_color_buffer_float.html   |  17 +++
 .../test_EXT_color_buffer_half_float.html          |   2 +-
 .../ensure-exts/test_EXT_disjoint_timer_query.html |   4 +-
 .../ensure-exts/test_EXT_frag_depth.html           |   2 +-
 .../webgl-mochitest/ensure-exts/test_EXT_sRGB.html |   2 +-
 .../ensure-exts/test_EXT_shader_texture_lod.html   |   2 +-
 .../ensure-exts/test_OES_standard_derivatives.html |   2 +-
 .../ensure-exts/test_WEBGL_color_buffer_float.html |   2 +-
 .../test_WEBGL_compressed_texture_es3.html         |   4 +-
 .../ensure-exts/test_WEBGL_depth_texture.html      |   2 +-
 .../ensure-exts/test_WEBGL_draw_buffers.html       |   2 +-
 .../webgl-mochitest/ensure-exts/test_common.html   | 143 +++++++++++++--------
 dom/canvas/test/webgl-mochitest/mochitest.ini      |   2 +
 16 files changed, 143 insertions(+), 73 deletions(-)
 create mode 100644 dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_color_buffer_float.html

Review commit: https://reviewboard.mozilla.org/r/51749/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/51749/
Attachment #8751010 - Flags: review?(jmuizelaar)
From ceddc1f20c0a31dbe10d1e31b3281c04193907da Mon Sep 17 00:00:00 2001
---
 dom/canvas/WebGLContextExtensions.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Review commit: https://reviewboard.mozilla.org/r/51751/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/51751/
Attachment #8751010 - Flags: review?(mtseng)
Attachment #8751011 - Flags: review?(jmuizelaar)
Comment on attachment 8751011 [details]
MozReview Request: r?jrmuizel - Remove non-webgl2 exts from webgl2.

https://reviewboard.mozilla.org/r/51751/#review48567
Attachment #8751011 - Flags: review?(jmuizelaar) → review+
Comment on attachment 8751010 [details]
MozReview Request: Bug 1271830 - r?jrmuizel - Update ensure-exts to check webgl2

https://reviewboard.mozilla.org/r/51749/#review48569

::: dom/canvas/test/webgl-mochitest/ensure-exts/ensure-ext.js:26
(Diff revision 1)
>      } else {
> -        ok(!gl.getExtension(name), 'Should not have extension ' + name + '.');
> +        ok(!ext, 'Should not' + haveText);
>      }
>  }
>  
> -function EnsureDraftExt(name, shouldBe = true) {
> +function Lastly_WithDraftExtsEnabled(func) {

What does "Lastly" mean here?
Attachment #8751010 - Flags: review?(jmuizelaar)
https://reviewboard.mozilla.org/r/51749/#review48569

> What does "Lastly" mean here?

This function must be called last. (It calls SimpleTest.finish(), which should not be called more than once, and iirc cannot be revoked)
Attachment #8751010 - Flags: review?(jmuizelaar)
Comment on attachment 8751010 [details]
MozReview Request: Bug 1271830 - r?jrmuizel - Update ensure-exts to check webgl2

https://reviewboard.mozilla.org/r/51749/#review48687
Attachment #8751010 - Flags: review?(mtseng) → review+
(In reply to Jeff Gilbert [:jgilbert] from comment #6)
> https://reviewboard.mozilla.org/r/51749/#review48569
> 
> > What does "Lastly" mean here?
> 
> This function must be called last. (It calls SimpleTest.finish(), which
> should not be called more than once, and iirc cannot be revoked)

How about just calling it WithDraftExtsEnabledAndFinish()?
Comment on attachment 8751010 [details]
MozReview Request: Bug 1271830 - r?jrmuizel - Update ensure-exts to check webgl2

https://reviewboard.mozilla.org/r/51749/#review49439
Attachment #8751010 - Flags: review?(jmuizelaar) → review+
https://hg.mozilla.org/mozilla-central/rev/d0ab0d508a24
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla49
(In reply to Pulsebot from comment #10)
> https://hg.mozilla.org/integration/mozilla-inbound/rev/d0ab0d508a24

Ugh, this was the wrong bug.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Backed out for unexpected pass of test_EXT_color_buffer_float.html on Android:

https://hg.mozilla.org/integration/mozilla-inbound/rev/f59273abb810

Push with unexpected pass: https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound&revision=22c42d243a5cb24bd97efa201ecaa4d3c5965502
Log: https://treeherder.mozilla.org/logviewer.html#?job_id=28715269&repo=mozilla-inbound
TEST-UNEXPECTED-PASS | dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_color_buffer_float.html | fail-if condition in manifest - We expected at least one failure
Flags: needinfo?(jgilbert)
https://hg.mozilla.org/mozilla-central/rev/4715ad5e6035
Status: REOPENED → RESOLVED
Closed: 4 years ago4 years ago
Resolution: --- → FIXED
Flags: needinfo?(jgilbert)
You need to log in before you can comment on or make changes to this bug.