diff options
Diffstat (limited to 'src/quick/scenegraph/util/qsgplaintexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgplaintexture.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/quick/scenegraph/util/qsgplaintexture.cpp b/src/quick/scenegraph/util/qsgplaintexture.cpp index b262047c38..e3ea9ffc17 100644 --- a/src/quick/scenegraph/util/qsgplaintexture.cpp +++ b/src/quick/scenegraph/util/qsgplaintexture.cpp @@ -8,7 +8,7 @@ #include <private/qqmlglobal_p.h> #include <QtGui/qguiapplication.h> #include <QtGui/qpa/qplatformnativeinterface.h> -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QtQuick/private/qsgrhisupport_p.h> #include <qtquick_tracepoints_p.h> @@ -67,7 +67,8 @@ void QSGPlainTexture::setTexture(QRhiTexture *texture) // RHI only void QSGPlainTexture::setTextureFromNativeTexture(QRhi *rhi, quint64 nativeObjectHandle, - int nativeLayout, uint nativeFormat, + int nativeLayoutOrState, + uint nativeFormat, const QSize &size, QQuickWindow::CreateTextureOptions options, QQuickWindowPrivate::TextureFromNativeTextureFlags flags) @@ -90,7 +91,7 @@ void QSGPlainTexture::setTextureFromNativeTexture(QRhi *rhi, QRhiTexture *t = rhi->newTexture(format, size, 1, texFlags); // ownership of the native object is never taken - t->createFrom({nativeObjectHandle, nativeLayout}); + t->createFrom({nativeObjectHandle, nativeLayoutOrState}); setTexture(t); } |