diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-12-22 17:02:40 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-12-23 10:49:51 -0800 |
| commit | 65c28deefe9a5ee65c22f6366b14259a6ef6578a (patch) | |
| tree | 7d0144b5e797aca65e430df8eb8688b9487e6642 /src/mbgl/programs/raster_program.hpp | |
| parent | 083cee8956e6aa89eefe93df6e5c286a1b6728b8 (diff) | |
| download | qtlocation-mapboxgl-65c28deefe9a5ee65c22f6366b14259a6ef6578a.tar.gz | |
[core] Update gl-js for shader change
Diffstat (limited to 'src/mbgl/programs/raster_program.hpp')
| -rw-r--r-- | src/mbgl/programs/raster_program.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/programs/raster_program.hpp b/src/mbgl/programs/raster_program.hpp index d6179904d2..9aa25cf90c 100644 --- a/src/mbgl/programs/raster_program.hpp +++ b/src/mbgl/programs/raster_program.hpp @@ -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, |