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

Add profiling to WebXR #25810

Merged
merged 2 commits into from Feb 23, 2020
Merged

Add profiling to WebXR #25810

merged 2 commits into from Feb 23, 2020

Conversation

@Manishearth
Copy link
Member

Manishearth commented Feb 20, 2020 •
edited

Fixes servo/webxr#128

Depends on servo/webxr#131

r? @jdm
@highfive
Copy link

highfive commented Feb 20, 2020

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/document.rs, components/script/Cargo.toml, components/script/dom/xrsession.rs
  • @KiChjang: components/script/dom/document.rs, components/script/Cargo.toml, components/script/dom/xrsession.rs
@highfive
Copy link

highfive commented Feb 20, 2020

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!
@bors-servo
Copy link
Contributor

bors-servo commented Feb 20, 2020

☔ The latest upstream changes (presumably #25809) made this pull request unmergeable. Please resolve the merge conflicts.
@jdm
jdm requested changes Feb 20, 2020
View changes
components/canvas/webgl_thread.rs Outdated
#[cfg(feature = "xr-profile")]
let start_swap = time::precise_time_ns();
#[cfg(feature = "xr-profile")]
println!("WEBXR PROFILING [swap request]:\t{}ms", (start_swap - _sent_time) as f64 / 1_000_000.);

This comment has been minimized.

Sign in to view
@jdm

jdm Feb 20, 2020

Member

Let's define another to_ms function in canvas_traits to avoid repeating this calculation.
components/script/dom/document.rs Outdated
@@ -2534,7 +2534,7 @@ impl Document {
self.window
.webgl_chan()
.expect("Where's the WebGL channel?")
.send(WebGLMsg::SwapBuffers(dirty_context_ids, sender))
.send(WebGLMsg::SwapBuffers(dirty_context_ids, sender, 0))

This comment has been minimized.

Sign in to view
@jdm

jdm Feb 20, 2020

Member

Let's send a real time here; having 0 kept giving me weird output I had to ignore.
@Manishearth
Bump webxr dep
52c9cce
@Manishearth Manishearth force-pushed the Manishearth:xr-profile branch from a898c21 to b39bcab Feb 22, 2020
@Manishearth
Copy link
Member Author

Manishearth commented Feb 22, 2020

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

bors-servo commented Feb 22, 2020

📌 Commit b39bcab has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Feb 22, 2020

⌛ Testing commit b39bcab with merge 5e542f5...
bors-servo added a commit that referenced this pull request Feb 22, 2020
@bors-servo
Auto merge of #25810 - Manishearth:xr-profile, r=jdm
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…
5e542f5 
Add profiling to WebXR

Part of servo/webxr#128

Depends on servo/webxr#131

r? @jdm
@bors-servo
Copy link
Contributor

bors-servo commented Feb 22, 2020

💔 Test failed - status-taskcluster
@jdm
Copy link
Member

jdm commented Feb 22, 2020

./ports/libsimpleservo/capi/Cargo.toml:52: trailing whitespace
@Manishearth Manishearth force-pushed the Manishearth:xr-profile branch from b39bcab to e1b9b98 Feb 22, 2020
@Manishearth
Copy link
Member Author

Manishearth commented Feb 22, 2020

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

bors-servo commented Feb 22, 2020

📌 Commit e1b9b98 has been approved by jdm
@Manishearth Manishearth force-pushed the Manishearth:xr-profile branch from e1b9b98 to f3e1aba Feb 23, 2020
@Manishearth
Copy link
Member Author

Manishearth commented Feb 23, 2020

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

bors-servo commented Feb 23, 2020

📌 Commit f3e1aba has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Feb 23, 2020

⌛ Testing commit f3e1aba with merge b6cd626...
bors-servo added a commit that referenced this pull request Feb 23, 2020
@bors-servo
Auto merge of #25810 - Manishearth:xr-profile, r=jdm
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…
b6cd626 
Add profiling to WebXR

Fixes servo/webxr#128

Depends on servo/webxr#131

r? @jdm
@bors-servo
Copy link
Contributor

bors-servo commented Feb 23, 2020

💔 Test failed - status-taskcluster
@Manishearth
Copy link
Member Author

Manishearth commented Feb 23, 2020

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Feb 23, 2020

⌛ Testing commit f3e1aba with merge bc882fc...
bors-servo added a commit that referenced this pull request Feb 23, 2020
@bors-servo
Auto merge of #25810 - Manishearth:xr-profile, r=jdm
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…
bc882fc 
Add profiling to WebXR

Fixes servo/webxr#128

Depends on servo/webxr#131

r? @jdm
@bors-servo
Copy link
Contributor

bors-servo commented Feb 23, 2020

💔 Test failed - status-taskcluster
@jdm
Copy link
Member

jdm commented Feb 23, 2020

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Feb 23, 2020

⌛ Testing commit f3e1aba with merge 6bc4a7d...
@bors-servo
Copy link
Contributor

bors-servo commented Feb 23, 2020

☀️ Test successful - status-taskcluster
Approved by: jdm
Pushing 6bc4a7d to master...
@bors-servo bors-servo merged commit 6bc4a7d into servo:master Feb 23, 2020
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Feb 23, 2020
Merged
@nox

This comment was marked as off-topic.

Sign in to view
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm

Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Add frame timing information
5 participants
@Manishearth @highfive @bors-servo @jdm @nox
You can’t perform that action at this time.