Skip to content

Commit 2ddad22

Browse files
authored
Remove some of unused legacy uniforms (maplibre#3481)
1 parent f5cfbc8 commit 2ddad22

1 file changed

Lines changed: 4 additions & 37 deletions

File tree

src/mbgl/shaders/uniforms.hpp

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,14 @@
77
namespace mbgl {
88
namespace uniforms {
99

10-
// Uniforms common to several shaders.
11-
10+
// Legacy matrix uniform used in legacy shader ClippingMaskProgram
1211
MBGL_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.
1315
MBGL_DEFINE_UNIFORM_SCALAR(float, opacity);
1416
MBGL_DEFINE_UNIFORM_SCALAR(Color, color);
1517
MBGL_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);
2118
MBGL_DEFINE_UNIFORM_SCALAR(float, radius);
2219
MBGL_DEFINE_UNIFORM_SCALAR(float, stroke_width);
2320
MBGL_DEFINE_UNIFORM_SCALAR(Color, stroke_color);
@@ -33,39 +30,9 @@ MBGL_DEFINE_UNIFORM_SCALAR(float, width);
3330
MBGL_DEFINE_UNIFORM_SCALAR(float, floorwidth);
3431
MBGL_DEFINE_UNIFORM_SCALAR(float, gapwidth);
3532
MBGL_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);
4433
MBGL_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-
5234
MBGL_DEFINE_UNIFORM_VECTOR(uint16_t, 4, pattern_from);
5335
MBGL_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

Comments
 (0)