diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-27 17:44:49 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-28 17:53:32 +0200 |
commit | 56977990e04efa051b1ebd4ce9274d6b69c7bd0c (patch) | |
tree | eaa66635b67faaf94df7b0670fa9e0971268a936 /tests/manual/rhi/hellominimalcrossgfxtriangle | |
parent | c991d87ee2c239fedb77f76f25936dddf5eb5982 (diff) |
rhi: Harmonize create-destroy API pattern with the rest of Qt
For historical reasons we use build and release instead of create and
destroy. This becomes confusing now that more modules in Qt start taking
QRhi into use. Migrate to the more familiar naming, so those who have
used QWindow or QOpenGLContext before will find it natural.
Change-Id: I05eb2243ce274c59b03a5f8bcbb2792a4f37120f
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'tests/manual/rhi/hellominimalcrossgfxtriangle')
-rw-r--r-- | tests/manual/rhi/hellominimalcrossgfxtriangle/hellowindow.cpp | 8 | ||||
-rw-r--r-- | tests/manual/rhi/hellominimalcrossgfxtriangle/window.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/hellowindow.cpp b/tests/manual/rhi/hellominimalcrossgfxtriangle/hellowindow.cpp index 96a088adf4..308eecd199 100644 --- a/tests/manual/rhi/hellominimalcrossgfxtriangle/hellowindow.cpp +++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/hellowindow.cpp @@ -76,18 +76,18 @@ QShader HelloWindow::getShader(const QString &name) void HelloWindow::customInit() { m_vbuf.reset(m_rhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(vertexData))); - m_vbuf->build(); + m_vbuf->create(); m_vbufReady = false; m_ubuf.reset(m_rhi->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 68)); - m_ubuf->build(); + m_ubuf->create(); m_srb.reset(m_rhi->newShaderResourceBindings()); m_srb->setBindings({ QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage | QRhiShaderResourceBinding::FragmentStage, m_ubuf.get()) }); - m_srb->build(); + m_srb->create(); m_ps.reset(m_rhi->newGraphicsPipeline()); @@ -120,7 +120,7 @@ void HelloWindow::customInit() m_ps->setShaderResourceBindings(m_srb.get()); m_ps->setRenderPassDescriptor(m_rp.get()); - m_ps->build(); + m_ps->create(); } // called once per frame diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/window.cpp b/tests/manual/rhi/hellominimalcrossgfxtriangle/window.cpp index fc7bdff3de..0395ffd8bb 100644 --- a/tests/manual/rhi/hellominimalcrossgfxtriangle/window.cpp +++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/window.cpp @@ -189,7 +189,7 @@ void Window::init() void Window::resizeSwapChain() { - m_hasSwapChain = m_sc->buildOrResize(); // also handles m_ds + m_hasSwapChain = m_sc->createOrResize(); // also handles m_ds const QSize outputSize = m_sc->currentPixelSize(); m_proj = m_rhi->clipSpaceCorrMatrix(); @@ -201,7 +201,7 @@ void Window::releaseSwapChain() { if (m_hasSwapChain) { m_hasSwapChain = false; - m_sc->release(); + m_sc->destroy(); } } |