Skip to content

Commit

Permalink
Auto merge of #1263 - fryeb:master, r=kvark
Browse files Browse the repository at this point in the history
Workaround for driver bug (Intel HD 4400)

Small workaround for a bug in the Intel GLSL compiler. [link](#1251).

<!-- 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/1263)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo authored May 17, 2017
2 parents 4600023 + 4a5f0cd commit 476bd7b
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions webrender/res/ps_split_composite.vs.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ SplitGeometry fetch_split_geometry(int index) {
vec4 data1 = texelFetchOffset(sSplitGeometry, uv, 0, ivec2(1, 0));
vec4 data2 = texelFetchOffset(sSplitGeometry, uv, 0, ivec2(2, 0));

return SplitGeometry(vec3[4](
SplitGeometry geo;
geo.points = vec3[4](
data0.xyz, vec3(data0.w, data1.xy),
vec3(data1.zw, data2.x), data2.yzw
));
);
return geo;
}

vec3 bilerp(vec3 a, vec3 b, vec3 c, vec3 d, float s, float t) {
Expand Down

0 comments on commit 476bd7b

Please sign in to comment.