Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixing merge errors

Browse source
This commit is contained in:
Bradley Austin Davis 2018-02-09 10:30:57 -08:00
parent dbc4b1533d
commit 7102cf44b8
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -2427,10 +2427,6 @@ void Application::initializeUi() {
} }
auto offscreenUi = DependencyManager::get<OffscreenUi>(); auto offscreenUi = DependencyManager::get<OffscreenUi>();
DeadlockWatchdogThread::withPause([&] {
offscreenUi->create();
});
connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootContextCreated, connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootContextCreated,
this, &Application::onDesktopRootContextCreated); this, &Application::onDesktopRootContextCreated);
connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootItemCreated, connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootItemCreated,
@ -2439,7 +2435,9 @@ void Application::initializeUi() {
offscreenUi->setProxyWindow(_window->windowHandle()); offscreenUi->setProxyWindow(_window->windowHandle());
// OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to
// support the window management and scripting proxies for VR use // support the window management and scripting proxies for VR use
offscreenUi->createDesktop(PathUtils::qmlUrl("hifi/Desktop.qml")); DeadlockWatchdogThread::withPause([&] {
offscreenUi->createDesktop(PathUtils::qmlUrl("hifi/Desktop.qml"));
});
// FIXME either expose so that dialogs can set this themselves or // FIXME either expose so that dialogs can set this themselves or
// do better detection in the offscreen UI of what has focus // do better detection in the offscreen UI of what has focus
offscreenUi->setNavigationFocused(false); offscreenUi->setNavigationFocused(false);

5
libraries/gpu-gles/src/gpu/gl/GLShared.h
View file

@ -9,11 +9,14 @@
#define hifi_gpu_GLShared_h #define hifi_gpu_GLShared_h
#include <gl/Config.h> #include <gl/Config.h>
#include <gl/GLHelpers.h>
#include <gpu/Forward.h> #include <gpu/Forward.h>
#include <gpu/Format.h> #include <gpu/Format.h>
#include <gpu/Context.h> #include <gpu/Context.h>
#include <QLoggingCategory> #include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(gpugllogging) Q_DECLARE_LOGGING_CATEGORY(gpugllogging)
Q_DECLARE_LOGGING_CATEGORY(trace_render_gpu_gl) Q_DECLARE_LOGGING_CATEGORY(trace_render_gpu_gl)
Q_DECLARE_LOGGING_CATEGORY(trace_render_gpu_gl_detail) Q_DECLARE_LOGGING_CATEGORY(trace_render_gpu_gl_detail)
@ -143,8 +146,6 @@ struct ShaderObject;
} } // namespace gpu::gl } } // namespace gpu::gl
#define CHECK_GL_ERROR() gpu::gl::checkGLErrorDebug(__FUNCTION__)
#endif #endif