Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:23:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #14561 from SamGondelman/androidCrash

Browse source 
Case 20250: Disable splash screen on android
This commit is contained in:
Sam Gateau 2018-12-11 11:21:08 -08:00 committed by GitHub
commit 556a3ad00c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/graphics/GraphicsEngine.cpp
View file

@ -56,9 +56,11 @@ void GraphicsEngine::initializeGPU(GLWidget* glwidget) {
glwidget->makeCurrent();
_gpuContext = std::make_shared<gpu::Context>();
#ifndef Q_OS_ANDROID
_gpuContext->pushProgramsToSync(shader::allPrograms(), [this] {
_programsCompiled.store(true);
}, 1);
#endif
DependencyManager::get<TextureCache>()->setGPUContext(_gpuContext);
}

4
interface/src/graphics/GraphicsEngine.h
View file

@ -86,7 +86,11 @@ protected:
FrameTimingsScriptingInterface _frameTimingsScriptingInterface;
std::shared_ptr<ProceduralSkybox> _splashScreen { std::make_shared<ProceduralSkybox>() };
#ifndef Q_OS_ANDROID
std::atomic<bool> _programsCompiled { false };
#else
std::atomic<bool> _programsCompiled { true };
#endif
friend class Application;
};