Introduce frame output support. #1687

glennw · 2017-09-11T00:12:48Z

This adds a new feature to WR, that allows copying the output
of a given pipeline ID to an external texture. This is a feature
request from the webvr prototyping team.

The included example demonstrates how to use the API to copy the
output of an iframe to an external texture, which is then copied
onto the screen via custom GL commands.

This change is

glennw · 2017-09-11T00:13:35Z

r? @kvark

cc @MortimerGoro

kvark

Looks fine by me.
My biggest concern here is the GL-only example. I think it's not strictly necessary - we could use WR's power to work with produced texture ID like it's coming from the outside. One way to write such an example would be to define 2 documents: one with a pipeline external target, and another one with an external image where this GL texture is used.

kvark · 2017-09-11T03:54:53Z

webrender/src/renderer.rs

@@ -2679,17 +2746,19 @@ impl Renderer {
        }

        for (i, texture) in self.color_render_targets.iter().chain(self.alpha_render_targets.iter()).enumerate() {
+            let dimensions = texture.get_dimensions();
+            let src_rect = DeviceIntRect::new(DeviceIntPoint::zero(),
+                                              DeviceIntSize::new(dimensions.width as i32,


nit: could probably do some casting of euclid::TypedSize2D

kvark · 2017-09-11T03:54:53Z

webrender/src/renderer.rs

+/// call succeeds, when WR has issued the GL commands to copy the output
+/// to the texture handle.
+pub trait OutputImageHandler {
+    fn lock(&mut self, pipeline_id: PipelineId) -> Option<(u32, DeviceIntSize)>;


we might want to revisit the lock/unlock semantics here later (is that how VR team wants to work with WR?), especially since WR pretty much guarantees that unlock is going to be called right away after some blitting (contrary to external image locks, where unlocking can happen at any time later).

The vr team have a demo working with the lock/unlock - but yes, we may want to revisit these semantics later on once we work out the exact synchronization story.

kvark · 2017-09-11T08:57:33Z

Oh, and I forgot to mention that this would be really nice to hook up via the document API: having VR content in a separate WR document that's routed into a separate target, as opposed to hacking the PipelineId handling.

glennw · 2017-09-11T21:30:48Z

@kvark I would like to hook up to the document API too - I think the pipeline API is fine for now (allows easy prototyping in Servo). But certainly once we make better use of the document API in Servo, we could consider switching frame output to support both documents and pipelines, or switch to documents exclusively.

bors-servo · 2017-09-12T02:23:17Z

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

glennw · 2017-09-12T02:36:09Z

Rebased and fixed cast nit.

bors-servo · 2017-09-12T03:27:48Z

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

kvark · 2017-09-12T14:14:42Z

Ok, merging on the merit that this is going to be ported to document API later on (or at least considered :) )
@bors-servo r+

bors-servo · 2017-09-12T14:14:42Z

📌 Commit 8e9a87e has been approved by kvark

bors-servo · 2017-09-12T16:09:26Z

🔒 Merge conflict

bors-servo · 2017-09-12T16:09:46Z

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


        Introduce frame output support.

This adds a new feature to WR, that allows copying the output of a given pipeline ID to an external texture. This is a feature request from the webvr prototyping team. The included example demonstrates how to use the API to copy the output of an iframe to an external texture, which is then copied onto the screen via custom GL commands.

glennw · 2017-09-12T20:54:17Z

Rebased.

@bors-servo r=kvark

bors-servo · 2017-09-12T20:54:17Z

📌 Commit f9b5e6c has been approved by kvark

bors-servo · 2017-09-12T21:53:25Z

⌛ Testing commit f9b5e6c with merge 65cbe63...


        Auto merge of #1687 - glennw:frame-output, r=kvark

Introduce frame output support. This adds a new feature to WR, that allows copying the output of a given pipeline ID to an external texture. This is a feature request from the webvr prototyping team. The included example demonstrates how to use the API to copy the output of an iframe to an external texture, which is then copied onto the screen via custom GL commands.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1687)

bors-servo · 2017-09-12T23:38:01Z

💔 Test failed - status-travis

glennw · 2017-09-13T05:04:16Z

@bors-servo retry

bors-servo · 2017-09-13T05:38:45Z

⌛ Testing commit f9b5e6c with merge 47d40d9...


        Auto merge of #1687 - glennw:frame-output, r=kvark

Introduce frame output support. This adds a new feature to WR, that allows copying the output of a given pipeline ID to an external texture. This is a feature request from the webvr prototyping team. The included example demonstrates how to use the API to copy the output of an iframe to an external texture, which is then copied onto the screen via custom GL commands.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1687)

bors-servo · 2017-09-13T06:17:43Z

☀️ Test successful - status-travis
Approved by: kvark
Pushing 47d40d9 to master...

kvark reviewed Sep 11, 2017

View changes

glennw force-pushed the glennw:frame-output branch from cade5de to e7756f7 Sep 12, 2017

glennw force-pushed the glennw:frame-output branch from e7756f7 to 8e9a87e Sep 12, 2017

glennw force-pushed the glennw:frame-output branch from 8e9a87e to f9b5e6c Sep 12, 2017

bors-servo mentioned this pull request Sep 13, 2017

[WIP] External image handlers #1676

Closed

glennw deleted the glennw:frame-output branch Sep 13, 2017

MortimerGoro mentioned this pull request Sep 21, 2017

Implement DOM to texture servo/servo#18592

Merged

3 of 5 tasks complete

servo / webrender

Introduce frame output support. #1687

Introduce frame output support. #1687

glennw commented Sep 11, 2017 •

edited by larsbergstrom

glennw commented Sep 11, 2017

kvark left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

kvark commented Sep 11, 2017

glennw commented Sep 11, 2017

bors-servo commented Sep 12, 2017

glennw commented Sep 12, 2017

bors-servo commented Sep 12, 2017

kvark commented Sep 12, 2017

bors-servo commented Sep 12, 2017

bors-servo commented Sep 12, 2017

bors-servo commented Sep 12, 2017

glennw commented Sep 12, 2017

bors-servo commented Sep 12, 2017

bors-servo commented Sep 12, 2017

bors-servo commented Sep 12, 2017

glennw commented Sep 13, 2017

bors-servo commented Sep 13, 2017

bors-servo commented Sep 13, 2017

servo / webrender

Join GitHub today

Introduce frame output support. #1687

Introduce frame output support. #1687

Conversation

glennw commented Sep 11, 2017 • edited by larsbergstrom

glennw commented Sep 11, 2017

kvark left a comment

This comment has been minimized.

kvark Sep 11, 2017

This comment has been minimized.

kvark Sep 11, 2017

This comment has been minimized.

glennw Sep 11, 2017

kvark commented Sep 11, 2017

glennw commented Sep 11, 2017

bors-servo commented Sep 12, 2017

glennw commented Sep 12, 2017

bors-servo commented Sep 12, 2017

kvark commented Sep 12, 2017

bors-servo commented Sep 12, 2017

bors-servo commented Sep 12, 2017

bors-servo commented Sep 12, 2017

glennw commented Sep 12, 2017

bors-servo commented Sep 12, 2017

bors-servo commented Sep 12, 2017

bors-servo commented Sep 12, 2017

glennw commented Sep 13, 2017

bors-servo commented Sep 13, 2017

bors-servo commented Sep 13, 2017

glennw commented Sep 11, 2017 •

edited by larsbergstrom