Merge pull request #5564 from jherico/maggie

Fix warning messages about depth and stencil buffers for the QML surfaces
This commit is contained in:
Brad Hefta-Gaub 2015-08-15 11:15:04 -07:00
commit 34403c6242

View file

@ -34,11 +34,9 @@ OffscreenGlCanvas::~OffscreenGlCanvas() {
void OffscreenGlCanvas::create(QOpenGLContext* sharedContext) { void OffscreenGlCanvas::create(QOpenGLContext* sharedContext) {
if (nullptr != sharedContext) { if (nullptr != sharedContext) {
sharedContext->doneCurrent(); sharedContext->doneCurrent();
_context->setFormat(sharedContext->format());
_context->setShareContext(sharedContext); _context->setShareContext(sharedContext);
} else {
_context->setFormat(getDefaultOpenGlSurfaceFormat());
} }
_context->setFormat(getDefaultOpenGlSurfaceFormat());
_context->create(); _context->create();
_offscreenSurface->setFormat(_context->format()); _offscreenSurface->setFormat(_context->format());