diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-11 15:10:11 +0300 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-12-12 15:29:53 +0000 |
commit | 32e35a8839085d88ddbf289ba2669c6745e9a04a (patch) | |
tree | 8a009ea34d44114ee4cfabf275cdf95fb9bf159a /src/qtmultimediaquicktools/qsgvideonode_rgb.cpp | |
parent | c89e2ea249015142f59c8ea440b6e36bac6f96c9 (diff) |
Add missing override and remove redundant virtual
Change-Id: Ifd439abf21877adff57080489324bea729ee5279
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/qtmultimediaquicktools/qsgvideonode_rgb.cpp')
-rw-r--r-- | src/qtmultimediaquicktools/qsgvideonode_rgb.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp index 2126f0cbd..0dfa11ab9 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp @@ -85,9 +85,9 @@ public: setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qtmultimediaquicktools/shaders/rgbvideo.frag")); } - void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); + void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; - virtual char const *const *attributeNames() const { + char const *const *attributeNames() const override { static const char *names[] = { "qt_VertexPosition", "qt_VertexTexCoord", @@ -97,7 +97,7 @@ public: } protected: - virtual void initialize() { + void initialize() override { m_id_matrix = program()->uniformLocation("qt_Matrix"); m_id_width = program()->uniformLocation("width"); m_id_rgbTexture = program()->uniformLocation("rgbTexture"); @@ -139,17 +139,17 @@ public: QOpenGLContext::currentContext()->functions()->glDeleteTextures(1, &m_textureId); } - virtual QSGMaterialType *type() const { + QSGMaterialType *type() const override { static QSGMaterialType normalType, swizzleType; return needsSwizzling() ? &swizzleType : &normalType; } - virtual QSGMaterialShader *createShader() const { + QSGMaterialShader *createShader() const override { return needsSwizzling() ? new QSGVideoMaterialShader_RGB_swizzle : new QSGVideoMaterialShader_RGB; } - virtual int compare(const QSGMaterial *other) const { + int compare(const QSGMaterial *other) const override { const QSGVideoMaterial_RGB *m = static_cast<const QSGVideoMaterial_RGB *>(other); if (!m_textureId) |