aboutsummaryrefslogtreecommitdiffstats
path: root/components/canvas/webgl_paint_thread.rs
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <ecoal95@gmail.com>2015-12-23 09:22:01 +0100
committerEmilio Cobos Álvarez <ecoal95@gmail.com>2016-01-13 13:41:30 +0100
commit532b53ddc94cd99d737411b635f2fb6a6d50af51 (patch)
treed156993f3a83b170e910fe96b8a48ae383281755 /components/canvas/webgl_paint_thread.rs
parentee5aead60bba3c6a482960021677aac3d559289b (diff)
downloadservo-532b53ddc94cd99d737411b635f2fb6a6d50af51.tar.gz
servo-532b53ddc94cd99d737411b635f2fb6a6d50af51.zip
webgl: Implement Uniform1f, Uniform1fv, and Uniform4f
I was going to implement Uniform4fv with sequences, (since it practically implemented), but we can't until we support Float32Array args because codegen doesn't know how tu differenciate between both.
Diffstat (limited to 'components/canvas/webgl_paint_thread.rs')
-rw-r--r--components/canvas/webgl_paint_thread.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/components/canvas/webgl_paint_thread.rs b/components/canvas/webgl_paint_thread.rs
index 084ce49d491..84d4906aa85 100644
--- a/components/canvas/webgl_paint_thread.rs
+++ b/components/canvas/webgl_paint_thread.rs
@@ -157,8 +157,10 @@ impl WebGLPaintThread {
gl::bind_texture(target, id),
CanvasWebGLMsg::LinkProgram(program_id) =>
gl::link_program(program_id),
- CanvasWebGLMsg::Uniform4fv(uniform_id, data) =>
- gl::uniform_4f(uniform_id, data[0], data[1], data[2], data[3]),
+ CanvasWebGLMsg::Uniform1f(uniform_id, x) =>
+ gl::uniform_1f(uniform_id, x),
+ CanvasWebGLMsg::Uniform4f(uniform_id, x, y, z, w) =>
+ gl::uniform_4f(uniform_id, x, y, z, w),
CanvasWebGLMsg::UseProgram(program_id) =>
gl::use_program(program_id),
CanvasWebGLMsg::VertexAttrib(attrib_id, x, y, z, w) =>