Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 8 insertions, 10 deletions

diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
index 5d308915650..d7a6d322188 100644
--- a/src/gui/opengl/qopenglframebufferobject.cpp
+++ b/src/gui/opengl/qopenglframebufferobject.cpp
@@ -551,7 +551,7 @@ void QOpenGLFramebufferObjectPrivate::initTexture(int idx)
         pixelType = GL_UNSIGNED_SHORT;
 
     funcs.glTexImage2D(target, 0, color.internalFormat, color.size.width(), color.size.height(), 0,
-                       GL_RGBA, pixelType, NULL);
+                       GL_RGBA, pixelType, nullptr);
     if (format.mipmap()) {
         int width = color.size.width();
         int height = color.size.height();
@@ -561,7 +561,7 @@ void QOpenGLFramebufferObjectPrivate::initTexture(int idx)
             height = qMax(1, height >> 1);
             ++level;
             funcs.glTexImage2D(target, level, color.internalFormat, width, height, 0,
-                               GL_RGBA, pixelType, NULL);
+                               GL_RGBA, pixelType, nullptr);
         }
     }
     funcs.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + idx,
@@ -640,8 +640,8 @@ void QOpenGLFramebufferObjectPrivate::initDepthStencilAttachments(QOpenGLContext
             stencil_buffer_guard->free();
     }
 
-    depth_buffer_guard = 0;
-    stencil_buffer_guard = 0;
+    depth_buffer_guard = nullptr;
+    stencil_buffer_guard = nullptr;
 
     GLuint depth_buffer = 0;
     GLuint stencil_buffer = 0;
@@ -658,13 +658,11 @@ void QOpenGLFramebufferObjectPrivate::initDepthStencilAttachments(QOpenGLContext
         funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer);
         Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer));
 
-        GLenum storageFormat = GL_DEPTH_STENCIL;
-
         if (samples != 0 ) {
             funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                                                   storageFormat, dsSize.width(), dsSize.height());
+                                                   GL_DEPTH24_STENCIL8, dsSize.width(), dsSize.height());
         } else {
-            funcs.glRenderbufferStorage(GL_RENDERBUFFER, storageFormat,
+            funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_STENCIL,
                                         dsSize.width(), dsSize.height());
         }
 
@@ -1286,7 +1284,7 @@ GLuint QOpenGLFramebufferObject::takeTexture(int colorAttachmentIndex)
         id = guard ? guard->id() : 0;
         // Do not call free() on texture_guard, just null it out.
         // This way the texture will not be deleted when the guard is destroyed.
-        guard = 0;
+        guard = nullptr;
     }
     return id;
 }
@@ -1566,7 +1564,7 @@ bool QOpenGLFramebufferObject::bindDefault()
         qWarning("QOpenGLFramebufferObject::bindDefault() called without current context.");
 #endif
 
-    return ctx != 0;
+    return ctx != nullptr;
 }
 
 /*!