The Tor Browser / file diff

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/content/canvas/test/webgl-conformance/conformance/resources/samplerUniformShader.frag	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,8 @@
     1.4 +precision mediump float;
     1.5 +uniform sampler2D s2D;
     1.6 +uniform samplerCube sCube;
     1.7 +void main()
     1.8 +{
     1.9 +    gl_FragColor = texture2D(s2D, vec2(0.5, 0.5)) +
    1.10 +                   textureCube(sCube, vec3(0.5, 0.5, 0.5));
    1.11 +}