Add ImageDescriptor to describe the layout and format of images in memory. #756
Conversation
This file contains hidden or 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
Member
|
@bors-servo r+ |
Contributor
|
📌 Commit 774969c has been approved by |
Contributor
bors-servo
pushed a commit
that referenced
this pull request
Jan 20, 2017
Add ImageDescriptor to describe the layout and format of images in memory. The most notable change is that this moves the responsibility of specifying whether images are opaque to the consumer of the webrender api rather than webrender itself, which should be more efficient, and lets us handle opaque RGBA surfaces efficiently. r? @glennw <!-- 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/756) <!-- Reviewable:end -->
Contributor
|
☀️ Test successful - status-travis |
kvark
reviewed
Jan 20, 2017
| height: 2, | ||
| stride: None, | ||
| format: ImageFormat::A8, | ||
| is_opaque: true, |
| format, ref data) => { | ||
| let stride = if let Some(stride) = stride { | ||
| &ApiMsg::AddImage(ref key, ref descriptor, ref data) => { | ||
| let stride = if let Some(stride) = descriptor.stride { |
Member
There was a problem hiding this comment.
nit: could be rewritten via unwrap_or
| ImageFormat::RGBA8 | ImageFormat::RGB8 => width*4, | ||
| ImageFormat::RGBAF32 => width*16, | ||
| match descriptor.format { | ||
| ImageFormat::A8 => descriptor.width, |
Member
There was a problem hiding this comment.
don't we have just a ImageFormat::bytes_per_pixel()? we should
| self.images.insert(*key, CachedImage { | ||
| width: width, height: height, stride: stride, | ||
| format: format, | ||
| width: descriptor.width, |
Member
There was a problem hiding this comment.
Any reason we don't want to store the descriptor directly in CachedImage?
| ImageFormat::RGBA8 | ImageFormat::RGB8 => width*4, | ||
| ImageFormat::RGBAF32 => width*16, | ||
| match descriptor.format { | ||
| ImageFormat::A8 => descriptor.width, |
Member
There was a problem hiding this comment.
duplicated code, one more reason to add ImageFormat::bytes_per_pixel()
| // This assumes that A8 textures are never opaque, since they are | ||
| // typically used for alpha masks. We could revisit that if it | ||
| // ever becomes an issue in real world usage. | ||
| pub fn is_image_opaque(format: ImageFormat, bytes: &[u8]) -> bool { |
Member
There was a problem hiding this comment.
Let's move it to wrench, it's not idiomatic to WR any more.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
The most notable change is that this moves the responsibility of specifying whether images are opaque to the consumer of the webrender api rather than webrender itself, which should be more efficient, and lets us handle opaque RGBA surfaces efficiently.
r? @glennw
This change is