Support all image sampler kinds with brush_image implementation. #2412
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
|
I haven't tested this in a try build yet - will be able to kick one off in an hour or so. r? @kvark cc @staktrace |
kvark
reviewed
Feb 13, 2018
| @@ -46,7 +52,7 @@ void brush_vs( | |||
| vec4 brush_fs() { | |||
| vec2 uv = clamp(vUv.xy, vUvBounds.xy, vUvBounds.zw); | |||
|
|
|||
| vec4 color = texture(sColor0, vec3(uv, vUv.z)); | |||
| vec4 color = TEX_SAMPLE(sColor0, vec3(uv, vUv.z)); | |||
There was a problem hiding this comment.
Actually, this would be incorrect, given that we want to use the mipmaps, and this macro always picks lod of 0.0
As a follow up, we need to add better test coverage of these other image types via a rawtest.
glennw
force-pushed
the
fix-brush-image
branch
from
5461682
to
85ebb41
Compare
|
Thanks Glenn! I'd like to see a try push, unless @kats wants to get this in quickly and bear with consequences :) |
|
At the moment there's a big backlog of windows jobs in gecko CI, so I'm ok with landing this without a try push. If anything turns up I'll let you know. |
|
@bors-servo r+ |
|
📌 Commit 85ebb41 has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Feb 13, 2018
Support all image sampler kinds with brush_image implementation. As a follow up, we need to add better test coverage of these other image types via a rawtest. <!-- 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/2412) <!-- Reviewable:end -->
|
☀️ Test successful - status-appveyor, status-taskcluster, status-travis |
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.
As a follow up, we need to add better test coverage of these other
image types via a rawtest.
This change is