From 17dcd8b87ade0c94aed111ac01266e090c2eeb10 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Tue, 11 Dec 2018 10:13:19 -0800 Subject: [PATCH] disable splash screen on android --- interface/src/graphics/GraphicsEngine.cpp | 2 ++ interface/src/graphics/GraphicsEngine.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/interface/src/graphics/GraphicsEngine.cpp b/interface/src/graphics/GraphicsEngine.cpp index 36bf3a1b97..c2137d3d97 100644 --- a/interface/src/graphics/GraphicsEngine.cpp +++ b/interface/src/graphics/GraphicsEngine.cpp @@ -56,9 +56,11 @@ void GraphicsEngine::initializeGPU(GLWidget* glwidget) { glwidget->makeCurrent(); _gpuContext = std::make_shared(); +#ifndef Q_OS_ANDROID _gpuContext->pushProgramsToSync(shader::allPrograms(), [this] { _programsCompiled.store(true); }, 1); +#endif DependencyManager::get()->setGPUContext(_gpuContext); } diff --git a/interface/src/graphics/GraphicsEngine.h b/interface/src/graphics/GraphicsEngine.h index 83e774a64f..f0b88d2459 100644 --- a/interface/src/graphics/GraphicsEngine.h +++ b/interface/src/graphics/GraphicsEngine.h @@ -86,7 +86,11 @@ protected: FrameTimingsScriptingInterface _frameTimingsScriptingInterface; std::shared_ptr _splashScreen { std::make_shared() }; +#ifndef Q_OS_ANDROID std::atomic _programsCompiled { false }; +#else + std::atomic _programsCompiled { true }; +#endif friend class Application; };