From d37212421955bb144f67905fbd1e7321a74b465b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Wed, 12 Jun 2019 17:25:31 +0200 Subject: [ios] fix benchmark app --- platform/ios/benchmark/MBXBenchViewController.mm | 7 ++++--- platform/ios/ios.xcodeproj/project.pbxproj | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/platform/ios/benchmark/MBXBenchViewController.mm b/platform/ios/benchmark/MBXBenchViewController.mm index 21e9ce2d98..67d9b5cb6e 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 ed9ac56f04..cbeeebd7bc 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; -- cgit v1.2.1