diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-13 17:29:26 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-15 07:48:53 +0000 |
commit | c77d8a7b9ee961d50b1555d3e43a4789909ea0ef (patch) | |
tree | 07bde01c055dc5c4faa96fe1d579039586dc94ac /src/multimedia/video/qvideowindow.cpp | |
parent | 705a76e8dce924a72153b0fb75880a1eeb65652e (diff) |
Disambiguate static constants, variables and functions
They cause clashes in CMake Unity (Jumbo) builds.
Task-number: QTBUG-109394
Change-Id: I856ed6b5f511299845a49f989ccd74a3e5480e44
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Doris Verria <doris.verria@qt.io>
(cherry picked from commit 75bc388bb936890e182e3bf13dd23d557467780f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/multimedia/video/qvideowindow.cpp')
-rw-r--r-- | src/multimedia/video/qvideowindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/multimedia/video/qvideowindow.cpp b/src/multimedia/video/qvideowindow.cpp index acf7ee639..b3b13945c 100644 --- a/src/multimedia/video/qvideowindow.cpp +++ b/src/multimedia/video/qvideowindow.cpp @@ -73,7 +73,7 @@ QVideoWindowPrivate::~QVideoWindowPrivate() q, &QVideoWindow::setVideoFrame); } -static const float g_quad[] = { +static const float g_vw_quad[] = { // 4 clockwise rotation of texture vertexes (the second pair) // Rotation 0 -1.f, -1.f, 0.f, 0.f, @@ -98,7 +98,7 @@ static const float g_quad[] = { 1.f, 1.f, 0.f, 1.f }; -static QShader getShader(const QString &name) +static QShader vwGetShader(const QString &name) { QFile f(name); if (f.open(QIODevice::ReadOnly)) @@ -158,7 +158,7 @@ void QVideoWindowPrivate::initRhi() m_renderPass.reset(m_swapChain->newCompatibleRenderPassDescriptor()); m_swapChain->setRenderPassDescriptor(m_renderPass.get()); - m_vertexBuf.reset(m_rhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(g_quad))); + m_vertexBuf.reset(m_rhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(g_vw_quad))); m_vertexBuf->create(); m_vertexBufReady = false; @@ -182,9 +182,9 @@ void QVideoWindowPrivate::setupGraphicsPipeline(QRhiGraphicsPipeline *pipeline, { pipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip); - QShader vs = getShader(QVideoTextureHelper::vertexShaderFileName(fmt)); + QShader vs = vwGetShader(QVideoTextureHelper::vertexShaderFileName(fmt)); Q_ASSERT(vs.isValid()); - QShader fs = getShader(QVideoTextureHelper::fragmentShaderFileName(fmt, m_swapChain->format())); + QShader fs = vwGetShader(QVideoTextureHelper::fragmentShaderFileName(fmt, m_swapChain->format())); Q_ASSERT(fs.isValid()); pipeline->setShaderStages({ { QRhiShaderStage::Vertex, vs }, @@ -368,7 +368,7 @@ void QVideoWindowPrivate::render() if (!m_vertexBufReady) { m_vertexBufReady = true; - rub->uploadStaticBuffer(m_vertexBuf.get(), g_quad); + rub->uploadStaticBuffer(m_vertexBuf.get(), g_vw_quad); } if (m_texturesDirty) |