Skip to content

Commit b585b00

Browse files
alexcristicipre-commit-ci[bot]
alexcristici
and
pre-commit-ci[bot]
authored
Clean more legacy code (maplibre#3478)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 2538ac1 commit b585b00

108 files changed

Lines changed: 211 additions & 936 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ list(APPEND INCLUDE_FILES
279279
${PROJECT_SOURCE_DIR}/include/mbgl/renderer/renderer_frontend.hpp
280280
${PROJECT_SOURCE_DIR}/include/mbgl/renderer/renderer_observer.hpp
281281
${PROJECT_SOURCE_DIR}/include/mbgl/renderer/renderer_state.hpp
282+
${PROJECT_SOURCE_DIR}/include/mbgl/shaders/program_parameters.hpp
282283
${PROJECT_SOURCE_DIR}/include/mbgl/storage/database_file_source.hpp
283284
${PROJECT_SOURCE_DIR}/include/mbgl/storage/file_source.hpp
284285
${PROJECT_SOURCE_DIR}/include/mbgl/storage/file_source_manager.hpp
@@ -485,15 +486,13 @@ list(APPEND SRC_FILES
485486
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/offscreen_texture.hpp
486487
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/polyline_generator.cpp
487488
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/fill_generator.cpp
488-
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/program.hpp
489489
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/render_pass.hpp
490490
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/renderbuffer.hpp
491491
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/renderer_backend.cpp
492492
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/rendering_stats.cpp
493493
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/shader_group.cpp
494494
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/shader_registry.cpp
495495
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/stencil_mode.hpp
496-
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/texture.hpp
497496
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/uniform.hpp
498497
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/upload_pass.hpp
499498
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/vertex_buffer.hpp
@@ -543,17 +542,6 @@ list(APPEND SRC_FILES
543542
${PROJECT_SOURCE_DIR}/src/mbgl/map/zoom_history.hpp
544543
${PROJECT_SOURCE_DIR}/src/mbgl/math/log2.cpp
545544
${PROJECT_SOURCE_DIR}/src/mbgl/platform/settings.cpp
546-
${PROJECT_SOURCE_DIR}/src/mbgl/programs/attributes.hpp
547-
${PROJECT_SOURCE_DIR}/src/mbgl/programs/clipping_mask_program.cpp
548-
${PROJECT_SOURCE_DIR}/src/mbgl/programs/clipping_mask_program.hpp
549-
${PROJECT_SOURCE_DIR}/src/mbgl/programs/program.hpp
550-
${PROJECT_SOURCE_DIR}/src/mbgl/programs/program_parameters.cpp
551-
${PROJECT_SOURCE_DIR}/src/mbgl/programs/program_parameters.hpp
552-
${PROJECT_SOURCE_DIR}/src/mbgl/programs/programs.cpp
553-
${PROJECT_SOURCE_DIR}/src/mbgl/programs/programs.hpp
554-
${PROJECT_SOURCE_DIR}/src/mbgl/programs/segment.hpp
555-
${PROJECT_SOURCE_DIR}/src/mbgl/programs/textures.hpp
556-
${PROJECT_SOURCE_DIR}/src/mbgl/programs/uniforms.hpp
557545
${PROJECT_SOURCE_DIR}/src/mbgl/renderer/backend_scope.cpp
558546
${PROJECT_SOURCE_DIR}/src/mbgl/renderer/bucket.hpp
559547
${PROJECT_SOURCE_DIR}/src/mbgl/renderer/bucket_parameters.cpp
@@ -657,6 +645,10 @@ list(APPEND SRC_FILES
657645
${PROJECT_SOURCE_DIR}/src/mbgl/renderer/transition_parameters.hpp
658646
${PROJECT_SOURCE_DIR}/src/mbgl/renderer/update_parameters.hpp
659647
${PROJECT_SOURCE_DIR}/src/mbgl/renderer/upload_parameters.hpp
648+
${PROJECT_SOURCE_DIR}/src/mbgl/shaders/attributes.hpp
649+
${PROJECT_SOURCE_DIR}/src/mbgl/shaders/program_parameters.cpp
650+
${PROJECT_SOURCE_DIR}/src/mbgl/shaders/segment.hpp
651+
${PROJECT_SOURCE_DIR}/src/mbgl/shaders/uniforms.hpp
660652
${PROJECT_SOURCE_DIR}/src/mbgl/sprite/sprite_loader.cpp
661653
${PROJECT_SOURCE_DIR}/src/mbgl/sprite/sprite_loader.hpp
662654
${PROJECT_SOURCE_DIR}/src/mbgl/sprite/sprite_loader_observer.hpp
@@ -1040,7 +1032,6 @@ if(MLN_WITH_OPENGL)
10401032
${PROJECT_SOURCE_DIR}/src/mbgl/gl/object.hpp
10411033
${PROJECT_SOURCE_DIR}/src/mbgl/gl/offscreen_texture.cpp
10421034
${PROJECT_SOURCE_DIR}/src/mbgl/gl/offscreen_texture.hpp
1043-
${PROJECT_SOURCE_DIR}/src/mbgl/gl/program.hpp
10441035
${PROJECT_SOURCE_DIR}/src/mbgl/gl/render_pass.cpp
10451036
${PROJECT_SOURCE_DIR}/src/mbgl/gl/render_pass.hpp
10461037
${PROJECT_SOURCE_DIR}/src/mbgl/gl/renderbuffer_resource.cpp
@@ -1049,10 +1040,6 @@ if(MLN_WITH_OPENGL)
10491040
${PROJECT_SOURCE_DIR}/src/mbgl/gl/resource_pool.cpp
10501041
${PROJECT_SOURCE_DIR}/src/mbgl/gl/resource_pool.hpp
10511042
${PROJECT_SOURCE_DIR}/src/mbgl/gl/state.hpp
1052-
${PROJECT_SOURCE_DIR}/src/mbgl/gl/texture.cpp
1053-
${PROJECT_SOURCE_DIR}/src/mbgl/gl/texture.hpp
1054-
${PROJECT_SOURCE_DIR}/src/mbgl/gl/texture_resource.cpp
1055-
${PROJECT_SOURCE_DIR}/src/mbgl/gl/texture_resource.hpp
10561043
${PROJECT_SOURCE_DIR}/src/mbgl/gl/timestamp_query_extension.cpp
10571044
${PROJECT_SOURCE_DIR}/src/mbgl/gl/timestamp_query_extension.hpp
10581045
${PROJECT_SOURCE_DIR}/src/mbgl/gl/types.hpp
@@ -1067,6 +1054,11 @@ if(MLN_WITH_OPENGL)
10671054
${PROJECT_SOURCE_DIR}/src/mbgl/gl/vertex_buffer_resource.cpp
10681055
${PROJECT_SOURCE_DIR}/src/mbgl/gl/vertex_buffer_resource.hpp
10691056
${PROJECT_SOURCE_DIR}/src/mbgl/platform/gl_functions.cpp
1057+
${PROJECT_SOURCE_DIR}/src/mbgl/shaders/gl/legacy/clipping_mask_program.hpp
1058+
${PROJECT_SOURCE_DIR}/src/mbgl/shaders/gl/legacy/program_base.hpp
1059+
${PROJECT_SOURCE_DIR}/src/mbgl/shaders/gl/legacy/program.hpp
1060+
${PROJECT_SOURCE_DIR}/src/mbgl/shaders/gl/legacy/programs.cpp
1061+
${PROJECT_SOURCE_DIR}/src/mbgl/shaders/gl/legacy/programs.hpp
10701062
)
10711063

10721064
list(APPEND INCLUDE_FILES

‎bazel/core.bzl‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,13 @@ MLN_CORE_SOURCE = [
132132
"src/mbgl/gfx/index_vector.hpp",
133133
"src/mbgl/gfx/offscreen_texture.hpp",
134134
"src/mbgl/gfx/polyline_generator.cpp",
135-
"src/mbgl/gfx/program.hpp",
136135
"src/mbgl/gfx/render_pass.hpp",
137136
"src/mbgl/gfx/renderbuffer.hpp",
138137
"src/mbgl/gfx/renderer_backend.cpp",
139138
"src/mbgl/gfx/rendering_stats.cpp",
140139
"src/mbgl/gfx/shader_registry.cpp",
141140
"src/mbgl/gfx/shader_group.cpp",
142141
"src/mbgl/gfx/stencil_mode.hpp",
143-
"src/mbgl/gfx/texture.hpp",
144142
"src/mbgl/gfx/uniform.hpp",
145143
"src/mbgl/gfx/upload_pass.hpp",
146144
"src/mbgl/gfx/vertex_buffer.hpp",
@@ -184,17 +182,6 @@ MLN_CORE_SOURCE = [
184182
"src/mbgl/map/zoom_history.hpp",
185183
"src/mbgl/math/log2.cpp",
186184
"src/mbgl/platform/settings.cpp",
187-
"src/mbgl/programs/attributes.hpp",
188-
"src/mbgl/programs/clipping_mask_program.cpp",
189-
"src/mbgl/programs/clipping_mask_program.hpp",
190-
"src/mbgl/programs/program.hpp",
191-
"src/mbgl/programs/program_parameters.cpp",
192-
"src/mbgl/programs/program_parameters.hpp",
193-
"src/mbgl/programs/programs.cpp",
194-
"src/mbgl/programs/programs.hpp",
195-
"src/mbgl/programs/segment.hpp",
196-
"src/mbgl/programs/textures.hpp",
197-
"src/mbgl/programs/uniforms.hpp",
198185
"src/mbgl/renderer/backend_scope.cpp",
199186
"src/mbgl/renderer/bucket.hpp",
200187
"src/mbgl/renderer/bucket_parameters.cpp",
@@ -302,6 +289,10 @@ MLN_CORE_SOURCE = [
302289
"src/mbgl/renderer/transition_parameters.hpp",
303290
"src/mbgl/renderer/update_parameters.hpp",
304291
"src/mbgl/renderer/upload_parameters.hpp",
292+
"src/mbgl/shaders/attributes.hpp",
293+
"src/mbgl/shaders/program_parameters.cpp",
294+
"src/mbgl/shaders/segment.hpp",
295+
"src/mbgl/shaders/uniforms.hpp",
305296
"src/mbgl/sprite/sprite_loader.cpp",
306297
"src/mbgl/sprite/sprite_loader.hpp",
307298
"src/mbgl/sprite/sprite_loader_observer.hpp",
@@ -653,6 +644,7 @@ MLN_CORE_HEADERS = [
653644
"include/mbgl/renderer/renderer_frontend.hpp",
654645
"include/mbgl/renderer/renderer_observer.hpp",
655646
"include/mbgl/renderer/renderer_state.hpp",
647+
"include/mbgl/shaders/program_parameters.hpp",
656648
"include/mbgl/storage/database_file_source.hpp",
657649
"include/mbgl/storage/file_source.hpp",
658650
"include/mbgl/storage/file_source_manager.hpp",
@@ -834,7 +826,6 @@ MLN_OPENGL_SOURCE = [
834826
"src/mbgl/gl/object.hpp",
835827
"src/mbgl/gl/offscreen_texture.cpp",
836828
"src/mbgl/gl/offscreen_texture.hpp",
837-
"src/mbgl/gl/program.hpp",
838829
"src/mbgl/gl/render_pass.cpp",
839830
"src/mbgl/gl/render_pass.hpp",
840831
"src/mbgl/gl/renderbuffer_resource.cpp",
@@ -843,10 +834,6 @@ MLN_OPENGL_SOURCE = [
843834
"src/mbgl/gl/resource_pool.cpp",
844835
"src/mbgl/gl/resource_pool.hpp",
845836
"src/mbgl/gl/state.hpp",
846-
"src/mbgl/gl/texture.cpp",
847-
"src/mbgl/gl/texture.hpp",
848-
"src/mbgl/gl/texture_resource.cpp",
849-
"src/mbgl/gl/texture_resource.hpp",
850837
"src/mbgl/gl/timestamp_query_extension.cpp",
851838
"src/mbgl/gl/timestamp_query_extension.hpp",
852839
"src/mbgl/gl/types.hpp",
@@ -861,6 +848,11 @@ MLN_OPENGL_SOURCE = [
861848
"src/mbgl/gl/vertex_buffer_resource.cpp",
862849
"src/mbgl/gl/vertex_buffer_resource.hpp",
863850
"src/mbgl/platform/gl_functions.cpp",
851+
"src/mbgl/shaders/gl/legacy/clipping_mask_program.hpp",
852+
"src/mbgl/shaders/gl/legacy/program_base.hpp",
853+
"src/mbgl/shaders/gl/legacy/program.hpp",
854+
"src/mbgl/shaders/gl/legacy/programs.cpp",
855+
"src/mbgl/shaders/gl/legacy/programs.hpp",
864856
]
865857

866858
MLN_OPENGL_HEADERS = [

‎include/mbgl/gfx/context.hpp‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
#include <mbgl/gfx/command_encoder.hpp>
66
#include <mbgl/gfx/context_observer.hpp>
77
#include <mbgl/gfx/draw_scope.hpp>
8-
#include <mbgl/gfx/program.hpp>
98
#include <mbgl/gfx/renderbuffer.hpp>
109
#include <mbgl/gfx/rendering_stats.hpp>
11-
#include <mbgl/gfx/texture.hpp>
1210
#include <mbgl/gfx/types.hpp>
1311

1412
#include <mbgl/gfx/uniform_buffer.hpp>
@@ -30,6 +28,8 @@ using RenderTargetPtr = std::shared_ptr<RenderTarget>;
3028

3129
namespace gfx {
3230

31+
class DepthMode;
32+
class ColorMode;
3333
class OffscreenTexture;
3434
class ShaderRegistry;
3535

@@ -79,13 +79,6 @@ class Context {
7979

8080
virtual std::unique_ptr<OffscreenTexture> createOffscreenTexture(Size, TextureChannelDataType) = 0;
8181

82-
/// Creates an empty texture with the specified dimensions.
83-
Texture createTexture(const Size size,
84-
TexturePixelType format = TexturePixelType::RGBA,
85-
TextureChannelDataType type = TextureChannelDataType::UnsignedByte) {
86-
return {size, createTextureResource(size, format, type)};
87-
}
88-
8982
template <RenderbufferPixelType pixelType>
9083
Renderbuffer<pixelType> createRenderbuffer(const Size size) {
9184
return {size, createRenderbufferResource(pixelType, size)};
@@ -173,7 +166,6 @@ class Context {
173166
virtual void unbindGlobalUniformBuffers(gfx::RenderPass&) const noexcept = 0;
174167

175168
protected:
176-
virtual std::unique_ptr<TextureResource> createTextureResource(Size, TexturePixelType, TextureChannelDataType) = 0;
177169
virtual std::unique_ptr<RenderbufferResource> createRenderbufferResource(RenderbufferPixelType, Size) = 0;
178170
virtual std::unique_ptr<DrawScopeResource> createDrawScopeResource() = 0;
179171

‎include/mbgl/gfx/drawable_impl.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <mbgl/gfx/draw_mode.hpp>
44
#include <mbgl/gfx/drawable.hpp>
5-
#include <mbgl/programs/segment.hpp>
5+
#include <mbgl/shaders/segment.hpp>
66

77
namespace mbgl {
88
namespace gfx {

‎include/mbgl/gfx/polyline_generator.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <mbgl/style/types.hpp>
66
#include <mbgl/gfx/vertex_vector.hpp>
77
#include <mbgl/gfx/index_vector.hpp>
8-
#include <mbgl/programs/segment.hpp>
8+
#include <mbgl/shaders/segment.hpp>
99
#include <mbgl/util/math.hpp>
1010

1111
#include <cstdint>

‎include/mbgl/gfx/texture2d.hpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ class Context;
1515
class UploadPass;
1616
class TextureResource;
1717

18+
constexpr int32_t MaxActiveTextureUnits = 8;
19+
1820
class Texture2D {
1921
public:
2022
struct SamplerState {

‎include/mbgl/gl/drawable_gl.hpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
#include <mbgl/gfx/draw_mode.hpp>
55
#include <mbgl/gl/vertex_array.hpp>
66
#include <mbgl/gl/vertex_attribute_gl.hpp>
7-
#include <mbgl/programs/segment.hpp>
87

98
#include <memory>
109

1110
namespace mbgl {
1211

13-
template <class AttributeList>
14-
class Segment;
12+
class SegmentBase;
1513
class PaintParameters;
1614

1715
namespace gfx {

‎include/mbgl/gl/texture2d.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#include <mbgl/gfx/texture2d.hpp>
4+
#include <mbgl/gl/object.hpp>
45
#include <mbgl/platform/gl_functions.hpp>
56
#include <mbgl/util/image.hpp>
67

@@ -66,7 +67,7 @@ class Texture2D : public gfx::Texture2D {
6667

6768
private:
6869
gl::Context& context;
69-
std::unique_ptr<gfx::TextureResource> textureResource{nullptr};
70+
std::unique_ptr<UniqueTexture> texture;
7071

7172
SamplerState samplerState{};
7273
gfx::TexturePixelType pixelFormat{gfx::TexturePixelType::RGBA};

‎include/mbgl/mtl/context.hpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22

3-
#include <mbgl/gfx/texture.hpp>
43
#include <mbgl/gfx/draw_mode.hpp>
54
#include <mbgl/gfx/depth_mode.hpp>
65
#include <mbgl/gfx/stencil_mode.hpp>
@@ -109,10 +108,6 @@ class Context final : public gfx::Context {
109108

110109
std::unique_ptr<gfx::OffscreenTexture> createOffscreenTexture(Size, gfx::TextureChannelDataType) override;
111110

112-
std::unique_ptr<gfx::TextureResource> createTextureResource(Size,
113-
gfx::TexturePixelType,
114-
gfx::TextureChannelDataType) override;
115-
116111
std::unique_ptr<gfx::RenderbufferResource> createRenderbufferResource(gfx::RenderbufferPixelType,
117112
Size size) override;
118113

‎include/mbgl/mtl/drawable.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <mbgl/gfx/drawable.hpp>
44
#include <mbgl/gfx/draw_mode.hpp>
55
#include <mbgl/mtl/upload_pass.hpp>
6-
#include <mbgl/programs/segment.hpp>
6+
#include <mbgl/shaders/segment.hpp>
77

88
#include <memory>
99

0 commit comments

Comments
 (0)