diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-02-27 12:47:34 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-01 09:33:37 +0100 |
| commit | 55c7b86053816e74c3fd3c0595c1fa053970f959 (patch) | |
| tree | c34be5d76008fad4f28d39e9c39cc85ad31b72fe /src/mbgl/programs/collision_box_program.hpp | |
| parent | 7f1428ed3b90b54f503760471869ac83def32a59 (diff) | |
| download | qtlocation-mapboxgl-55c7b86053816e74c3fd3c0595c1fa053970f959.tar.gz | |
[core] extract uniform type lists from gl namespace
Diffstat (limited to 'src/mbgl/programs/collision_box_program.hpp')
| -rw-r--r-- | src/mbgl/programs/collision_box_program.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp index 0b1abf97c7..9b3d82cd16 100644 --- a/src/mbgl/programs/collision_box_program.hpp +++ b/src/mbgl/programs/collision_box_program.hpp @@ -29,7 +29,7 @@ class CollisionBoxProgram : public Program< shaders::collision_box, gl::Line, gl::ConcatenateAttributes<CollisionBoxLayoutAttributes, CollisionBoxDynamicAttributes>, - gl::Uniforms< + TypeList< uniforms::u_matrix, uniforms::u_extrude_scale, uniforms::u_camera_to_center_distance>, @@ -109,7 +109,7 @@ class CollisionCircleProgram : public Program< shaders::collision_circle, gl::Triangle, gl::ConcatenateAttributes<CollisionBoxLayoutAttributes, CollisionBoxDynamicAttributes>, - gl::Uniforms< + TypeList< uniforms::u_matrix, uniforms::u_extrude_scale, uniforms::u_overscale_factor, |