Don't panic when compiling the debug overlay shaders fail. #2920
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kvark
approved these changes
Jul 20, 2018
| @@ -1306,18 +1306,33 @@ struct TargetSelector { | |||
| #[cfg(feature = "debug_renderer")] | |||
| struct LazyInitializedDebugRenderer { | |||
| debug_renderer: Option<DebugRenderer>, | |||
There was a problem hiding this comment.
cleaner to have Option<Result<_>> instead
There was a problem hiding this comment.
Why would that make things better?
There was a problem hiding this comment.
because the state expressed with an extra bool is less safe and more redundant (e.g. it doesn't prohibit Some() + true combo)
|
@bors-servo r+ |
|
📌 Commit 13249af has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Jul 23, 2018
Don't panic when compiling the debug overlay shaders fail. Fixes #2808. There is always going to be a silly driver out there that will fail for whatever reason so let's not panic for something that isn't important to the user. I did leave the unwrap in wrench sort of on purpose because in the unlikely event that someone using wrench hits the driver bug, they'll be in a much better place to fix or report the issue than our average user, and if we are lucky enough to hit this kind of bug a developer's machine we'll be able can try to fix it. I'm tempted to remove the debug_render feature. It's not buying much since the shader is compiled lazily and it adds noise to the code (and feature flags are annoyingly easy to break). <!-- 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/2920) <!-- Reviewable:end -->
|
☀️ Test successful - status-appveyor, status-taskcluster |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2808.
There is always going to be a silly driver out there that will fail for whatever reason so let's not panic for something that isn't important to the user.
I did leave the unwrap in wrench sort of on purpose because in the unlikely event that someone using wrench hits the driver bug, they'll be in a much better place to fix or report the issue than our average user, and if we are lucky enough to hit this kind of bug a developer's machine we'll be able can try to fix it.
I'm tempted to remove the debug_render feature. It's not buying much since the shader is compiled lazily and it adds noise to the code (and feature flags are annoyingly easy to break).
This change is