Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 20:16:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix QOpenGL warning

Browse source
This commit is contained in:
Atlante45 2015-12-07 08:37:07 -08:00
parent 18198cb6fb
commit f8ee377f01
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -45,7 +45,7 @@
#include <QtNetwork/QNetworkDiskCache> #include <QtNetwork/QNetworkDiskCache>
#include <gl/Config.h> #include <gl/Config.h>
#include <QtGui/QOpenGLContext> #include <QOpenGLContextWrapper.h>
#include <AccountManager.h> #include <AccountManager.h>
#include <AddressManager.h> #include <AddressManager.h>
@ -1397,13 +1397,13 @@ void Application::paintGL() {
_lockedFramebufferMap[finalTexture] = scratchFramebuffer; _lockedFramebufferMap[finalTexture] = scratchFramebuffer;
uint64_t displayStart = usecTimestampNow(); uint64_t displayStart = usecTimestampNow();
Q_ASSERT(QOpenGLContext::currentContext() == _offscreenContext->getContext()); Q_ASSERT(isCurrentContext(_offscreenContext->getContext()));
{ {
PROFILE_RANGE(__FUNCTION__ "/pluginSubmitScene"); PROFILE_RANGE(__FUNCTION__ "/pluginSubmitScene");
PerformanceTimer perfTimer("pluginSubmitScene"); PerformanceTimer perfTimer("pluginSubmitScene");
displayPlugin->submitSceneTexture(_frameCount, finalTexture, toGlm(size)); displayPlugin->submitSceneTexture(_frameCount, finalTexture, toGlm(size));
} }
Q_ASSERT(QOpenGLContext::currentContext() == _offscreenContext->getContext()); Q_ASSERT(isCurrentContext(_offscreenContext->getContext()));
uint64_t displayEnd = usecTimestampNow(); uint64_t displayEnd = usecTimestampNow();
const float displayPeriodUsec = (float)(displayEnd - displayStart); // usecs const float displayPeriodUsec = (float)(displayEnd - displayStart); // usecs

4
libraries/render-utils/src/QOpenGLContextWrapper.cpp
View file

@ -37,4 +37,8 @@ bool QOpenGLContextWrapper::makeCurrent(QSurface* surface) {
void QOpenGLContextWrapper::doneCurrent() { void QOpenGLContextWrapper::doneCurrent() {
_context->doneCurrent(); _context->doneCurrent();
}
bool isCurrentContext(QOpenGLContext* context) {
return QOpenGLContext::currentContext() == context;
} }

2
libraries/render-utils/src/QOpenGLContextWrapper.h
View file

@ -30,4 +30,6 @@ private:
QOpenGLContext* _context { nullptr }; QOpenGLContext* _context { nullptr };
}; };
bool isCurrentContext(QOpenGLContext* context);
#endif // hifi_QOpenGLContextWrapper_h #endif // hifi_QOpenGLContextWrapper_h