Details
-
Technical task
-
Resolution: Done
-
P2: Important
-
None
Description
Split off from QTBUG-79268.
A list of todos from the 5.15 codebase (note that the non-rhi items on this list are to be reviewed as some of them is something we will not actually do)
quick/scenegraph/coreapi/qsgmaterial.h(63): RhiShaderWanted = 0x1000 // // ### Qt 6: remove quick/scenegraph/coreapi/qsgmaterialrhishader.h(58): class Q_QUICK_EXPORT QSGMaterialRhiShader : public QSGMaterialShader // ### Qt 6: remove inheritance quick/scenegraph/coreapi/qsgnode.h(180): DirtyState m_dirtyState; // Obsolete, remove in Qt 6 quick/scenegraph/coreapi/qsgopenglvisualizer_p.h(63): // ### Qt 6: remove quick/scenegraph/coreapi/qsgtexture.cpp(795): // before Qt 6 because the simple QSGTexture ctor must be kept working. quick/scenegraph/coreapi/qsgtexture.h(88): virtual int textureId() const = 0; // ### Qt 6: remove quick/scenegraph/coreapi/qsgtexture.h(120): // ### Qt 6: make these virtual quick/scenegraph/coreapi/qsgtexture.h(124): // ### Qt 6: make this an argument for removedFromAtlas() quick/scenegraph/coreapi/qsgtexture_p.h(88): // ### Qt 6: these should be virtuals in the public class instead quick/scenegraph/coreapi/qsgtexture_p.h(89): virtual int comparisonKey() const; // ### Qt 6: pure virtual quick/scenegraph/coreapi/qsgtexture_p.h(92): QRhiResourceUpdateBatch *workResourceUpdateBatch = nullptr; // ### Qt 6: remove quick/scenegraph/qsgdefaultrendercontext_p.h(96): QOpenGLContext *openGLContext = nullptr; // ### Qt 6: remove quick/scenegraph/qsgrenderloop.cpp(87): // and the related classes. To be cleaned up in Qt 6 when the direct quick/scenegraph/util/qsgengine.h(57): // ### Qt 6: Remove or redesign. quick/scenegraph/util/qsgimagenode.h(70): // ### Qt6: Add anisotropy support here, and possibly a virtual hook or another mean to extend this class. quick/scenegraph/util/qsgrhiatlastexture.cpp(468): QRhiResourceUpdateBatch *resUpd = workResourceUpdateBatch(); // ### Qt 6: should be an arg to this function quick/scenegraph/util/qsgsimplematerial.h(74): // ### Qt 6: make both virtual and fix docs
Also there are at least 2 classes that have \deprecated since 5.8, these should be undeprecated in fact:
QSGSimpleRectNode
QSGSimpleTextureNode
The textureprovider example should be removed. It is using OpenGL directly to demonstrate compressed texture support, this is bad on multiple levels now (uses OpenGL directly, and re-implements something that is built-in since 5.12)
There are also some make-public TODOs in QSGRenderNodePrivate.
Additionally, the 'windows' render loop's fate has to be decided: QTBUG-78578
Attachments
Issue Links
- depends on
-
QTBUG-78578
Investigate and conclude the future of the 'windows' render loop in Qt Quick
-
- Closed
-
- is required for
-
QTBUG-79268
Purge direct OpenGL code path in Qt Quick
-
- Closed
-
- resulted in
-
QTBUG-83978 Remove textureprovider example (qtdeclarative/examples/quick/textureprovider)
-
- Closed
-
-
QTBUG-83979 Make the RHI version of QSGMaterialShader the only one. Remove direct OpenGL based materials.
-
- Closed
-
| For Gerrit Dashboard: QTBUG-82997 | ||||||
|---|---|---|---|---|---|---|
| # | Subject | Branch | Project | Status | CR | V |
| 296477,2 | Remove unused, deprecated QSGNode member variable | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |
| 296478,2 | Implement the todo for adding anisotropy virtuals to QSGImageNode | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |
| 296486,4 | Make comparisonKey() a pure virtual in QSGTexture | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |
| 296496,4 | Add argument to QSGTexture::removedFromAtlas() | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |
| 296501,6 | Move updateRhiTexture and co. to QSGTexture | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |
| 296511,6 | Remove leftover legacy shader files in scenegraph example | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |
| 296515,3 | Undeprecate (in docs) QSGSimpleRect/TextureNode | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |
| 298468,3 | Temporarily restore a QSGTexturePrivate function | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |
| 298885,6 | Remove the 'windows' render loop | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |
| 299030,3 | Move some QSGRenderNodePrivate members | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |
| 299032,15 | Make QSGMaterialRhiShader become QSGMaterialShader | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |