aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-06-12 17:25:31 +0200
committerKonstantin Käfer <mail@kkaefer.com>2019-06-12 18:08:18 +0200
commitd37212421955bb144f67905fbd1e7321a74b465b (patch)
treec2da34f95b26d9540323bbf6b5395504d34b2c7b
parentc2fb3cc76f238908b8c469f47ca547565bcd0242 (diff)
[ios] fix benchmark app
-rw-r--r--platform/ios/benchmark/MBXBenchViewController.mm7
-rw-r--r--platform/ios/ios.xcodeproj/project.pbxproj5
2 files changed, 9 insertions, 3 deletions
diff --git a/platform/ios/benchmark/MBXBenchViewController.mm b/platform/ios/benchmark/MBXBenchViewController.mm
index 21e9ce2d9..67d9b5cb6 100644
--- a/platform/ios/benchmark/MBXBenchViewController.mm
+++ b/platform/ios/benchmark/MBXBenchViewController.mm
@@ -45,6 +45,7 @@
self.mapView.scrollEnabled = NO;
self.mapView.rotateEnabled = NO;
self.mapView.userInteractionEnabled = YES;
+ self.mapView.preferredFramesPerSecond = MGLMapViewPreferredFramesPerSecondMaximum;
[self.view addSubview:self.mapView];
}
@@ -112,7 +113,7 @@ static const int benchmarkDuration = 200; // frames
idx++;
[self startBenchmarkIteration];
} else {
- [mapView setNeedsGLDisplay];
+ [mapView setNeedsRerender];
}
return;
}
@@ -127,7 +128,7 @@ static const int benchmarkDuration = 200; // frames
started = std::chrono::steady_clock::now();
NSLog(@"- Benchmarking for %d frames...", benchmarkDuration);
}
- [mapView setNeedsGLDisplay];
+ [mapView setNeedsRerender];
return;
}
@@ -139,7 +140,7 @@ static const int benchmarkDuration = 200; // frames
state = State::WarmingUp;
[self.mapView didReceiveMemoryWarning];
NSLog(@"- Warming up for %d frames...", warmupDuration);
- [mapView setNeedsGLDisplay];
+ [mapView setNeedsRerender];
}
return;
}
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index ed9ac56f0..cbeeebd7b 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -3911,6 +3911,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = GJZR2MEM28;
+ HEADER_SEARCH_PATHS = "$(mbgl_core_INCLUDE_DIRECTORIES)";
INFOPLIST_FILE = "$(SRCROOT)/benchmark/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.bench;
@@ -4527,9 +4528,11 @@
};
DABCABBC1CB80692000A7C39 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 55D8C9941D0F133500F42F10 /* config.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = GJZR2MEM28;
+ HEADER_SEARCH_PATHS = "$(mbgl_core_INCLUDE_DIRECTORIES)";
INFOPLIST_FILE = "$(SRCROOT)/benchmark/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.bench;
@@ -4539,9 +4542,11 @@
};
DABCABBD1CB80692000A7C39 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 55D8C9941D0F133500F42F10 /* config.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = GJZR2MEM28;
+ HEADER_SEARCH_PATHS = "$(mbgl_core_INCLUDE_DIRECTORIES)";
INFOPLIST_FILE = "$(SRCROOT)/benchmark/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.bench;