Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
michael@0 | 1 | precision mediump float; |
michael@0 | 2 | uniform sampler2D s2D; |
michael@0 | 3 | uniform samplerCube sCube; |
michael@0 | 4 | void main() |
michael@0 | 5 | { |
michael@0 | 6 | gl_FragColor = texture2D(s2D, vec2(0.5, 0.5)) + |
michael@0 | 7 | textureCube(sCube, vec3(0.5, 0.5, 0.5)); |
michael@0 | 8 | } |