tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Metal setup merge (#1616)

Browse Source 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Alex Cristici <alex.cristici@gmail.com>
Co-authored-by: mwilsnd <mwilsnd@gmail.com>
Co-authored-by: Stefan Karschti <stefan.karschti@gmail.com>
Co-authored-by: Bart Louwers <bart@emeel.net>
Co-authored-by: Alex Cristici <alex@skoon.energy>
Co-authored-by: Bart Louwers <bart.louwers@gmail.com>
Co-authored-by: Wei Chen <alanchenboy@gmail.com>
Co-authored-by: Siarhei Fedartsou <siarhei.fedartsou@gmail.com>
Co-authored-by: tdcosta100 <tdcosta100@gmail.com>
This commit is contained in:
Tim Sylvester
2023-09-13 11:35:20 -07:00
committed by GitHub
parent 085b0ced6d
commit 82ec59a2b0
284 changed files with 32357 additions and 1155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/macos/BUILD.bazel
View File

@@ -3,6 +3,8 @@ load(
"MLN_MACOS_PRIVATE_HEADERS",
"MLN_MACOS_PUBLIC_HEADERS",
"MLN_MACOS_PUBLIC_OBJCPP_SOURCE",
"MLN_MACOS_PUBLIC_OBJCPP_OPENGL_SOURCE",
"MLN_MACOS_PUBLIC_OBJCPP_METAL_SOURCE",
"MLN_MACOS_PUBLIC_OBJC_SOURCE",
)
@@ -20,7 +22,10 @@ filegroup(
filegroup(
name = "macos_objcpp_srcs",
srcs = MLN_MACOS_PUBLIC_OBJCPP_SOURCE,
srcs = MLN_MACOS_PUBLIC_OBJCPP_SOURCE + select({
"//:metal_renderer": MLN_MACOS_PUBLIC_OBJCPP_METAL_SOURCE,
"//conditions:default": MLN_MACOS_PUBLIC_OBJCPP_OPENGL_SOURCE,
}),
visibility = ["//visibility:public"],
)
@@ -34,5 +39,6 @@ exports_files(
MLN_MACOS_PRIVATE_HEADERS +
MLN_MACOS_PUBLIC_HEADERS +
MLN_MACOS_PUBLIC_OBJCPP_SOURCE +
MLN_MACOS_PUBLIC_OBJC_SOURCE,
MLN_MACOS_PUBLIC_OBJCPP_METAL_SOURCE +
MLN_MACOS_PUBLIC_OBJC_SOURCE
)

7
platform/macos/bazel/files.bzl
View File

@@ -1,13 +1,18 @@
MLN_MACOS_PUBLIC_OBJCPP_SOURCE = [
"src/MLNAttributionButton.mm",
"src/MLNMapView+IBAdditions.mm",
"src/MLNMapView+OpenGL.mm",
"src/MLNMapView+Impl.mm",
"src/MLNMapView.mm",
"src/MLNOpenGLLayer.mm",
"src/NSColor+MLNAdditions.mm",
"src/NSImage+MLNAdditions.mm",
]
MLN_MACOS_PUBLIC_OBJCPP_OPENGL_SOURCE = [
"src/MLNMapView+OpenGL.mm",
]
MLN_MACOS_PUBLIC_OBJCPP_METAL_SOURCE = [
"src/MLNMapView+OpenGL.mm",
]
MLN_MACOS_PUBLIC_OBJC_SOURCE = [
"src/MLNAnnotationImage.m",

7
platform/macos/src/MLNMapView+Impl.mm
View File

@@ -1,8 +1,13 @@
#import "MLNMapView+Impl.h"
#import "MLNMapView+OpenGL.h"
#import "MLNStyle_Private.h"
#import "NSBundle+MLNAdditions.h"
#if MLN_RENDER_BACKEND_METAL
#import "MLNMapView+Metal.h"
#else // MLN_RENDER_BACKEND_OPENGL
#import "MLNMapView+OpenGL.h"
#endif
#include <mbgl/map/map.hpp>
#include <mbgl/style/style.hpp>