77namespace mbgl {
88namespace uniforms {
99
10- // Uniforms common to several shaders.
11-
10+ // Legacy matrix uniform used in legacy shader ClippingMaskProgram
1211MBGL_DEFINE_UNIFORM_MATRIX (double , 4 , matrix);
12+
13+ // Legacy uniforms needed by layer properties templates, not used in shaders.
14+ // Shaders are using UBOs in drawable architecture.
1315MBGL_DEFINE_UNIFORM_SCALAR (float , opacity);
1416MBGL_DEFINE_UNIFORM_SCALAR (Color, color);
1517MBGL_DEFINE_UNIFORM_SCALAR (float , blur);
16-
17- MBGL_DEFINE_UNIFORM_SCALAR (float , zoom);
18- MBGL_DEFINE_UNIFORM_SCALAR (float , collision_y_stretch);
19- MBGL_DEFINE_UNIFORM_SCALAR (float , pitch);
20- MBGL_DEFINE_UNIFORM_SCALAR (float , bearing);
2118MBGL_DEFINE_UNIFORM_SCALAR (float , radius);
2219MBGL_DEFINE_UNIFORM_SCALAR (float , stroke_width);
2320MBGL_DEFINE_UNIFORM_SCALAR (Color, stroke_color);
@@ -33,39 +30,9 @@ MBGL_DEFINE_UNIFORM_SCALAR(float, width);
3330MBGL_DEFINE_UNIFORM_SCALAR (float , floorwidth);
3431MBGL_DEFINE_UNIFORM_SCALAR (float , gapwidth);
3532MBGL_DEFINE_UNIFORM_SCALAR (float , offset);
36- MBGL_DEFINE_UNIFORM_SCALAR (Size, world);
37- MBGL_DEFINE_UNIFORM_SCALAR (Size, texsize);
38- MBGL_DEFINE_UNIFORM_SCALAR (Size, texsize_icon);
39- MBGL_DEFINE_UNIFORM_SCALAR (bool , pitch_with_map);
40- MBGL_DEFINE_UNIFORM_SCALAR (float , camera_to_center_distance);
41- MBGL_DEFINE_UNIFORM_SCALAR (float , device_pixel_ratio);
42- MBGL_DEFINE_UNIFORM_SCALAR (float , fade);
43- MBGL_DEFINE_UNIFORM_SCALAR (float , fade_change);
4433MBGL_DEFINE_UNIFORM_SCALAR (float , weight);
45-
46- MBGL_DEFINE_UNIFORM_VECTOR (float , 2 , extrude_scale);
47-
48- namespace heatmap {
49- MBGL_DEFINE_UNIFORM_SCALAR (float , extrude_scale);
50- } // namespace heatmap
51-
5234MBGL_DEFINE_UNIFORM_VECTOR (uint16_t , 4 , pattern_from);
5335MBGL_DEFINE_UNIFORM_VECTOR (uint16_t , 4 , pattern_to);
54- MBGL_DEFINE_UNIFORM_VECTOR (float , 4 , scale);
55- MBGL_DEFINE_UNIFORM_VECTOR (uint16_t , 2 , pattern_tl_a);
56- MBGL_DEFINE_UNIFORM_VECTOR (uint16_t , 2 , pattern_br_a);
57- MBGL_DEFINE_UNIFORM_VECTOR (uint16_t , 2 , pattern_tl_b);
58- MBGL_DEFINE_UNIFORM_VECTOR (uint16_t , 2 , pattern_br_b);
59- MBGL_DEFINE_UNIFORM_VECTOR (float , 2 , pattern_size_a);
60- MBGL_DEFINE_UNIFORM_VECTOR (float , 2 , pattern_size_b);
61- MBGL_DEFINE_UNIFORM_VECTOR (float , 2 , pixel_coord_upper);
62- MBGL_DEFINE_UNIFORM_VECTOR (float , 2 , pixel_coord_lower);
63-
64- MBGL_DEFINE_UNIFORM_SCALAR (float , mix);
65- MBGL_DEFINE_UNIFORM_SCALAR (float , scale_a);
66- MBGL_DEFINE_UNIFORM_SCALAR (float , scale_b);
67- MBGL_DEFINE_UNIFORM_SCALAR (float , tile_units_to_pixels);
68- MBGL_DEFINE_UNIFORM_SCALAR (float , overscale_factor);
6936
7037} // namespace uniforms
7138} // namespace mbgl
0 commit comments