Skip to content

/ webrender

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

Check for EXT_debug_marker #2935

Merged
merged 1 commit into from Jul 30, 2018
Merged

Check for EXT_debug_marker #2935

merged 1 commit into from Jul 30, 2018

Conversation

@csherratt
Copy link
Contributor

csherratt commented Jul 28, 2018 •
edited by larsbergstrom

Fix for #2885

Sorry novice at contributing here.

This change is Reviewable
@kvark
kvark reviewed Jul 30, 2018
View changes
Copy link
Member

kvark left a comment

Nice to see your PR, thank you!
Got a few notes on how we can improve it.
webrender/src/device/query_gl.rs
@@ -71,16 +71,18 @@ pub struct GpuFrameProfile<T> {
samplers: QuerySet<GpuSampler<T>>,
frame_id: FrameId,
inside_frame: bool,
ext_debug_marker: bool

This comment has been minimized.

Sign in to view
@kvark

kvark Jul 30, 2018

Member

github shows something off with indentation here

This comment has been minimized.

Sign in to view
@csherratt

csherratt Jul 30, 2018

Author Contributor

I don't see anything wrong in my editor.

screenshot 2018-07-30_08-35-16
webrender/src/device/query_gl.rs Outdated
GpuFrameProfile {
gl,
timers: QuerySet::new(),
samplers: QuerySet::new(),
frame_id: FrameId::new(0),
inside_frame: false,
ext_debug_marker: ext_debug_marker

This comment has been minimized.

Sign in to view
@kvark

kvark Jul 30, 2018

Member

nit: just ext_debug_marker,
webrender/src/device/query_gl.rs Outdated
}
}

#[must_use]
pub struct GpuMarker {
gl: Rc<gl::Gl>,
ext_debug_marker: bool

This comment has been minimized.

Sign in to view
@kvark

kvark Jul 30, 2018

Member

The whole struct is rather useless without this extension. If the users can't make a decision not to use it at all, we might just make it gl: Option<Rc<gl::Gl>> here instead of adding a flag
@csherratt
Check for EXT_debug_marker
Loading status checks…
e07a35d
@csherratt csherratt force-pushed the csherratt:issue-2885 branch from 165b85d to e07a35d Jul 30, 2018
@kvark
kvark approved these changes Jul 30, 2018
View changes
@kvark
Copy link
Member

kvark commented Jul 30, 2018

Thank you!
@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2018

📌 Commit e07a35d has been approved by kvark
@bors-servo
Copy link
Contributor

bors-servo commented Jul 30, 2018

⌛ Testing commit e07a35d with merge 6910633...
bors-servo added a commit that referenced this pull request Jul 30, 2018
@bors-servo
Auto merge of #2935 - csherratt:issue-2885, r=kvark
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…
6910633 
Check for EXT_debug_marker

Fix for #2885

Sorry novice at contributing here.

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

bors-servo commented Jul 30, 2018

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: kvark
Pushing 6910633 to master...
@bors-servo bors-servo merged commit e07a35d into servo:master Jul 30, 2018
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@atouchet atouchet mentioned this pull request Jul 31, 2018
Closed
@kvark
Copy link
Member

kvark commented Aug 9, 2018

Interestingly, with this PR I'm no longer see the markers. Checking glxinfo shows no GL_EXT_debug_marker supported either. Perhaps, it's the driver bug for not saying that this extension is really supported. Ultimately, we should just use KHR_debug functions instead of this.
@csherratt
Copy link
Contributor Author

csherratt commented Aug 9, 2018

Hmm, http://feedback.wildfiregames.com/report/opengl/feature/GL_EXT_debug_marker

I don't know how accurate those stats are. But looks like this is only officially supported my mac os 10.

The other one you purpose seems to be supported pretty much everywhere, http://www.g-truc.net/doc/OpenGL%204%20Hardware%20Matrix.pdf so that makes sense to move to this.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvark kvark

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@csherratt @kvark @bors-servo
You can’t perform that action at this time.