From 1c0f797b0b05f6c60d25dac47313082e4bc0cadf Mon Sep 17 00:00:00 2001 From: "Randall E. Barker" Date: Wed, 14 Aug 2019 08:55:45 -0700 Subject: [PATCH] Pause PerformanceMonitor while loading envs. Fixes #1483 --- app/src/main/cpp/BrowserWorld.cpp | 1 + app/src/main/cpp/vrb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/cpp/BrowserWorld.cpp b/app/src/main/cpp/BrowserWorld.cpp index 30e791d84..0507230ed 100644 --- a/app/src/main/cpp/BrowserWorld.cpp +++ b/app/src/main/cpp/BrowserWorld.cpp @@ -1320,6 +1320,7 @@ BrowserWorld::DrawSplashAnimation() { void BrowserWorld::CreateSkyBox(const std::string& aBasePath, const std::string& aExtension) { ASSERT_ON_RENDER_THREAD(); + vrb::PausePerformanceMonitor pauseMonitor(*m.monitor); const bool empty = aBasePath == "cubemap/void"; const std::string extension = aExtension.empty() ? ".ktx" : aExtension; const GLenum glFormat = extension == ".ktx" ? GL_COMPRESSED_RGB8_ETC2 : GL_RGBA8; diff --git a/app/src/main/cpp/vrb b/app/src/main/cpp/vrb index 17564614d..b14cc4362 160000 --- a/app/src/main/cpp/vrb +++ b/app/src/main/cpp/vrb @@ -1 +1 @@ -Subproject commit 17564614d81e5f8e164d382c62fa35d4718e36b1 +Subproject commit b14cc4362c7fe0b2e6a3ed67ce25326ac39782f0