summaryrefslogtreecommitdiffstats
path: root/src/qtmultimediaquicktools
diff options
context:
space:
mode:
Diffstat (limited to 'src/qtmultimediaquicktools')
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_rgb.cpp2
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_texture.cpp2
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_yuv.cpp2
-rw-r--r--src/qtmultimediaquicktools/qsgvideotexture.cpp9
-rw-r--r--src/qtmultimediaquicktools/qsgvideotexture_p.h2
5 files changed, 3 insertions, 14 deletions
diff --git a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp
index c5c82de4a..4b6d61f16 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp
+++ b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp
@@ -98,7 +98,7 @@ public:
return &normalType;
}
- QSGMaterialShader *createShader() const override {
+ QSGMaterialShader *createShader(QSGRendererInterface::RenderMode) const override {
return new QSGVideoMaterialRhiShader_RGB;
}
diff --git a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp
index 7b819511a..33deef8c2 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp
+++ b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp
@@ -127,7 +127,7 @@ public:
return needsSwizzling() ? &swizzleType : &normalType;
}
- QSGMaterialShader *createShader() const override {
+ QSGMaterialShader *createShader(QSGRendererInterface::RenderMode) const override {
return needsSwizzling() ? new QSGVideoMaterialRhiShader_Texture_swizzle
: new QSGVideoMaterialRhiShader_Texture;
}
diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
index 93d4084f6..e825838ba 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
+++ b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
@@ -159,7 +159,7 @@ public:
}
}
- QSGMaterialShader *createShader() const override {
+ QSGMaterialShader *createShader(QSGRendererInterface::RenderMode) const override {
switch (m_format.pixelFormat()) {
case QVideoFrame::Format_NV12:
return new QSGVideoMaterialRhiShader_NV12;
diff --git a/src/qtmultimediaquicktools/qsgvideotexture.cpp b/src/qtmultimediaquicktools/qsgvideotexture.cpp
index bdefbc32f..c138090b4 100644
--- a/src/qtmultimediaquicktools/qsgvideotexture.cpp
+++ b/src/qtmultimediaquicktools/qsgvideotexture.cpp
@@ -83,11 +83,6 @@ qint64 QSGVideoTexture::comparisonKey() const
return qint64(qintptr(this));
}
-int QSGVideoTexture::textureId() const // legacy
-{
- return 0;
-}
-
QRhiTexture *QSGVideoTexture::rhiTexture() const
{
return d_func()->m_texture.data();
@@ -109,10 +104,6 @@ bool QSGVideoTexture::hasMipmaps() const
return mipmapFiltering() != QSGTexture::None;
}
-void QSGVideoTexture::bind()
-{
-}
-
void QSGVideoTexture::setData(QRhiTexture::Format f, const QSize &s, const uchar *data, qsizetype bytes)
{
Q_D(QSGVideoTexture);
diff --git a/src/qtmultimediaquicktools/qsgvideotexture_p.h b/src/qtmultimediaquicktools/qsgvideotexture_p.h
index 46203d405..837bfdf9c 100644
--- a/src/qtmultimediaquicktools/qsgvideotexture_p.h
+++ b/src/qtmultimediaquicktools/qsgvideotexture_p.h
@@ -67,12 +67,10 @@ public:
~QSGVideoTexture();
qint64 comparisonKey() const override;
- int textureId() const override;
QRhiTexture *rhiTexture() const override;
QSize textureSize() const override;
bool hasAlphaChannel() const override;
bool hasMipmaps() const override;
- void bind() override;
void commitTextureOperations(QRhi *rhi, QRhiResourceUpdateBatch *resourceUpdates) override;
void setData(QRhiTexture::Format f, const QSize &s, const uchar *data, qsizetype bytes);
void setNativeObject(quint64 obj, const QSize &s);