Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for WebGL2 FramebufferTextureLayer #25814

Merged

Conversation

@mmatyas
Copy link
Contributor

mmatyas commented Feb 20, 2020

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


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • There are tests for these changes
@highfive
Copy link

highfive commented Feb 20, 2020

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
Copy link

highfive commented Feb 20, 2020

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@Manishearth
Copy link
Member

Manishearth commented Feb 20, 2020

r? @nox or @jdm for webgl stuff

@highfive highfive assigned nox and unassigned Manishearth Feb 20, 2020
@bors-servo
Copy link
Contributor

bors-servo commented Feb 21, 2020

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

@mmatyas mmatyas force-pushed the szeged:mmatyas__webgl_fns_framebuf_texlayer branch from 0a8656b to 3c38ace Feb 25, 2020
@mmatyas
Copy link
Contributor Author

mmatyas commented Feb 25, 2020

Rebased and updated the tests. There aren't too many of them though, as this GL call mainly depends on Texture2D/3D implemented first, but the code itself is ready for review.

@mmatyas mmatyas changed the title [WIP] Add support for WebGL2 FramebufferTextureLayer Add support for WebGL2 FramebufferTextureLayer Feb 25, 2020
@jdm
jdm approved these changes Feb 25, 2020
@jdm jdm assigned jdm and unassigned nox Feb 25, 2020
@bors-servo
Copy link
Contributor

bors-servo commented Mar 3, 2020

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

Adds support for `FramebufferTextureLayer` WebGL2 call.

See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.4
@mmatyas mmatyas force-pushed the szeged:mmatyas__webgl_fns_framebuf_texlayer branch from 3c38ace to 8389189 Mar 4, 2020
@mmatyas
Copy link
Contributor Author

mmatyas commented Mar 4, 2020

Rebased.

@jdm
Copy link
Member

jdm commented Mar 4, 2020

@bors-servo
Copy link
Contributor

bors-servo commented Mar 4, 2020

📌 Commit 8389189 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Mar 4, 2020

Testing commit 8389189 with merge b0324f7...

bors-servo added a commit that referenced this pull request Mar 4, 2020
…=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

<!-- Please describe your changes on the following line: -->

Depends on #25798.

cc @jdm @zakorgy

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [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

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
@bors-servo
Copy link
Contributor

bors-servo commented Mar 4, 2020

💔 Test failed - status-taskcluster

@CYBAI
Copy link
Collaborator

CYBAI commented Mar 4, 2020

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Mar 4, 2020

Testing commit 8389189 with merge 301980c...

@bors-servo
Copy link
Contributor

bors-servo commented Mar 4, 2020

☀️ Test successful - status-taskcluster
Approved by: jdm
Pushing 301980c to master...

@bors-servo bors-servo merged commit 301980c into servo:master Mar 4, 2020
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
You can’t perform that action at this time.