Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #15899 - glennw:wr-update-premultiply, r=nox

Browse source 
Update WR (pre-multiplied alpha)

<!-- 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/15899)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-10 02:27:23 -08:00 • committed by GitHub
commit b97b0fd7cc
7 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -31256,7 +31256,7 @@
"support"
],
"mozilla/webgl/tex_image_2d_mipmap.html": [
"80f79d8804ee9cdb2b12c02223bf1e15854122d7",
"b4d54f0f58f75ff622a9c3f9bab3f59d9f1fb0e7",
"reftest"
],
"mozilla/webgl/tex_image_2d_mipmap_ref.html": [
@ -31264,7 +31264,7 @@
"support"
],
"mozilla/webgl/tex_image_2d_simple.html": [
"636673ea0aa2a16f4aec362ca40cd82e78ff3396",
"1811000d21dcdb5d27c67afbf22e77a83c6820d6",
"reftest"
],
"mozilla/webgl/tex_image_2d_simple_ref.html": [

1
tests/wpt/mozilla/tests/mozilla/webgl/tex_image_2d_mipmap.html
View file

@ -106,6 +106,7 @@
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR_MIPMAP_NEAREST);
gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, true);
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image);
gl.generateMipmap(gl.TEXTURE_2D);

1
tests/wpt/mozilla/tests/mozilla/webgl/tex_image_2d_simple.html
View file

@ -106,6 +106,7 @@
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, true);
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image);
gl.drawArrays(gl.TRIANGLES, 0, 6);