Add support for WebGL2 framebuffer invalidation #25798

mmatyas · 2020-02-19T10:27:33Z

Adds support for the invalidateFramebuffer and invalideSubFramebuffer WebGL2 calls.

See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.4

Depends on #25785.

cc @jdm @zakorgy

./mach build -d does not report any errors
./mach test-tidy does not report any errors
There are tests for these changes

highfive · 2020-02-19T10:27:39Z

Heads up! This PR modifies the following files:

@asajeffrey: components/script/dom/webglrenderingcontext.rs, components/script/dom/webidls/WebGL2RenderingContext.webidl, components/script/dom/webglframebuffer.rs, components/script/dom/webgl2renderingcontext.rs, components/script/dom/webglrenderbuffer.rs
@jgraham: tests/wpt/webgl/meta/conformance2/renderbuffers/framebuffer-test.html.ini, tests/wpt/webgl/meta/conformance2/context/methods-2.html.ini, tests/wpt/webgl/meta/conformance2/rendering/framebuffer-texture-level1.html.ini, tests/wpt/webgl/meta/conformance2/rendering/framebuffer-completeness-unaffected.html.ini, tests/wpt/webgl/meta/conformance2/renderbuffers/framebuffer-object-attachment.html.ini and 3 more
@KiChjang: components/script/dom/webglrenderingcontext.rs, components/script/dom/webidls/WebGL2RenderingContext.webidl, components/script/dom/webglframebuffer.rs, components/script/dom/webgl2renderingcontext.rs, components/script/dom/webglrenderbuffer.rs

highfive · 2020-02-19T10:27:42Z

Warning

These commits modify unsafe code. Please review it carefully!

bors-servo · 2020-02-21T15:03:31Z

☔ The latest upstream changes (presumably #25784) made this pull request unmergeable. Please resolve the merge conflicts.

jdm · 2020-02-21T21:01:37Z

This can now merge after a rebase.

mmatyas · 2020-02-25T10:14:18Z

Rebased and updated the tests.

jdm · 2020-02-25T12:56:52Z

@bors-servo r+

bors-servo · 2020-02-25T12:57:09Z

📌 Commit 7d44c86 has been approved by jdm

bors-servo · 2020-02-25T13:45:44Z

⌛ Testing commit 7d44c86 with merge e6a82e4...


        Auto merge of #25798 - szeged:mmatyas__webgl_fns_framebuf_invalidate,…

@jdm

… r=jdm Add support for WebGL2 framebuffer invalidation Adds support for the `invalidateFramebuffer` and `invalideSubFramebuffer` WebGL2 calls. See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.4  Depends on #25785. cc @jdm @zakorgy ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] There are tests for these changes

bors-servo · 2020-02-25T14:22:55Z

💔 Test failed - status-taskcluster

jdm · 2020-02-25T14:27:18Z

  ▶ Unexpected subtest result in /_webgl/conformance2/state/gl-object-get-calls.html:
  │ FAIL [expected PASS] WebGL test #182: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).
  │   → assert_true: successfullyParsed should be true (of type boolean). Was undefined (of type undefined). expected true got false
  │ 
  │ reportTestResultsToHarness/<@http://web-platform.test:8000/_webgl/js/js-test-pre.js:123:9
  │ Test.prototype.step@http://web-platform.test:8000/resources/testharness.js:1867:25
  │ test@http://web-platform.test:8000/resources/testharness.js:548:30
  │ reportTestResultsToHarness@http://web-platform.test:8000/_webgl/js/js-test-pre.js:122:7
  │ testFailed@http://web-platform.test:8000/_webgl/js/js-test-pre.js:249:5
  │ shouldBe@http://web-platform.test:8000/_webgl/js/js-test-pre.js:406:9
  │ shouldBeTrue@http://web-platform.test:8000/_webgl/js/js-test-pre.js:432:29
  └ @http://web-platform.test:8000/_webgl/js/js-test-post.js:24:1

mmatyas · 2020-02-27T12:53:51Z

Hmm I've tried to rebuild and regenerate the file, but it produces the same results for me every time.

jdm · 2020-02-27T12:54:39Z

Have you run the test with --headless?

bors-servo · 2020-03-02T14:25:44Z

⌛ Trying commit 143013b with merge 2755c3e...


        Auto merge of #25798 - szeged:mmatyas__webgl_fns_framebuf_invalidate,…

@jdm

… r=<try> Add support for WebGL2 framebuffer invalidation Adds support for the `invalidateFramebuffer` and `invalideSubFramebuffer` WebGL2 calls. See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.4  Depends on #25785. cc @jdm @zakorgy ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] There are tests for these changes

bors-servo · 2020-03-02T15:02:32Z

💔 Test failed - status-taskcluster

jdm · 2020-03-02T15:04:41Z

  ▶ Unexpected subtest result in /_webgl/conformance2/state/gl-object-get-calls.html:
  │ FAIL [expected PASS] WebGL test #182: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).
  │   → assert_true: successfullyParsed should be true (of type boolean). Was undefined (of type undefined). expected true got false
  │ 
  │ reportTestResultsToHarness/<@http://web-platform.test:8000/_webgl/js/js-test-pre.js:123:9
  │ Test.prototype.step@http://web-platform.test:8000/resources/testharness.js:1926:25
  │ test@http://web-platform.test:8000/resources/testharness.js:548:30
  │ reportTestResultsToHarness@http://web-platform.test:8000/_webgl/js/js-test-pre.js:122:7
  │ testFailed@http://web-platform.test:8000/_webgl/js/js-test-pre.js:249:5
  │ shouldBe@http://web-platform.test:8000/_webgl/js/js-test-pre.js:406:9
  │ shouldBeTrue@http://web-platform.test:8000/_webgl/js/js-test-pre.js:432:29
  └ @http://web-platform.test:8000/_webgl/js/js-test-post.js:24:1

Weird.

mmatyas · 2020-03-03T11:38:25Z

Hm. I wonder if not touching that file at all would fix the issue?

jdm · 2020-03-03T13:41:47Z

Doubtful. Just add the missing failure by hand so it can merge?


        Add support for WebGL2 framebuffer invalidation

Adds support for the `invalidateFramebuffer` and `invalideSubFramebuffer` WebGL2 calls. See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.4

mmatyas · 2020-03-03T13:56:21Z

Ok, this should work then I guess.

jdm · 2020-03-03T14:15:46Z

@bors-servo r+

bors-servo · 2020-03-03T14:15:48Z

📌 Commit cc07d93 has been approved by jdm

bors-servo · 2020-03-03T14:17:38Z

⌛ Testing commit cc07d93 with merge e0d8b5f...


        Auto merge of #25798 - szeged:mmatyas__webgl_fns_framebuf_invalidate,…

@jdm

… r=jdm Add support for WebGL2 framebuffer invalidation Adds support for the `invalidateFramebuffer` and `invalideSubFramebuffer` WebGL2 calls. See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.4  Depends on #25785. cc @jdm @zakorgy ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] There are tests for these changes

bors-servo · 2020-03-03T14:56:13Z

💔 Test failed - status-taskcluster

jdm · 2020-03-03T15:32:28Z

@bors-servo retry

#23290 #25875

bors-servo · 2020-03-03T16:34:25Z

⌛ Testing commit cc07d93 with merge 56b5d9d...

bors-servo · 2020-03-03T17:42:11Z

☀️ Test successful - status-taskcluster
Approved by: jdm
Pushing 56b5d9d to master...


        Auto merge of #25814 - szeged:mmatyas__webgl_fns_framebuf_texlayer, r…

@jdm

…=jdm Add support for WebGL2 FramebufferTextureLayer Adds support for `FramebufferTextureLayer` WebGL2 call. See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.4  Depends on #25798. cc @jdm @zakorgy ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] There are tests for these changes


        Auto merge of #25814 - szeged:mmatyas__webgl_fns_framebuf_texlayer, r…

@jdm

…=jdm Add support for WebGL2 FramebufferTextureLayer Adds support for `FramebufferTextureLayer` WebGL2 call. See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.4  Depends on #25798. cc @jdm @zakorgy ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] There are tests for these changes

highfive assigned paulrouget Feb 19, 2020

highfive added the S-awaiting-review label Feb 19, 2020

jdm approved these changes Feb 19, 2020

View changes

jdm assigned jdm and unassigned paulrouget Feb 19, 2020

jdm added S-blocked-on-external and removed S-awaiting-review labels Feb 19, 2020

mmatyas mentioned this pull request Feb 20, 2020

Add support for WebGL2 FramebufferTextureLayer #25814

Merged

3 of 3 tasks complete

highfive added the S-needs-rebase label Feb 21, 2020

jdm removed the S-blocked-on-external label Feb 21, 2020

mmatyas force-pushed the szeged:mmatyas__webgl_fns_framebuf_invalidate branch from 8ca2c42 to 7d44c86 Feb 25, 2020

highfive added the S-awaiting-review label Feb 25, 2020

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Feb 25, 2020

highfive added S-tests-failed and removed S-awaiting-merge labels Feb 25, 2020

highfive added the S-tests-failed label Mar 2, 2020

Add support for WebGL2 framebuffer invalidation

Loading status checks…

cc07d93

Adds support for the `invalidateFramebuffer` and `invalideSubFramebuffer` WebGL2 calls. See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.4

mmatyas force-pushed the szeged:mmatyas__webgl_fns_framebuf_invalidate branch from 143013b to cc07d93 Mar 3, 2020

highfive removed the S-tests-failed label Mar 3, 2020

highfive added S-awaiting-merge and removed S-awaiting-review labels Mar 3, 2020

highfive added S-tests-failed and removed S-awaiting-merge labels Mar 3, 2020

highfive added S-awaiting-merge and removed S-tests-failed labels Mar 3, 2020

bors-servo merged commit 56b5d9d into servo:master Mar 3, 2020
2 checks passed

2 checks passed

Community-TC (pull_request) TaskGroup: success
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Mar 3, 2020

servo / servo

Add support for WebGL2 framebuffer invalidation #25798

Add support for WebGL2 framebuffer invalidation #25798

mmatyas commented Feb 19, 2020

highfive commented Feb 19, 2020

highfive commented Feb 19, 2020

bors-servo commented Feb 21, 2020

jdm commented Feb 21, 2020

mmatyas commented Feb 25, 2020

jdm commented Feb 25, 2020 •

edited

bors-servo commented Feb 25, 2020

bors-servo commented Feb 25, 2020

bors-servo commented Feb 25, 2020

jdm commented Feb 25, 2020

mmatyas commented Feb 27, 2020

jdm commented Feb 27, 2020

bors-servo commented Mar 2, 2020

bors-servo commented Mar 2, 2020

jdm commented Mar 2, 2020

mmatyas commented Mar 3, 2020

jdm commented Mar 3, 2020

mmatyas commented Mar 3, 2020

jdm commented Mar 3, 2020

bors-servo commented Mar 3, 2020

bors-servo commented Mar 3, 2020

bors-servo commented Mar 3, 2020

jdm commented Mar 3, 2020

bors-servo commented Mar 3, 2020

bors-servo commented Mar 3, 2020

servo / servo

Join GitHub today

Add support for WebGL2 framebuffer invalidation #25798

Add support for WebGL2 framebuffer invalidation #25798

Conversation

mmatyas commented Feb 19, 2020

highfive commented Feb 19, 2020

highfive commented Feb 19, 2020

bors-servo commented Feb 21, 2020

jdm commented Feb 21, 2020

mmatyas commented Feb 25, 2020

jdm commented Feb 25, 2020 • edited

bors-servo commented Feb 25, 2020

bors-servo commented Feb 25, 2020

bors-servo commented Feb 25, 2020

jdm commented Feb 25, 2020

mmatyas commented Feb 27, 2020

jdm commented Feb 27, 2020

bors-servo commented Mar 2, 2020

bors-servo commented Mar 2, 2020

jdm commented Mar 2, 2020

mmatyas commented Mar 3, 2020

jdm commented Mar 3, 2020

mmatyas commented Mar 3, 2020

jdm commented Mar 3, 2020

bors-servo commented Mar 3, 2020

bors-servo commented Mar 3, 2020

bors-servo commented Mar 3, 2020

jdm commented Mar 3, 2020

bors-servo commented Mar 3, 2020

bors-servo commented Mar 3, 2020

jdm commented Feb 25, 2020 •

edited