diff options
author | Glenn Watson <github@intuitionlibrary.com> | 2016-11-05 07:37:26 +1000 |
---|---|---|
committer | Glenn Watson <github@intuitionlibrary.com> | 2016-11-05 07:37:26 +1000 |
commit | d62e14f8b1e1d8a332d5d946c6932c20371a5971 (patch) | |
tree | 3e7c6c7f68f5068d4ccf806212b37e1d18e45676 | |
parent | cfef68f92d1c8cdc928d3c0b60f22de4b40a97be (diff) | |
download | servo-d62e14f8b1e1d8a332d5d946c6932c20371a5971.tar.gz servo-d62e14f8b1e1d8a332d5d946c6932c20371a5971.zip |
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.
-rw-r--r-- | resources/shaders/ps_image_clip.vs.glsl | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/resources/shaders/ps_image_clip.vs.glsl b/resources/shaders/ps_image_clip.vs.glsl index b272b271401..5426d997e4d 100644 --- a/resources/shaders/ps_image_clip.vs.glsl +++ b/resources/shaders/ps_image_clip.vs.glsl @@ -27,14 +27,9 @@ void main(void) { write_clip(clip); // vUv will contain how many times this image has wrapped around the image size. - vec2 st0 = image.st_rect.xy; - vec2 st1 = image.st_rect.zw; - - if (image.has_pixel_coords) { - vec2 texture_size = vec2(textureSize(sDiffuse, 0)); - st0 /= texture_size; - st1 /= texture_size; - } + vec2 texture_size = vec2(textureSize(sDiffuse, 0)); + vec2 st0 = image.st_rect.xy / texture_size; + vec2 st1 = image.st_rect.zw / texture_size; vTextureSize = st1 - st0; vTextureOffset = st0; |