[core] Update gl-js for shader change

This commit is contained in:
John Firebaugh
2016-12-22 17:02:40 -08:00
parent 083cee8956
commit 65c28deefe
7 changed files with 13 additions and 14 deletions

View File

@@ -11,8 +11,7 @@ namespace mbgl {
namespace uniforms {
MBGL_DEFINE_UNIFORM_SCALAR(gl::TextureUnit, u_image0);
MBGL_DEFINE_UNIFORM_SCALAR(gl::TextureUnit, u_image1);
MBGL_DEFINE_UNIFORM_SCALAR(float, u_opacity0);
MBGL_DEFINE_UNIFORM_SCALAR(float, u_opacity1);
MBGL_DEFINE_UNIFORM_SCALAR(float, u_fade_t);
MBGL_DEFINE_UNIFORM_SCALAR(float, u_buffer_scale);
MBGL_DEFINE_UNIFORM_SCALAR(float, u_brightness_low);
MBGL_DEFINE_UNIFORM_SCALAR(float, u_brightness_high);
@@ -35,8 +34,8 @@ class RasterProgram : public Program<
uniforms::u_matrix,
uniforms::u_image0,
uniforms::u_image1,
uniforms::u_opacity0,
uniforms::u_opacity1,
uniforms::u_opacity,
uniforms::u_fade_t,
uniforms::u_brightness_low,
uniforms::u_brightness_high,
uniforms::u_saturation_factor,