diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-05-19 07:29:14 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-05-25 13:39:32 +0200 |
| commit | 5d4d598354c85de7bf33412b42a5693b4ac27d78 (patch) | |
| tree | 96e892cf15c6720db0c9aaf7060bde18ed8b44ca /examples/quick/rendercontrol | |
| parent | de41077a57313f67e330de5a60281be81b414a1d (diff) | |
Adapt to changes in NativeTexture in qtbase
To make the API less error prone, we have changed the
void pointer to the texture handle to a 64-bit in
instead, since all handles are maximum 64-bit.
Task-number: QTBUG-78638
Change-Id: I9d995d6a883b3377f57d7c5b19d4bc4e15aa347b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'examples/quick/rendercontrol')
| -rw-r--r-- | examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp | 6 | ||||
| -rw-r--r-- | examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp b/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp index cb84371fed..ccbac5cbed 100644 --- a/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp +++ b/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp @@ -367,10 +367,8 @@ void Window::updateQuick() if (!m_renderControl->initialize()) qWarning("Failed to initialize redirected Qt Quick rendering"); - // Redirect Qt Quick's output. (note that the QSGTexture::NativeTexture - // struct is expected to contain a pointer to the native object, even - // if the native object type is a pointer, such as ID3D11Texture2D*) - m_quickWindow->setRenderTarget(QQuickRenderTarget::fromNativeTexture({ &m_res.texture, 0 }, + // Redirect Qt Quick's output. + m_quickWindow->setRenderTarget(QQuickRenderTarget::fromNativeTexture({ quint64(m_res.texture), 0 }, QSize(QML_WIDTH, QML_HEIGHT), SAMPLE_COUNT)); diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp b/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp index fb3c0b4f4f..dc9d310ff2 100644 --- a/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp +++ b/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp @@ -182,7 +182,7 @@ void WindowSingleThreaded::createTexture() f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); f->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_textureSize.width(), m_textureSize.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr); - m_quickWindow->setRenderTarget(QQuickRenderTarget::fromNativeTexture({ &m_textureId, 0 }, m_textureSize)); + m_quickWindow->setRenderTarget(QQuickRenderTarget::fromNativeTexture({ quint64(m_textureId), 0 }, m_textureSize)); } void WindowSingleThreaded::destroyTexture() |