From 21632a66f83e1e42bf6383f877d85a4fab4ad273 Mon Sep 17 00:00:00 2001 From: Ander Conselvan de Oliveira Date: Tue, 27 Aug 2019 14:25:55 +0300 Subject: [core] Remove programCacheDir parameter from ProgramParameters Binary shader support has been removed in commit c2f974f2a573 ([core] Remove binary shader support). This left-over parameter is not used anywhere anymore. --- platform/darwin/src/MGLMapSnapshotter.mm | 2 +- platform/darwin/src/MGLRendererConfiguration.h | 3 --- platform/darwin/src/MGLRendererConfiguration.mm | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'platform/darwin/src') diff --git a/platform/darwin/src/MGLMapSnapshotter.mm b/platform/darwin/src/MGLMapSnapshotter.mm index 65bed2cf42..0001ebcb86 100644 --- a/platform/darwin/src/MGLMapSnapshotter.mm +++ b/platform/darwin/src/MGLMapSnapshotter.mm @@ -624,7 +624,7 @@ const CGFloat MGLSnapshotterMinimumPixelSize = 64; // Create the snapshotter _mbglMapSnapshotter = std::make_unique( - style, size, pixelRatio, cameraOptions, coordinateBounds, config.cacheDir, config.localFontFamilyName, resourceOptions); + style, size, pixelRatio, cameraOptions, coordinateBounds, config.localFontFamilyName, resourceOptions); } @end diff --git a/platform/darwin/src/MGLRendererConfiguration.h b/platform/darwin/src/MGLRendererConfiguration.h index bfe88b7209..0c539f86f1 100644 --- a/platform/darwin/src/MGLRendererConfiguration.h +++ b/platform/darwin/src/MGLRendererConfiguration.h @@ -20,9 +20,6 @@ MGL_EXPORT Based on the native scale where available, otherwise the standard screen scale. */ @property (nonatomic, readonly) const float scaleFactor; -/** The cache dir to use. */ -@property (nonatomic, readonly) mbgl::optional cacheDir; - /** The name of the font family to use for client-side text rendering of CJK ideographs. Set MGLIdeographicFontFamilyName in your containing application's Info.plist to diff --git a/platform/darwin/src/MGLRendererConfiguration.mm b/platform/darwin/src/MGLRendererConfiguration.mm index 54bdcaa691..136dc929a6 100644 --- a/platform/darwin/src/MGLRendererConfiguration.mm +++ b/platform/darwin/src/MGLRendererConfiguration.mm @@ -66,10 +66,6 @@ static NSString * const MGLIdeographicFontFamilyNameKey = @"MGLIdeographicFontFa #endif } -- (mbgl::optional)cacheDir { - return mbgl::optional(); -} - - (mbgl::optional)localFontFamilyName { return [self _localFontFamilyNameWithPropertyDictionary:[[NSBundle mainBundle] infoDictionary]]; } -- cgit v1.2.1