From 9d638f2ffe134238e7a0503fd8c6a7b5b8190a59 Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Mon, 8 Sep 2025 06:50:33 -0700 Subject: [PATCH] fix some missing public headers referenced by other public headers (macos) (#3791) --- CMakeLists.txt | 14 +++++++------- bazel/core.bzl | 14 +++++++------- {src => include}/mbgl/gfx/color_mode.hpp | 0 {src => include}/mbgl/gfx/depth_mode.hpp | 0 {src => include}/mbgl/gfx/draw_mode.hpp | 0 {src => include}/mbgl/gfx/draw_scope.hpp | 0 {src => include}/mbgl/gfx/renderbuffer.hpp | 0 {src => include}/mbgl/gfx/stencil_mode.hpp | 0 {src => include}/mbgl/gfx/vertex_buffer.hpp | 0 9 files changed, 14 insertions(+), 14 deletions(-) rename {src => include}/mbgl/gfx/color_mode.hpp (100%) rename {src => include}/mbgl/gfx/depth_mode.hpp (100%) rename {src => include}/mbgl/gfx/draw_mode.hpp (100%) rename {src => include}/mbgl/gfx/draw_scope.hpp (100%) rename {src => include}/mbgl/gfx/renderbuffer.hpp (100%) rename {src => include}/mbgl/gfx/stencil_mode.hpp (100%) rename {src => include}/mbgl/gfx/vertex_buffer.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fb7b4dcb..f2bd567b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,18 +227,25 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/annotation/annotation.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/backend_scope.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/backend.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/color_mode.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/command_encoder.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/debug_group.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/depth_mode.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/draw_mode.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/draw_scope.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/fill_generator.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/gfx_types.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/polyline_generator.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/renderable.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/renderbuffer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/renderer_backend.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/rendering_stats.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/shader_group.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/shader_registry.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/shader.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/stencil_mode.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/types.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/vertex_buffer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/background_layer_factory.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/circle_layer_factory.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/custom_layer_factory.hpp @@ -476,26 +483,19 @@ list(APPEND SRC_FILES ${PROJECT_SOURCE_DIR}/src/mbgl/geometry/line_atlas.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/attribute.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/attribute.hpp - ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/color_mode.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/cull_face_mode.hpp - ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/depth_mode.hpp - ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/draw_mode.hpp - ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/draw_scope.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/index_buffer.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/index_vector.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/offscreen_texture.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/polyline_generator.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/fill_generator.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/render_pass.hpp - ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/renderbuffer.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/renderer_backend.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/rendering_stats.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/shader_group.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/shader_registry.cpp - ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/stencil_mode.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/uniform.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/upload_pass.hpp - ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/vertex_buffer.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/vertex_vector.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/layermanager/background_layer_factory.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/layermanager/circle_layer_factory.cpp diff --git a/bazel/core.bzl b/bazel/core.bzl index 6dae94b45..d21d74766 100644 --- a/bazel/core.bzl +++ b/bazel/core.bzl @@ -140,26 +140,19 @@ MLN_CORE_SOURCE = [ "src/mbgl/geometry/line_atlas.hpp", "src/mbgl/gfx/attribute.cpp", "src/mbgl/gfx/attribute.hpp", - "src/mbgl/gfx/color_mode.hpp", "src/mbgl/gfx/cull_face_mode.hpp", - "src/mbgl/gfx/depth_mode.hpp", - "src/mbgl/gfx/draw_mode.hpp", - "src/mbgl/gfx/draw_scope.hpp", "src/mbgl/gfx/fill_generator.cpp", "src/mbgl/gfx/index_buffer.hpp", "src/mbgl/gfx/index_vector.hpp", "src/mbgl/gfx/offscreen_texture.hpp", "src/mbgl/gfx/polyline_generator.cpp", "src/mbgl/gfx/render_pass.hpp", - "src/mbgl/gfx/renderbuffer.hpp", "src/mbgl/gfx/renderer_backend.cpp", "src/mbgl/gfx/rendering_stats.cpp", "src/mbgl/gfx/shader_registry.cpp", "src/mbgl/gfx/shader_group.cpp", - "src/mbgl/gfx/stencil_mode.hpp", "src/mbgl/gfx/uniform.hpp", "src/mbgl/gfx/upload_pass.hpp", - "src/mbgl/gfx/vertex_buffer.hpp", "src/mbgl/gfx/vertex_vector.hpp", "src/mbgl/layermanager/background_layer_factory.cpp", "src/mbgl/layermanager/circle_layer_factory.cpp", @@ -623,16 +616,23 @@ MLN_CORE_HEADERS = [ "include/mbgl/annotation/annotation.hpp", "include/mbgl/gfx/backend.hpp", "include/mbgl/gfx/backend_scope.hpp", + "include/mbgl/gfx/color_mode.hpp", + "include/mbgl/gfx/depth_mode.hpp", + "include/mbgl/gfx/draw_mode.hpp", + "include/mbgl/gfx/draw_scope.hpp", "include/mbgl/gfx/fill_generator.hpp", "include/mbgl/gfx/gfx_types.hpp", "include/mbgl/gfx/polyline_generator.hpp", + "include/mbgl/gfx/renderbuffer.hpp", "include/mbgl/gfx/renderable.hpp", "include/mbgl/gfx/renderer_backend.hpp", "include/mbgl/gfx/rendering_stats.hpp", "include/mbgl/gfx/shader_registry.hpp", "include/mbgl/gfx/shader_group.hpp", "include/mbgl/gfx/shader.hpp", + "include/mbgl/gfx/stencil_mode.hpp", "include/mbgl/gfx/types.hpp", + "include/mbgl/gfx/vertex_buffer.hpp", "include/mbgl/i18n/collator.hpp", "include/mbgl/i18n/number_format.hpp", "include/mbgl/layermanager/background_layer_factory.hpp", diff --git a/src/mbgl/gfx/color_mode.hpp b/include/mbgl/gfx/color_mode.hpp similarity index 100% rename from src/mbgl/gfx/color_mode.hpp rename to include/mbgl/gfx/color_mode.hpp diff --git a/src/mbgl/gfx/depth_mode.hpp b/include/mbgl/gfx/depth_mode.hpp similarity index 100% rename from src/mbgl/gfx/depth_mode.hpp rename to include/mbgl/gfx/depth_mode.hpp diff --git a/src/mbgl/gfx/draw_mode.hpp b/include/mbgl/gfx/draw_mode.hpp similarity index 100% rename from src/mbgl/gfx/draw_mode.hpp rename to include/mbgl/gfx/draw_mode.hpp diff --git a/src/mbgl/gfx/draw_scope.hpp b/include/mbgl/gfx/draw_scope.hpp similarity index 100% rename from src/mbgl/gfx/draw_scope.hpp rename to include/mbgl/gfx/draw_scope.hpp diff --git a/src/mbgl/gfx/renderbuffer.hpp b/include/mbgl/gfx/renderbuffer.hpp similarity index 100% rename from src/mbgl/gfx/renderbuffer.hpp rename to include/mbgl/gfx/renderbuffer.hpp diff --git a/src/mbgl/gfx/stencil_mode.hpp b/include/mbgl/gfx/stencil_mode.hpp similarity index 100% rename from src/mbgl/gfx/stencil_mode.hpp rename to include/mbgl/gfx/stencil_mode.hpp diff --git a/src/mbgl/gfx/vertex_buffer.hpp b/include/mbgl/gfx/vertex_buffer.hpp similarity index 100% rename from src/mbgl/gfx/vertex_buffer.hpp rename to include/mbgl/gfx/vertex_buffer.hpp