Auto merge of #10432 - autrilla:uniform, r=emilio

Added Uniform{1iv, 2f, 2fv}

The remaining ones need changes to webrender_traits, so I'll have to open a PR there too.

r? @emilio

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10432)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-07 02:38:03 +05:30
commit a5bc74be2f
2 changed files with 44 additions and 0 deletions

View file

@ -650,9 +650,11 @@ interface WebGLRenderingContextBase
void uniform1i(WebGLUniformLocation? location, GLint x);
//void uniform1iv(WebGLUniformLocation? location, Int32Array v);
//void uniform1iv(WebGLUniformLocation? location, sequence<long> v);
void uniform1iv(WebGLUniformLocation? location, optional object v);
void uniform2f(WebGLUniformLocation? location, GLfloat x, GLfloat y);
//void uniform2fv(WebGLUniformLocation? location, Float32Array v);
//void uniform2fv(WebGLUniformLocation? location, sequence<GLfloat> v);
void uniform2fv(WebGLUniformLocation? location, optional object v);
//void uniform2i(WebGLUniformLocation? location, GLint x, GLint y);
//void uniform2iv(WebGLUniformLocation? location, Int32Array v);
//void uniform2iv(WebGLUniformLocation? location, sequence<long> v);