aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickwindow.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2023-01-14 21:16:53 +0100
committerLaszlo Agocs <laszlo.agocs@qt.io>2023-02-14 19:04:57 +0100
commit8721df3dae5c78e5406a01308c033baf9b9d6844 (patch)
tree707e341a9d1c5ae2ab9f0173676adadbcf178d6f /src/quick/items/qquickwindow.cpp
parent5fabb872e0041aaf134b33e140d8f8512c31455b (diff)
Enable D3D12
Windows continues to use D3D11 as the default. To use D3D12 it needs to be requested explicitly, for the time being, either via QSG_RHI_BACKEND=d3d12 or via the QSGRendererInterface enum. Change-Id: I6c63390e2548bc01a6a15b914d56afd644a1e41a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
-rw-r--r--src/quick/items/qquickwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 86a60fd89d..360d51a5bc 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -3025,7 +3025,7 @@ QSGTexture *QQuickWindow::createTextureFromImage(const QImage &image, CreateText
}
QSGTexture *QQuickWindowPrivate::createTextureFromNativeTexture(quint64 nativeObjectHandle,
- int nativeLayout,
+ int nativeLayoutOrState,
uint nativeFormat,
const QSize &size,
QQuickWindow::CreateTextureOptions options,
@@ -3035,7 +3035,7 @@ QSGTexture *QQuickWindowPrivate::createTextureFromNativeTexture(quint64 nativeOb
return nullptr;
QSGPlainTexture *texture = new QSGPlainTexture;
- texture->setTextureFromNativeTexture(rhi, nativeObjectHandle, nativeLayout, nativeFormat,
+ texture->setTextureFromNativeTexture(rhi, nativeObjectHandle, nativeLayoutOrState, nativeFormat,
size, options, flags);
texture->setHasAlphaChannel(options & QQuickWindow::TextureHasAlphaChannel);
// note that the QRhiTexture does not (and cannot) own the native object