summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/sceneparsers/assimp/assimpparser.cpp10
-rw-r--r--src/render/backend/qgraphicshelperes2.cpp18
-rw-r--r--src/render/backend/qgraphicshelpergl2.cpp20
-rw-r--r--src/render/backend/qgraphicshelpergl3.cpp6
-rw-r--r--src/render/io/gltfparser.cpp4
5 files changed, 29 insertions, 29 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index 5f16f977a..eab846dd3 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -751,7 +751,7 @@ void AssimpParser::loadCamera(uint cameraIndex)
// OPTIONAL
void AssimpParser::loadAnimation(uint animationIndex)
{
- Q_UNUSED(animationIndex)
+ Q_UNUSED(animationIndex);
}
/*!
@@ -802,8 +802,8 @@ void AssimpParser::copyMaterialBoolProperties(QMaterial *material, aiMaterial *a
void AssimpParser::copyMaterialShadingModel(QMaterial *material, aiMaterial *assimpMaterial)
{
- Q_UNUSED(material)
- Q_UNUSED(assimpMaterial)
+ Q_UNUSED(material);
+ Q_UNUSED(assimpMaterial);
// TODO
// Match each shading function with a default shader
@@ -813,8 +813,8 @@ void AssimpParser::copyMaterialShadingModel(QMaterial *material, aiMaterial *ass
void AssimpParser::copyMaterialBlendingFunction(QMaterial *material, aiMaterial *assimpMaterial)
{
- Q_UNUSED(material)
- Q_UNUSED(assimpMaterial)
+ Q_UNUSED(material);
+ Q_UNUSED(assimpMaterial);
// TO DO
}
diff --git a/src/render/backend/qgraphicshelperes2.cpp b/src/render/backend/qgraphicshelperes2.cpp
index 82e50d8b7..ed327b345 100644
--- a/src/render/backend/qgraphicshelperes2.cpp
+++ b/src/render/backend/qgraphicshelperes2.cpp
@@ -181,7 +181,7 @@ QVector<ShaderAttribute> QGraphicsHelperES2::programAttributesAndLocations(GLuin
QVector<ShaderUniformBlock> QGraphicsHelperES2::programUniformBlocks(GLuint programId)
{
- Q_UNUSED(programId)
+ Q_UNUSED(programId);
QVector<ShaderUniformBlock> blocks;
qWarning() << "UBO are not supported by OpenGL ES 2.0 (since OpenGL ES 3.0)";
return blocks;
@@ -189,8 +189,8 @@ QVector<ShaderUniformBlock> QGraphicsHelperES2::programUniformBlocks(GLuint prog
void QGraphicsHelperES2::vertexAttribDivisor(GLuint index, GLuint divisor)
{
- Q_UNUSED(index)
- Q_UNUSED(divisor)
+ Q_UNUSED(index);
+ Q_UNUSED(divisor);
}
void QGraphicsHelperES2::blendEquation(GLenum mode)
@@ -420,9 +420,9 @@ void QGraphicsHelperES2::bindFragDataLocation(GLuint , const QHash<QString, int>
void QGraphicsHelperES2::bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
{
- Q_UNUSED(programId)
- Q_UNUSED(uniformBlockIndex)
- Q_UNUSED(uniformBlockBinding)
+ Q_UNUSED(programId);
+ Q_UNUSED(uniformBlockIndex);
+ Q_UNUSED(uniformBlockBinding);
qWarning() << "UBO are not supported by ES 2.0 (since ES 3.0)";
}
@@ -436,9 +436,9 @@ void QGraphicsHelperES2::bindBufferBase(GLenum target, GLuint index, GLuint buff
void QGraphicsHelperES2::buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer)
{
- Q_UNUSED(v)
- Q_UNUSED(description)
- Q_UNUSED(buffer)
+ Q_UNUSED(v);
+ Q_UNUSED(description);
+ Q_UNUSED(buffer);
qWarning() << "UBO are not supported by ES 2.0 (since ES 3.0)";
}
diff --git a/src/render/backend/qgraphicshelpergl2.cpp b/src/render/backend/qgraphicshelpergl2.cpp
index 0d669e557..511f81972 100644
--- a/src/render/backend/qgraphicshelpergl2.cpp
+++ b/src/render/backend/qgraphicshelpergl2.cpp
@@ -57,7 +57,7 @@ QGraphicsHelperGL2::QGraphicsHelperGL2()
void QGraphicsHelperGL2::initializeHelper(QOpenGLContext *context,
QAbstractOpenGLFunctions *functions)
{
- Q_UNUSED(context)
+ Q_UNUSED(context);
m_funcs = static_cast<QOpenGLFunctions_2_0*>(functions);
const bool ok = m_funcs->initializeOpenGLFunctions();
Q_ASSERT(ok);
@@ -174,7 +174,7 @@ QVector<ShaderAttribute> QGraphicsHelperGL2::programAttributesAndLocations(GLuin
QVector<ShaderUniformBlock> QGraphicsHelperGL2::programUniformBlocks(GLuint programId)
{
- Q_UNUSED(programId)
+ Q_UNUSED(programId);
QVector<ShaderUniformBlock> blocks;
qWarning() << "UBO are not supported by OpenGL 2.0 (since OpenGL 3.1)";
return blocks;
@@ -183,8 +183,8 @@ QVector<ShaderUniformBlock> QGraphicsHelperGL2::programUniformBlocks(GLuint prog
void QGraphicsHelperGL2::vertexAttribDivisor(GLuint index,
GLuint divisor)
{
- Q_UNUSED(index)
- Q_UNUSED(divisor)
+ Q_UNUSED(index);
+ Q_UNUSED(divisor);
}
void QGraphicsHelperGL2::blendEquation(GLenum mode)
@@ -423,9 +423,9 @@ GLuint QGraphicsHelperGL2::boundFrameBufferObject()
void QGraphicsHelperGL2::bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
{
- Q_UNUSED(programId)
- Q_UNUSED(uniformBlockIndex)
- Q_UNUSED(uniformBlockBinding)
+ Q_UNUSED(programId);
+ Q_UNUSED(uniformBlockIndex);
+ Q_UNUSED(uniformBlockBinding);
qWarning() << "UBO are not supported by OpenGL 2.0 (since OpenGL 3.1)";
}
@@ -439,9 +439,9 @@ void QGraphicsHelperGL2::bindBufferBase(GLenum target, GLuint index, GLuint buff
void QGraphicsHelperGL2::buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer)
{
- Q_UNUSED(v)
- Q_UNUSED(description)
- Q_UNUSED(buffer)
+ Q_UNUSED(v);
+ Q_UNUSED(description);
+ Q_UNUSED(buffer);
qWarning() << "UBO are not supported by OpenGL 2.0 (since OpenGL 3.1)";
}
diff --git a/src/render/backend/qgraphicshelpergl3.cpp b/src/render/backend/qgraphicshelpergl3.cpp
index 639a454f5..3ffa44ade 100644
--- a/src/render/backend/qgraphicshelpergl3.cpp
+++ b/src/render/backend/qgraphicshelpergl3.cpp
@@ -57,7 +57,7 @@ QGraphicsHelperGL3::QGraphicsHelperGL3()
void QGraphicsHelperGL3::initializeHelper(QOpenGLContext *context,
QAbstractOpenGLFunctions *functions)
{
- Q_UNUSED(context)
+ Q_UNUSED(context);
m_funcs = static_cast<QOpenGLFunctions_3_2_Core*>(functions);
const bool ok = m_funcs->initializeOpenGLFunctions();
Q_ASSERT(ok);
@@ -206,8 +206,8 @@ QVector<ShaderUniformBlock> QGraphicsHelperGL3::programUniformBlocks(GLuint prog
void QGraphicsHelperGL3::vertexAttribDivisor(GLuint index, GLuint divisor)
{
- Q_UNUSED(index)
- Q_UNUSED(divisor)
+ Q_UNUSED(index);
+ Q_UNUSED(divisor);
}
void QGraphicsHelperGL3::blendEquation(GLenum mode)
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index 68aa14826..745180e56 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -788,8 +788,8 @@ void GLTFParser::processJSONImage( QString id, QJsonObject jsonObj)
void GLTFParser::processJSONTexture( QString id, QJsonObject jsonObj)
{
- Q_UNUSED(id)
- Q_UNUSED(jsonObj)
+ Q_UNUSED(id);
+ Q_UNUSED(jsonObj);
// int target = jsonObj.value(KEY_TARGET).toInt();
// QAbstractTextureProvider* tex = new QAbstractTextureProvider(static_cast<QAbstractTextureProvider::Target>(target));