Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152

1 files changed, 38 insertions, 21 deletions

diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
index a9c6835687..f0bf19bd91 100644
--- a/src/gui/rhi/qrhi.cpp
+++ b/src/gui/rhi/qrhi.cpp
@@ -1652,7 +1652,7 @@ QRhiTextureUploadDescription::QRhiTextureUploadDescription(const QRhiTextureUplo
     Constructs a texture upload description with the specified \a list of entries.
 
     \note \a list can also contain multiple QRhiTextureUploadEntry elements
-    with the the same layer and level. This makes sense when those uploads are
+    with the same layer and level. This makes sense when those uploads are
     partial, meaning their subresource description has a source size or image
     smaller than the subresource dimensions, and can be more efficient than
     issuing separate uploadTexture()'s.
@@ -2297,11 +2297,10 @@ bool QRhiTexture::buildFrom(QRhiTexture::NativeTexture src)
  */
 QRhiSampler::QRhiSampler(QRhiImplementation *rhi,
                          Filter magFilter_, Filter minFilter_, Filter mipmapMode_,
-                         AddressMode u_, AddressMode v_)
+                         AddressMode u_, AddressMode v_, AddressMode w_)
     : QRhiResource(rhi),
       m_magFilter(magFilter_), m_minFilter(minFilter_), m_mipmapMode(mipmapMode_),
-      m_addressU(u_), m_addressV(v_),
-      m_addressW(QRhiSampler::ClampToEdge),
+      m_addressU(u_), m_addressV(v_), m_addressW(w_),
       m_compareOp(QRhiSampler::Never)
 {
 }
@@ -3506,7 +3505,7 @@ QRhiResource::Type QRhiGraphicsPipeline::resourceType() const
     \l{QSurfaceFormat::sRGBColorSpace}{sRGBColorSpace} on the QSurfaceFormat of
     the QWindow in addition.
 
-    \value UsedAsTransferSource Indicates the the swapchain will be used as the
+    \value UsedAsTransferSource Indicates the swapchain will be used as the
     source of a readback in QRhiResourceUpdateBatch::readBackTexture().
 
     \value NoVSync Requests disabling waiting for vertical sync, also avoiding
@@ -3623,7 +3622,7 @@ QRhiResource::Type QRhiSwapChain::resourceType() const
     \fn QRhiRenderTarget *QRhiSwapChain::currentFrameRenderTarget()
 
     \return a render target that can used with beginPass() in order to render
-    the the swapchain's current backbuffer. Only valid within a
+    the swapchain's current backbuffer. Only valid within a
     QRhi::beginFrame() - QRhi::endFrame() block where beginFrame() was called
     with this swapchain.
 
@@ -4449,7 +4448,7 @@ void QRhiResourceUpdateBatch::generateMips(QRhiTexture *tex, int layer)
    recorded.
 
    \note the return value is not owned by the caller and must never be
-   destroyed. Instead, the batch is returned the the pool for reuse by passing
+   destroyed. Instead, the batch is returned the pool for reuse by passing
    it to QRhiCommandBuffer::beginPass(), QRhiCommandBuffer::endPass(), or
    QRhiCommandBuffer::resourceUpdate(), or by calling
    QRhiResourceUpdateBatch::release() on it.
@@ -5059,13 +5058,24 @@ bool QRhi::isYUpInNDC() const
 }
 
 /*!
-    \return \c true if the underlying graphics API uses depth 0 - 1 in clip
-    space.
+    \return \c true if the underlying graphics API uses depth range [0, 1] in
+    clip space.
 
-    In practice this is \c false for OpenGL only.
+    In practice this is \c false for OpenGL only, because OpenGL uses a
+    post-projection depth range of [-1, 1]. (not to be confused with the
+    NDC-to-window mapping controlled by glDepthRange(), which uses a range of
+    [0, 1], unless overridden by the QRhiViewport) In some OpenGL versions
+    glClipControl() could be used to change this, but the OpenGL backend of
+    QRhi does not use that function as it is not available in OpenGL ES or
+    OpenGL versions lower than 4.5.
 
     \note clipSpaceCorrMatrix() includes the corresponding adjustment in its
-    returned matrix.
+    returned matrix. Therefore, many users of QRhi do not need to take any
+    further measures apart from pre-multiplying their projection matrices with
+    clipSpaceCorrMatrix(). However, some graphics techniques, such as, some
+    types of shadow mapping, involve working with and outputting depth values
+    in the shaders. These will need to query and take the value of this
+    function into account as appropriate.
  */
 bool QRhi::isClipDepthZeroToOne() const
 {
@@ -5075,11 +5085,15 @@ bool QRhi::isClipDepthZeroToOne() const
 /*!
     \return a matrix that can be used to allow applications keep using
     OpenGL-targeted vertex data and perspective projection matrices (such as,
-    the ones generated by QMatrix4x4::perspective()), regardless of the
-    backend. Once \c{this_matrix * mvp} is used instead of just \c mvp, vertex
-    data with Y up and viewports with depth range 0 - 1 can be used without
-    considering what backend and so graphics API is going to be used at run
-    time.
+    the ones generated by QMatrix4x4::perspective()), regardless of the active
+    QRhi backend.
+
+    In a typical renderer, once \c{this_matrix * mvp} is used instead of just
+    \c mvp, vertex data with Y up and viewports with depth range 0 - 1 can be
+    used without considering what backend (and so graphics API) is going to be
+    used at run time. This way branching based on isYUpInNDC() and
+    isClipDepthZeroToOne() can be avoided (although such logic may still become
+    required when implementing certain advanced graphics techniques).
 
     See
     \l{https://matthewwellings.com/blog/the-new-vulkan-coordinate-system/}{this
@@ -5321,16 +5335,19 @@ QRhiTexture *QRhi::newTexture(QRhiTexture::Format format,
 
 /*!
     \return a new sampler with the specified magnification filter \a magFilter,
-    minification filter \a minFilter, mipmapping mode \a mipmapMpde, and S/T
-    addressing modes \a u and \a v.
+    minification filter \a minFilter, mipmapping mode \a mipmapMode, and the
+    addressing (wrap) modes \a addressU, \a addressV, and \a addressW.
 
     \sa QRhiResource::release()
  */
-QRhiSampler *QRhi::newSampler(QRhiSampler::Filter magFilter, QRhiSampler::Filter minFilter,
+QRhiSampler *QRhi::newSampler(QRhiSampler::Filter magFilter,
+                              QRhiSampler::Filter minFilter,
                               QRhiSampler::Filter mipmapMode,
-                              QRhiSampler:: AddressMode u, QRhiSampler::AddressMode v)
+                              QRhiSampler::AddressMode addressU,
+                              QRhiSampler::AddressMode addressV,
+                              QRhiSampler::AddressMode addressW)
 {
-    return d->createSampler(magFilter, minFilter, mipmapMode, u, v);
+    return d->createSampler(magFilter, minFilter, mipmapMode, addressU, addressV, addressW);
 }
 
 /*!