Skip to content

/ servo

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

Send an IpcSharedMemory in tex_image_2d and tex_sub_image_2d #22225

Merged
merged 9 commits into from Nov 21, 2018
Merged

Send an IpcSharedMemory in tex_image_2d and tex_sub_image_2d #22225

merged 9 commits into from Nov 21, 2018
+602 −563

Conversation

@nox
Copy link
Member

nox commented Nov 19, 2018 •
edited by SimonSapin

This change is Reviewable
@highfive
Copy link

highfive commented Nov 19, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/lib.rs, components/webdriver_server/Cargo.toml, components/script/dom/imagedata.rs, components/script/Cargo.toml, components/script/dom/paintworkletglobalscope.rs and 3 more
  • @jgraham: components/webdriver_server/Cargo.toml, components/webdriver_server/lib.rs
  • @paulrouget: components/compositing/lib.rs, components/compositing/Cargo.toml, components/compositing/compositor.rs, components/compositing/windowing.rs, components/servo/Cargo.toml
  • @KiChjang: components/net/image_cache.rs, components/script_traits/lib.rs, components/script/lib.rs, components/script/dom/imagedata.rs, components/script/Cargo.toml and 5 more
@highfive
Copy link

highfive commented Nov 19, 2018

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify net and script code, but no tests are modified. Please consider adding a test!
@nox
Copy link
Member Author

nox commented Nov 19, 2018

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2018

⌛ Trying commit 6bf3753 with merge 82c853c...
bors-servo added a commit that referenced this pull request Nov 19, 2018
@bors-servo
Auto merge of #22225 - servo:webgl, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
82c853c 
Send an IpcSharedMemory in tex_image_2d and tex_sub_image_2d
@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2018

💔 Test failed - linux-rel-css
@nox nox force-pushed the webgl branch from 6bf3753 to 3ce1ead Nov 19, 2018
@nox
Copy link
Member Author

nox commented Nov 19, 2018

This should be ready to be reviewed.

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2018

⌛ Trying commit 3ce1ead with merge 7e59c7a...
bors-servo added a commit that referenced this pull request Nov 19, 2018
@bors-servo
Auto merge of #22225 - servo:webgl, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
7e59c7a 
Send an IpcSharedMemory in tex_image_2d and tex_sub_image_2d

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22225)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2018

💔 Test failed - status-taskcluster
@nox nox force-pushed the webgl branch from 3ce1ead to 6f811d3 Nov 19, 2018
@nox
Copy link
Member Author

nox commented Nov 19, 2018

Unhappy tidy, fixed.
@nox
Copy link
Member Author

nox commented Nov 20, 2018

r? @jdm
@highfive highfive assigned jdm and unassigned avadacatavra Nov 20, 2018
@nox nox mentioned this pull request Nov 20, 2018
Open
nox added 7 commits Nov 17, 2018
@nox
Use Size2D in TexImage2D and TexSubImage2D messages
2a5539c
@nox
Move prepare_pixels to canvas_traits::webgl
5f9e3d8
@nox
Call prepare_pixels on the WebGL thread
ca62b5c
@nox
Move prepare_pixels to the canvas thread
87c849c 
Nothing else uses it in the whole crate graph.
@nox
Rename gleam feature to gl in compositing
faee0b2
@nox
Move PixelFormat to the pixels crate
2c0acf6
@nox
Call rgba8_byte_swap_colors_inplace on the WebGL thread
cfca906
@nox
Send an IpcSharedMemory in tex_image_2d and tex_sub_image_2d
Loading status checks…
804d964 
This avoids a copy in the case of textures coming from HTMLImageElement.
@nox nox force-pushed the webgl branch from 6f811d3 to 804d964 Nov 20, 2018
@nox nox mentioned this pull request Nov 20, 2018
Closed
@nox
Make HTMLCanvasElement::fetch_all_data return a shared memory blob
Loading status checks…
9a8d03a
@nox nox force-pushed the webgl branch from 90aee83 to 9a8d03a Nov 21, 2018
@emilio
emilio approved these changes Nov 21, 2018
View changes
Copy link
Member

emilio left a comment

Looks good, with that question. Have you checked any perf numbers out of curiosity? Just wondering what the relative speed is between creating an IPC channel vs. a shared memory thing.
components/script/dom/webglrenderingcontext.rs
);
let effective_data_type = self
.extension_manager
.effective_type(data_type.as_gl_constant());

This comment has been minimized.

Sign in to view
@emilio

emilio Nov 21, 2018

Member

Why doesn't textSubImage2D need to go through the EM in order to get the effective internal format?

This comment has been minimized.

Sign in to view
@nox

nox Nov 21, 2018

Author Member

It was like that before, and using it makes everything panic on the GL side.
@nox
Copy link
Member Author

nox commented Nov 21, 2018

@bors-servo r=emilio
@bors-servo
Copy link
Contributor

bors-servo commented Nov 21, 2018

📌 Commit 9a8d03a has been approved by emilio
@highfive highfive assigned emilio and unassigned jdm Nov 21, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Nov 21, 2018

⌛ Testing commit 9a8d03a with merge 2b410ac...
bors-servo added a commit that referenced this pull request Nov 21, 2018
@bors-servo
Auto merge of #22225 - servo:webgl, r=emilio
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
2b410ac 
Send an IpcSharedMemory in tex_image_2d and tex_sub_image_2d

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22225)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 21, 2018

☀️ Test successful - android, android-mac, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster, windows-msvc-dev
Approved by: emilio
Pushing 2b410ac to master...
@bors-servo bors-servo mentioned this pull request Nov 21, 2018
Closed
@bors-servo bors-servo merged commit 9a8d03a into master Nov 21, 2018
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
This was referenced Nov 21, 2018
Merged
Closed
@SimonSapin SimonSapin deleted the webgl branch Dec 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio

Assignees

@emilio emilio

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@nox @highfive @bors-servo @emilio @jdm @avadacatavra
You can’t perform that action at this time.