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

Revert most of "Rm extra GL logging"

Browse source
This commit is contained in:
Zach Pomerantz 2016-03-22 13:24:29 -07:00
parent 362e288be8
commit 471ac80135
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/gl/src/gl/GLWindow.cpp
View file

@ -39,6 +39,14 @@ GLWindow::~GLWindow() {
bool GLWindow::makeCurrent() { bool GLWindow::makeCurrent() {
bool makeCurrentResult = _context->makeCurrent(this); bool makeCurrentResult = _context->makeCurrent(this);
Q_ASSERT(makeCurrentResult); Q_ASSERT(makeCurrentResult);
std::call_once(_reportOnce, []{
qDebug() << "GL Version: " << QString((const char*) glGetString(GL_VERSION));
qDebug() << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION));
qDebug() << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR));
qDebug() << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER));
});
Q_ASSERT(_context == QOpenGLContext::currentContext()); Q_ASSERT(_context == QOpenGLContext::currentContext());
return makeCurrentResult; return makeCurrentResult;

9
libraries/gl/src/gl/OffscreenGLCanvas.cpp
View file

@ -44,8 +44,6 @@ bool OffscreenGLCanvas::create(QOpenGLContext* sharedContext) {
return true; return true;
} }
qWarning() << "Failed to create OffscreenGLCanvas";
return false; return false;
} }
@ -53,6 +51,13 @@ bool OffscreenGLCanvas::makeCurrent() {
bool result = _context->makeCurrent(_offscreenSurface); bool result = _context->makeCurrent(_offscreenSurface);
Q_ASSERT(result); Q_ASSERT(result);
std::call_once(_reportOnce, []{
qDebug() << "GL Version: " << QString((const char*) glGetString(GL_VERSION));
qDebug() << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION));
qDebug() << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR));
qDebug() << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER));
});
#ifdef DEBUG #ifdef DEBUG
if (result && !_logger) { if (result && !_logger) {
_logger = new QOpenGLDebugLogger(this); _logger = new QOpenGLDebugLogger(this);