summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVaL Doroshchuk <valentyn.doroshchuk@qt.io>2020-06-22 15:00:43 +0200
committerVal Doroshchuk <valentyn.doroshchuk@qt.io>2020-06-30 19:14:46 +0200
commit672efc603df756409edf3426fe496eac81976d2a (patch)
treeb8308e5bbb40a2e66c6532df14dc10bdfb83dc6f
parent48cc0fde46328ec771d4610f8c13441b04530cab (diff)
Update dependencies on 'dev' in qt/qtmultimedia
Change-Id: I463d3a1541cee1fcf4a6b6d1e2e1eac85fbfc682 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
-rw-r--r--dependencies.yaml4
-rw-r--r--examples/multimediawidgets/videowidget/main.cpp1
-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
7 files changed, 5 insertions, 17 deletions
diff --git a/dependencies.yaml b/dependencies.yaml
index 842146fe9..4792820c8 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,7 +1,7 @@
dependencies:
../qtbase:
- ref: 4c5f6eb74cfb3282513c0837c80a08705c1da844
+ ref: 30ad4cf558789a0b332d7e038dcfe4f54718e937
required: true
../qtdeclarative:
- ref: d0c177f0ee42d7c9454f0093635a5f68362f2283
+ ref: 121b8a6ae42d9423250ab1121c15c49ab064307a
required: false
diff --git a/examples/multimediawidgets/videowidget/main.cpp b/examples/multimediawidgets/videowidget/main.cpp
index 9f53f96f5..367bc9526 100644
--- a/examples/multimediawidgets/videowidget/main.cpp
+++ b/examples/multimediawidgets/videowidget/main.cpp
@@ -51,7 +51,6 @@
#include "videoplayer.h"
#include <QtWidgets/QApplication>
-#include <QtWidgets/QDesktopWidget>
#include <QtCore/QCommandLineParser>
#include <QtCore/QCommandLineOption>
#include <QtCore/QDir>
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);