projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove QSGEngine
[profile/ivi/qtdeclarative.git]
/
src
/
quick
/
scenegraph
/
qsgcontext_p.h
diff --git
a/src/quick/scenegraph/qsgcontext_p.h
b/src/quick/scenegraph/qsgcontext_p.h
index
0f8b5ae
..
35b97c3
100644
(file)
--- a/
src/quick/scenegraph/qsgcontext_p.h
+++ b/
src/quick/scenegraph/qsgcontext_p.h
@@
-51,6
+51,7
@@
#include <private/qrawfont_p.h>
#include <QtQuick/qsgnode.h>
#include <private/qrawfont_p.h>
#include <QtQuick/qsgnode.h>
+#include <QtQuick/private/qsgdepthstencilbuffer_p.h>
QT_BEGIN_HEADER
QT_BEGIN_HEADER
@@
-67,7
+68,7
@@
class QQuickCanvas;
class QSGTexture;
class QSGMaterial;
class QSGMaterialShader;
class QSGTexture;
class QSGMaterial;
class QSGMaterialShader;
-class Q
SGEngine
;
+class Q
QuickWindowManager
;
class QOpenGLContext;
class QOpenGLFramebufferObject;
class QOpenGLContext;
class QOpenGLFramebufferObject;
@@
-94,7
+95,7
@@
public:
virtual void renderNextFrame(QSGRenderer *renderer, GLuint fboId);
virtual void renderNextFrame(QSGRenderer *renderer, GLuint fboId);
- virtual QSGDistanceFieldGlyphCache *
createD
istanceFieldGlyphCache(const QRawFont &font);
+ virtual QSGDistanceFieldGlyphCache *
d
istanceFieldGlyphCache(const QRawFont &font);
virtual QSGRectangleNode *createRectangleNode();
virtual QSGImageNode *createImageNode();
virtual QSGRectangleNode *createRectangleNode();
virtual QSGImageNode *createImageNode();
@@
-103,6
+104,8
@@
public:
virtual QSGTexture *createTexture(const QImage &image = QImage()) const;
virtual QSize minimumFBOSize() const;
virtual QSGTexture *createTexture(const QImage &image = QImage()) const;
virtual QSize minimumFBOSize() const;
+ virtual QSharedPointer<QSGDepthStencilBuffer> depthStencilBufferForFbo(QOpenGLFramebufferObject *fbo);
+ QSGDepthStencilBufferManager *depthStencilBufferManager();
virtual QSurfaceFormat defaultSurfaceFormat() const;
virtual QSurfaceFormat defaultSurfaceFormat() const;
@@
-122,6
+125,7
@@
public:
virtual QAnimationDriver *createAnimationDriver(QObject *parent);
static QQuickTextureFactory *createTextureFactoryFromImage(const QImage &image);
virtual QAnimationDriver *createAnimationDriver(QObject *parent);
static QQuickTextureFactory *createTextureFactoryFromImage(const QImage &image);
+ static QQuickWindowManager *createWindowManager();
public slots:
public slots: