diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-08 10:25:22 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-09 23:42:15 +0200 |
commit | 166954f8102ea6c05dd39a0f12bdfdbf1b631963 (patch) | |
tree | 867aaca332ca0eb529b0d662c7686dbd5d9cb9c7 /src/quick/scenegraph/qsgdefaultcontext.cpp | |
parent | 598a98137be0122c645a9c1c52ea821633590502 (diff) |
Make rendercontext OpenGL clean
Task-number: QTBUG-84623
Change-Id: I5cf3c0db01b0c519f803fd49be820a910881dcff
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultcontext.cpp')
-rw-r--r-- | src/quick/scenegraph/qsgdefaultcontext.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/quick/scenegraph/qsgdefaultcontext.cpp b/src/quick/scenegraph/qsgdefaultcontext.cpp index 8318d96eac..bb998df912 100644 --- a/src/quick/scenegraph/qsgdefaultcontext.cpp +++ b/src/quick/scenegraph/qsgdefaultcontext.cpp @@ -154,28 +154,6 @@ void QSGDefaultContext::renderContextInitialized(QSGRenderContext *renderContext #endif } - static bool dumped = false; - if (!dumped && QSG_LOG_INFO().isDebugEnabled() && !rc->rhi()) { - dumped = true; - QSurfaceFormat format = rc->openglContext()->format(); - QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions(); - qCDebug(QSG_LOG_INFO, "R/G/B/A Buffers: %d %d %d %d", format.redBufferSize(), - format.greenBufferSize(), format.blueBufferSize(), format.alphaBufferSize()); - qCDebug(QSG_LOG_INFO, "Depth Buffer: %d", format.depthBufferSize()); - qCDebug(QSG_LOG_INFO, "Stencil Buffer: %d", format.stencilBufferSize()); - qCDebug(QSG_LOG_INFO, "Samples: %d", format.samples()); - qCDebug(QSG_LOG_INFO, "GL_VENDOR: %s", (const char*)funcs->glGetString(GL_VENDOR)); - qCDebug(QSG_LOG_INFO, "GL_RENDERER: %s", - (const char*)funcs->glGetString(GL_RENDERER)); - qCDebug(QSG_LOG_INFO, "GL_VERSION: %s", (const char*)funcs->glGetString(GL_VERSION)); - QByteArrayList exts = rc->openglContext()->extensions().values(); - std::sort(exts.begin(), exts.end()); - qCDebug(QSG_LOG_INFO, "GL_EXTENSIONS: %s", exts.join(' ').constData()); - qCDebug(QSG_LOG_INFO, "Max Texture Size: %d", rc->maxTextureSize()); - qCDebug(QSG_LOG_INFO, "Debug context: %s", - format.testOption(QSurfaceFormat::DebugContext) ? "true" : "false"); - } - m_mutex.unlock(); } @@ -320,11 +298,6 @@ void *QSGDefaultContext::getResource(QQuickWindow *window, Resource resource) co QSGRhiSupport *rhiSupport = QSGRhiSupport::instance(); switch (resource) { - case OpenGLContextResource: - if (rhiSupport->graphicsApi() == OpenGL) - return rc->openglContext(); - else - return const_cast<void *>(rhiSupport->rifResource(resource, rc, window)); #if QT_CONFIG(vulkan) case VulkanInstanceResource: return window->vulkanInstance(); |