aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2021-04-13 07:59:43 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-04-19 16:58:32 +0000
commit5b8cc74b2eae9ed4035ab6d32eb7fc1b3225f900 (patch)
treec94d64a3928c273eb6b51a3c4a58638f4cea6cd7 /src
parent75c7ad63797a84767c2b7529ce80d35e17d122cb (diff)
Remove documentation references to NVPR renderer
Since this is no longer supported, it is removed from the docs Change-Id: Id23716594e6ea9fd3d05d88a2586d380d1db09db Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Nico Vertriest <nico.vertriest@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 39de040452d25c3a279599519638890859d483b8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/quick/util/qquickpath.cpp19
-rw-r--r--src/quickshapes/qquickshape.cpp36
2 files changed, 11 insertions, 44 deletions
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index 5ac28f45d9..200abae31c 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -89,79 +89,67 @@ QT_BEGIN_NAMESPACE
\li Element
\li PathView
\li Shape
- \li Shape, GL_NV_path_rendering
\li Shape, software
\row
\li PathMove
\li N/A
\li Yes
\li Yes
- \li Yes
\row
\li PathLine
\li Yes
\li Yes
\li Yes
- \li Yes
\row
\li PathPolyline
\li Yes
\li Yes
\li Yes
- \li Yes
+ \row
\li PathMultiLine
\li Yes
\li Yes
\li Yes
- \li Yes
\row
\li PathQuad
\li Yes
\li Yes
\li Yes
- \li Yes
\row
\li PathCubic
\li Yes
\li Yes
\li Yes
- \li Yes
\row
\li PathArc
\li Yes
\li Yes
\li Yes
- \li Yes
\row
\li PathAngleArc
\li Yes
\li Yes
\li Yes
- \li Yes
\row
\li PathSvg
\li Yes
\li Yes
\li Yes
- \li Yes
\row
\li PathAttribute
\li Yes
\li N/A
\li N/A
- \li N/A
\row
\li PathPercent
\li Yes
\li N/A
\li N/A
- \li N/A
\row
\li PathCurve
\li Yes
\li No
\li No
- \li No
\endtable
\note Path is a non-visual type; it does not display anything on its own.
@@ -2236,11 +2224,6 @@ void QQuickPathAngleArc::addToPath(QPainterPath &path, const QQuickPathData &)
\endqml
\endtable
- \note Mixing PathSvg with other type of elements is not always supported.
- For example, when \l Shape is backed by \c{GL_NV_path_rendering}, a
- ShapePath can contain one or more PathSvg elements, or one or more other
- type of elements, but not both.
-
\sa Path, PathLine, PathQuad, PathCubic, PathArc, PathAngleArc, PathCurve
*/
diff --git a/src/quickshapes/qquickshape.cpp b/src/quickshapes/qquickshape.cpp
index 6f1087737b..5979e6e6cc 100644
--- a/src/quickshapes/qquickshape.cpp
+++ b/src/quickshapes/qquickshape.cpp
@@ -530,8 +530,7 @@ void QQuickShapePath::resetFillGradient()
\since 5.10
Renders a path either by generating geometry via QPainterPath and manual
- triangulation or by using a GPU vendor extension like
- \c{GL_NV_path_rendering}.
+ triangulation or by using a GPU vendor extension.
This approach is different from rendering shapes via QQuickPaintedItem or
the 2D Canvas because the path never gets rasterized in software.
@@ -587,13 +586,9 @@ void QQuickShapePath::resetFillGradient()
\list
- \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
+ \li When running with the OpenGL backend of Qt Quick, only the generic,
+ triangulation-based approach is available. 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
@@ -623,16 +618,10 @@ void QQuickShapePath::resetFillGradient()
a frequently changing property can still result in a lower overall system
load than with imperative painting approaches (for example, QPainter).
- \li If animating properties other than stroke and fill colors is a must,
- it is recommended to target systems providing \c{GL_NV_path_rendering}
- where the cost of property changes is smaller.
-
\li At the same time, attention must be paid to the number of Shape
- elements in the scene, in particular when using this special accelerated
- approach for \c{GL_NV_path_rendering}. The way such a Shape item is
- represented in the scene graph is different from an ordinary
- geometry-based item, and incurs a certain cost when it comes to OpenGL
- state changes.
+ elements in the scene. The way such a Shape item is represented in
+ the scene graph is different from an ordinary geometry-based item,
+ and incurs a certain cost when it comes to OpenGL state changes.
\li As a general rule, scenes should avoid using separate Shape items when
it is not absolutely necessary. Prefer using one Shape item with multiple
@@ -690,8 +679,8 @@ QQuickShape::~QQuickShape()
\value Shape.GeometryRenderer
The generic, driver independent solution for OpenGL. Uses the same
CPU-based triangulation approach as QPainter's OpenGL 2 paint
- engine. This is the default on non-NVIDIA hardware when the default,
- OpenGL Qt Quick scenegraph backend is in use.
+ engine. This is the default when the OpenGL Qt Quick scenegraph
+ backend is in use.
\value Shape.SoftwareRenderer
Pure QPainter drawing using the raster paint engine. This is the
@@ -741,15 +730,10 @@ void QQuickShape::setAsynchronous(bool async)
/*!
\qmlproperty bool QtQuick.Shapes::Shape::vendorExtensionsEnabled
- This property controls the usage of non-standard OpenGL extensions like
- \c GL_NV_path_rendering.
+ This property controls the usage of non-standard OpenGL extensions.
The default value is \c false.
- As of Qt 5.12 Shape.NvprRenderer is disabled by default and a uniform
- behavior, based on triangulating the path and generating QSGGeometryNode
- instances, is used regardless of the graphics card and drivers.
-
As of Qt 6.0 there are no vendor-specific rendering paths implemented.
*/