summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl/qopenglshaderprogram.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/opengl/qopenglshaderprogram.cpp')
-rw-r--r--src/gui/opengl/qopenglshaderprogram.cpp52
1 files changed, 28 insertions, 24 deletions
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
index 824831ab29..a7c8aae989 100644
--- a/src/gui/opengl/qopenglshaderprogram.cpp
+++ b/src/gui/opengl/qopenglshaderprogram.cpp
@@ -1,31 +1,37 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
@@ -244,7 +250,7 @@ bool QOpenGLShaderPrivate::create()
shader = glfuncs->glCreateShader(GL_FRAGMENT_SHADER);
}
if (!shader) {
- qWarning() << "QOpenGLShader: could not create shader";
+ qWarning("QOpenGLShader: could not create shader");
return false;
}
shaderGuard = new QOpenGLSharedResourceGuard(context, shader, freeShaderFunc);
@@ -732,7 +738,7 @@ QOpenGLShaderProgramPrivate::~QOpenGLShaderProgramPrivate()
bool QOpenGLShaderProgramPrivate::hasShader(QOpenGLShader::ShaderType type) const
{
- foreach (QOpenGLShader *shader, shaders) {
+ for (QOpenGLShader *shader : shaders) {
if (shader->shaderType() == type)
return true;
}
@@ -802,7 +808,7 @@ bool QOpenGLShaderProgram::init()
GLuint program = d->glfuncs->glCreateProgram();
if (!program) {
- qWarning() << "QOpenGLShaderProgram: could not create shader program";
+ qWarning("QOpenGLShaderProgram: could not create shader program");
return false;
}
if (d->programGuard)
@@ -990,17 +996,15 @@ void QOpenGLShaderProgram::removeAllShaders()
{
Q_D(QOpenGLShaderProgram);
d->removingShaders = true;
- foreach (QOpenGLShader *shader, d->shaders) {
+ for (QOpenGLShader *shader : qAsConst(d->shaders)) {
if (d->programGuard && d->programGuard->id()
&& shader && shader->d_func()->shaderGuard)
{
d->glfuncs->glDetachShader(d->programGuard->id(), shader->d_func()->shaderGuard->id());
}
}
- foreach (QOpenGLShader *shader, d->anonShaders) {
- // Delete shader objects that were created anonymously.
- delete shader;
- }
+ // Delete shader objects that were created anonymously.
+ qDeleteAll(d->anonShaders);
d->shaders.clear();
d->anonShaders.clear();
d->linked = false; // Program needs to be relinked.
@@ -1056,9 +1060,9 @@ bool QOpenGLShaderProgram::link()
if (!d->linked) {
QString name = objectName();
if (name.isEmpty())
- qWarning() << "QOpenGLShader::link:" << d->log;
+ qWarning("QOpenGLShader::link: %ls", qUtf16Printable(d->log));
else
- qWarning() << "QOpenGLShader::link[" << name << "]:" << d->log;
+ qWarning("QOpenGLShader::link[%ls]: %ls", qUtf16Printable(name), qUtf16Printable(d->log));
}
delete [] logbuf;
}