diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-26 10:12:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-26 13:08:13 +0200 |
| commit | 1169242f14f9e27cbe4e3360dd47d0825eaf9e60 (patch) | |
| tree | 63e79e41bc48b9dc3cd40d3c29bacfd303c3c7b6 /src/quick/scenegraph/qsgdefaultrendercontext_p.h | |
| parent | 9f731b6841bbc9b7425a95303369d05be895f949 (diff) | |
| parent | f95c18b04e260a633d7a1d7cb0d3aaca01f9782f (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/imports/imports.pro
src/src.pro
Change-Id: Icdc39b6169d15b2102acd0e4d550a8d91e4b0744
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultrendercontext_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultrendercontext_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext_p.h b/src/quick/scenegraph/qsgdefaultrendercontext_p.h index eb62586a94..57aa4b4c90 100644 --- a/src/quick/scenegraph/qsgdefaultrendercontext_p.h +++ b/src/quick/scenegraph/qsgdefaultrendercontext_p.h @@ -95,6 +95,7 @@ public: bool hasBrokenIndexBufferObjects() const { return m_brokenIBOs; } int maxTextureSize() const override { return m_maxTextureSize; } + bool separateIndexBuffer() const; protected: static QString fontKey(const QRawFont &font); @@ -106,8 +107,6 @@ protected: bool m_serializedRender; bool m_attachToGLContext; QSGAtlasTexture::Manager *m_atlasManager; - - }; QT_END_NAMESPACE |