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

Dummy sCache texture input #913

Merged
merged 2 commits into from Feb 22, 2017
Merged

Dummy sCache texture input #913

merged 2 commits into from Feb 22, 2017

Conversation

@kvark
Copy link
Member

kvark commented Feb 21, 2017 •
edited by larsbergstrom

Fixes #907

r? @glennw

This change is Reviewable
@glennw
glennw reviewed Feb 22, 2017
View changes
Copy link
Member

glennw left a comment

Looks good apart from those minor nits. r=me when those are fixed.
webrender/Cargo.toml Outdated
@@ -1,6 +1,6 @@
[package]
name = "webrender"
version = "0.17.0"

This comment has been minimized.

Sign in to view
Copy link
@glennw

glennw Feb 22, 2017

Member

There's a few other PRs in the queue that also update the version, so we can probably leave the version number change out of this (this drops the version number below what the queued PRs do).
webrender/src/renderer.rs
@@ -715,6 +720,15 @@ impl Renderer {
TextureFilter::Linear,
ImageData::Raw(Arc::new(mask_pixels)));

let dummy_cache_texture_id = device.create_texture_ids(1, TextureTarget::Array)[0];
device.init_texture(dummy_cache_texture_id,
1,

This comment has been minimized.

Sign in to view
Copy link
@glennw

glennw Feb 22, 2017

Member

The comment above says the texture is 2x2 but the size here is 1x1.
@bors-servo
Copy link
Contributor

bors-servo commented Feb 22, 2017

☔ The latest upstream changes (presumably #895) made this pull request unmergeable. Please resolve the merge conflicts.
@kvark kvark force-pushed the kvark:cache branch from 6f65bb6 to 9a1840f Feb 22, 2017
@kvark
Dummy sCache texture input
Loading status checks…
568b1c9
@kvark kvark force-pushed the kvark:cache branch from 9a1840f to 568b1c9 Feb 22, 2017
@kvark
Copy link
Member Author

kvark commented Feb 22, 2017

Thanks!
@bors-servo r=glennw
@bors-servo
Copy link
Contributor

bors-servo commented Feb 22, 2017

📌 Commit 568b1c9 has been approved by glennw
@bors-servo
Copy link
Contributor

bors-servo commented Feb 22, 2017

⌛ Testing commit 568b1c9 with merge 0b7b0be...
bors-servo added a commit that referenced this pull request Feb 22, 2017
@bors-servo
Auto merge of #913 - kvark:cache, r=glennw
Loading status checks…
0b7b0be 
Dummy sCache texture input

Fixes #907

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/913)
<!-- Reviewable:end -->
@emilio
emilio reviewed Feb 22, 2017
View changes
webrender/src/renderer.rs
@@ -715,6 +720,15 @@ impl Renderer {
TextureFilter::Linear,
ImageData::Raw(Arc::new(mask_pixels)));

let dummy_cache_texture_id = device.create_texture_ids(1, TextureTarget::Array)[0];
device.init_texture(dummy_cache_texture_id,

This comment has been minimized.

Sign in to view
Copy link
@emilio

emilio Feb 22, 2017

Member

This is minor, but am I right assuming we're leaking this texture, or is there something preventing that? If not, would it make sense to destroy it on drop?
@kvark
Copy link
Member Author

kvark commented Feb 22, 2017

@emilio good point!
@bors-servo r-
@kvark
Implemented Drop for Renderer
Loading status checks…
785d134
@kvark
Copy link
Member Author

kvark commented Feb 22, 2017

r? @emilio
@emilio
Copy link
Member

emilio commented Feb 22, 2017

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

bors-servo commented Feb 22, 2017

📌 Commit 785d134 has been approved by glennw,emilio
@bors-servo
Copy link
Contributor

bors-servo commented Feb 22, 2017

⌛ Testing commit 785d134 with merge ba8ce0c...
bors-servo added a commit that referenced this pull request Feb 22, 2017
@bors-servo
Auto merge of #913 - kvark:cache, r=glennw,emilio
Loading status checks…
ba8ce0c 
Dummy sCache texture input

Fixes #907

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/913)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 22, 2017

☀️ Test successful - status-travis
Approved by: glennw,emilio
Pushing ba8ce0c to master...
@bors-servo bors-servo merged commit 785d134 into servo:master Feb 22, 2017
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
@kvark kvark deleted the kvark:cache branch Feb 22, 2017
@staktrace staktrace mentioned this pull request Feb 22, 2017
Closed
@MortimerGoro MortimerGoro mentioned this pull request Feb 24, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio

@glennw glennw

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

4 participants
@kvark @bors-servo @emilio @glennw
You can’t perform that action at this time.