Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-03 13:33:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #14074 - glennw:shader-hot-fix, r=pcwalton

Browse source 
Manually copy across a shader fix from WR.

This fix has landed in WR, but WR can't be updated right now, due
to a scroll change landing in WR without the Servo PR being ready
quite yet.

Fixes #14061.
Fixes #14073.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14074)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-11-04 19:09:35 -05:00 • committed by GitHub
commit 516be8f85c
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/shaders/ps_image_clip.vs.glsl
View file

@ -27,14 +27,9 @@ void main(void) {
write_clip(clip); write_clip(clip);
// vUv will contain how many times this image has wrapped around the image size. // vUv will contain how many times this image has wrapped around the image size.
vec2 st0 = image.st_rect.xy; vec2 texture_size = vec2(textureSize(sDiffuse, 0));
vec2 st1 = image.st_rect.zw; vec2 st0 = image.st_rect.xy / texture_size;
vec2 st1 = image.st_rect.zw / texture_size;
if (image.has_pixel_coords) {
vec2 texture_size = vec2(textureSize(sDiffuse, 0));
st0 /= texture_size;
st1 /= texture_size;
}
vTextureSize = st1 - st0; vTextureSize = st1 - st0;
vTextureOffset = st0; vTextureOffset = st0;