diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-04-23 09:40:59 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-07-04 10:44:26 +0200 |
commit | 341ab7708049b1a3f559b76f16393e688951a938 (patch) | |
tree | 0203da53d1adf5025fa85ecc38e0e37bce35c46f /src/quickshapes/qquickshape.cpp | |
parent | 1f01b44d20471a7f4a5029a4c0049e8296749fef (diff) |
Add the graphics api independent scenegraph port
Opt in via environment variables:
QSG_RHI=1 -> enable using QRhi instead of GL
QSG_RHI_BACKEND -> set to vulkan, metal, d3d11, gl to override the default
(the default is d3d11 on Windows, metal on Mac, gl elsewhere)
Or force a given rhi backend via the existing
QQuickWindow::setSceneGraphBackend().
Otherwise the default behavior is the same as before, the rhi code path
is never active by default.
-no-opengl builds are supported in the sense that they work and default
to the software backend. However, the rhi code path cannot currently be
used in such builds, even though QRhi from qtbase is fully functional
with Vulkan, D3D, or Metal even when qtbase was configured with
-no-opengl. This cannot be utilized by Quick atm due to OpenGL usage
being all over the place in the sources corresponding to the default
backend, and those host the rhi code path as well. This will be cleaned up
hopefully in Qt 6, with the removal all direct OpenGL usage.
Other env.vars.:
QSG_RHI_DEBUG_LAYER=1 -> enable D3D debug or Vulkan validation layer
(assuming the system is set up for this)
QSG_RHI_SHADEREFFECT_DEBUG=1 -> print stuff from ShaderEffect
QSG_SAMPLES=1,2,4,... -> MSAA sample count (but QSurfaceFormat works too)
QT_D3D_ADAPTER_INDEX=0,1,... -> D3D adapter index
QT_VK_PHYSICAL_DEVICE_INDEX=0,1,... -> Vulkan physical device index
QSG_RHI_UINT32_INDEX=1 -> always use uint index data (both
merged/unmerged, convert when needed - with some rhi backends this is
implicit)
QSG_RENDER_LOOP -> to override the render loop as usual. The default
with RHI is threaded for Metal, threaded for Vulkan on Windows, basic
for Vulkan on Linux and Android (to be checked later), while the existing
rules apply for OpenGL.
Not supported when running with QRhi:
- particles
- compressed atlases (though this is transparent to the apps)
- QSGRenderNode
- QQuickRenderControl
- QQuickFramebufferObject
- certain QQuickWindow functionality that depends directly on OpenGL
- anisotropic filtering for textures
- native text may lack some gamma correction
- QSGEngine applicability unclear
- some QML profiler logs may be incorrect or irrelevant
Change-Id: I7822e99ad79e342e4166275da6e9e66498d76521
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/quickshapes/qquickshape.cpp')
-rw-r--r-- | src/quickshapes/qquickshape.cpp | 165 |
1 files changed, 116 insertions, 49 deletions
diff --git a/src/quickshapes/qquickshape.cpp b/src/quickshapes/qquickshape.cpp index 74cbf52a95..e8779debde 100644 --- a/src/quickshapes/qquickshape.cpp +++ b/src/quickshapes/qquickshape.cpp @@ -42,11 +42,12 @@ #include "qquickshapegenericrenderer_p.h" #include "qquickshapenvprrenderer_p.h" #include "qquickshapesoftwarerenderer_p.h" -#include <private/qsgtexture_p.h> +#include <private/qsgplaintexture_p.h> #include <private/qquicksvgparser_p.h> #include <QtGui/private/qdrawhelper_p.h> #include <QOpenGLFunctions> #include <QLoggingCategory> +#include <QtGui/private/qrhi_p.h> #if defined(QT_STATIC) static void initResources() @@ -582,12 +583,14 @@ void QQuickShapePath::resetFillGradient() \list - \li When running with the default, OpenGL backend of Qt Quick, both the - generic, triangulation-based and the NVIDIA-specific - \c{GL_NV_path_rendering} methods are available. By default only the generic - approach is used. Setting Shape.vendorExtensionsEnabled property to \c true - leads to using NV_path_rendering on NVIDIA systems, and the generic method - on others. + \li When running with the OpenGL backend of Qt Quick, both the generic, + triangulation-based and the NVIDIA-specific \c{GL_NV_path_rendering} + methods are available. By default only the generic approach is used. + Setting Shape.vendorExtensionsEnabled property to \c true leads to using + NV_path_rendering on NVIDIA systems when running directly on OpenGL, and + the generic method on others. When OpenGL is not used directly by the scene + graph, for example because it is using the graphics abstraction layer + (QRhi), only the generic shape renderer is available. \li The \c software backend is fully supported. The path is rendered via QPainter::strokePath() and QPainter::fillPath() in this case. @@ -1009,7 +1012,12 @@ void QQuickShapePrivate::createRenderer() renderer = new QQuickShapeSoftwareRenderer; break; default: - qWarning("No path backend for this graphics API yet"); + if (QSGRendererInterface::isApiRhiBased(ri->graphicsApi())) { + rendererType = QQuickShape::GeometryRenderer; + renderer = new QQuickShapeGenericRenderer(q); + } else { + qWarning("No path backend for this graphics API yet"); + } break; } } @@ -1045,7 +1053,13 @@ QSGNode *QQuickShapePrivate::createNode() static_cast<QQuickShapeSoftwareRenderNode *>(node)); break; default: - qWarning("No path backend for this graphics API yet"); + if (QSGRendererInterface::isApiRhiBased(ri->graphicsApi())) { + node = new QQuickShapeGenericNode; + static_cast<QQuickShapeGenericRenderer *>(renderer)->setRootNode( + static_cast<QQuickShapeGenericNode *>(node)); + } else { + qWarning("No path backend for this graphics API yet"); + } break; } @@ -1499,45 +1513,7 @@ void QQuickShapeConicalGradient::setAngle(qreal v) } } -#if QT_CONFIG(opengl) - -// contexts sharing with each other get the same cache instance -class QQuickShapeGradientCacheWrapper -{ -public: - QQuickShapeGradientCache *get(QOpenGLContext *context) - { - return m_resource.value<QQuickShapeGradientCache>(context); - } - -private: - QOpenGLMultiGroupSharedResource m_resource; -}; - -QQuickShapeGradientCache *QQuickShapeGradientCache::currentCache() -{ - static QQuickShapeGradientCacheWrapper qt_path_gradient_caches; - return qt_path_gradient_caches.get(QOpenGLContext::currentContext()); -} - -// let QOpenGLContext manage the lifetime of the cached textures -QQuickShapeGradientCache::~QQuickShapeGradientCache() -{ - m_cache.clear(); -} - -void QQuickShapeGradientCache::invalidateResource() -{ - m_cache.clear(); -} - -void QQuickShapeGradientCache::freeResource(QOpenGLContext *) -{ - qDeleteAll(m_cache); - m_cache.clear(); -} - -static void generateGradientColorTable(const QQuickShapeGradientCache::Key &gradient, +static void generateGradientColorTable(const QQuickShapeGradientCacheKey &gradient, uint *colorTable, int size, float opacity) { int pos = 0; @@ -1588,7 +1564,98 @@ static void generateGradientColorTable(const QQuickShapeGradientCache::Key &grad colorTable[size-1] = last_color; } -QSGTexture *QQuickShapeGradientCache::get(const Key &grad) +QQuickShapeGradientCache::~QQuickShapeGradientCache() +{ + qDeleteAll(m_textures); +} + +QQuickShapeGradientCache *QQuickShapeGradientCache::cacheForRhi(QRhi *rhi) +{ + static QHash<QRhi *, QQuickShapeGradientCache *> caches; + auto it = caches.constFind(rhi); + if (it != caches.constEnd()) + return *it; + + QQuickShapeGradientCache *cache = new QQuickShapeGradientCache; + rhi->addCleanupCallback([cache](QRhi *rhi) { + caches.remove(rhi); + delete cache; + }); + caches.insert(rhi, cache); + return cache; +} + +QSGTexture *QQuickShapeGradientCache::get(const QQuickShapeGradientCacheKey &grad) +{ + QSGPlainTexture *tx = m_textures[grad]; + if (!tx) { + static const int W = 1024; // texture size is 1024x1 + QImage gradTab(W, 1, QImage::Format_RGBA8888_Premultiplied); + generateGradientColorTable(grad, reinterpret_cast<uint *>(gradTab.bits()), W, 1.0f); + tx = new QSGPlainTexture; + tx->setImage(gradTab); + switch (grad.spread) { + case QQuickShapeGradient::PadSpread: + tx->setHorizontalWrapMode(QSGTexture::ClampToEdge); + tx->setVerticalWrapMode(QSGTexture::ClampToEdge); + break; + case QQuickShapeGradient::RepeatSpread: + tx->setHorizontalWrapMode(QSGTexture::Repeat); + tx->setVerticalWrapMode(QSGTexture::Repeat); + break; + case QQuickShapeGradient::ReflectSpread: + tx->setHorizontalWrapMode(QSGTexture::MirroredRepeat); + tx->setVerticalWrapMode(QSGTexture::MirroredRepeat); + break; + default: + qWarning("Unknown gradient spread mode %d", grad.spread); + break; + } + tx->setFiltering(QSGTexture::Linear); + m_textures[grad] = tx; + } + return tx; +} + +#if QT_CONFIG(opengl) + +// contexts sharing with each other get the same cache instance +class QQuickShapeGradientCacheWrapper +{ +public: + QQuickShapeGradientOpenGLCache *get(QOpenGLContext *context) + { + return m_resource.value<QQuickShapeGradientOpenGLCache>(context); + } + +private: + QOpenGLMultiGroupSharedResource m_resource; +}; + +QQuickShapeGradientOpenGLCache *QQuickShapeGradientOpenGLCache::currentCache() +{ + static QQuickShapeGradientCacheWrapper qt_path_gradient_caches; + return qt_path_gradient_caches.get(QOpenGLContext::currentContext()); +} + +// let QOpenGLContext manage the lifetime of the cached textures +QQuickShapeGradientOpenGLCache::~QQuickShapeGradientOpenGLCache() +{ + m_cache.clear(); +} + +void QQuickShapeGradientOpenGLCache::invalidateResource() +{ + m_cache.clear(); +} + +void QQuickShapeGradientOpenGLCache::freeResource(QOpenGLContext *) +{ + qDeleteAll(m_cache); + m_cache.clear(); +} + +QSGTexture *QQuickShapeGradientOpenGLCache::get(const QQuickShapeGradientCacheKey &grad) { QSGPlainTexture *tx = m_cache[grad]; if (!tx) { |