diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-09 21:11:12 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-10 21:49:14 +0200 |
| commit | 336e0eb1bc21215012f56f725ebbfb5710d22814 (patch) | |
| tree | 61cef7fbd348dcddfcebbdea212d7ed1ec7f0504 /src/render/renderers/opengl/jobs/renderviewjobutils_p.h | |
| parent | 1b4487817e68a5e87eff54793b02c85792accc10 (diff) | |
| parent | ba717d2c21950f06a9795e711c86b4b6e8e66137 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'src/render/renderers/opengl/jobs/renderviewjobutils_p.h')
| -rw-r--r-- | src/render/renderers/opengl/jobs/renderviewjobutils_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/renderers/opengl/jobs/renderviewjobutils_p.h b/src/render/renderers/opengl/jobs/renderviewjobutils_p.h index 90c4a53cc..bd2e12534 100644 --- a/src/render/renderers/opengl/jobs/renderviewjobutils_p.h +++ b/src/render/renderers/opengl/jobs/renderviewjobutils_p.h @@ -150,9 +150,9 @@ void parametersFromParametersProvider(ParameterInfoList *infoList, Q_AUTOTEST_EXPORT ParameterInfoList::const_iterator findParamInfo(ParameterInfoList *infoList, const int nameId); -Q_AUTOTEST_EXPORT void addToRenderStateSet(RenderStateSet *stateSet, - const QVector<Qt3DCore::QNodeId> stateIds, - RenderStateManager *manager); +Q_AUTOTEST_EXPORT void addUniqueStatesToRenderStateSet(RenderStateSet *stateSet, + const QVector<Qt3DCore::QNodeId> stateIds, + RenderStateManager *manager); typedef QHash<int, QVariant> UniformBlockValueBuilderHash; |