From 8867be2d1d92e981ed736330f036a681ce4b520b Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Wed, 2 May 2012 17:29:54 +0200 Subject: Remove QSGEngine Change-Id: Iaab0d9f607b1f4ca6dfb13495a456d1b31bb980a Reviewed-by: Lars Knoll --- src/particles/qquickimageparticle.cpp | 1 - src/quick/items/qquickanimatedsprite.cpp | 1 - src/quick/items/qquickcanvas.cpp | 25 ------- src/quick/items/qquickcanvas.h | 3 - src/quick/items/qquickcanvas_p.h | 1 - src/quick/items/qquickitem.cpp | 5 -- src/quick/items/qquickitem.h | 3 - src/quick/items/qquickspriteimage.cpp | 1 - src/quick/items/qquickspritesequence.cpp | 1 - src/quick/scenegraph/qsgcontext_p.h | 1 - src/quick/scenegraph/scenegraph.pri | 4 +- src/quick/scenegraph/util/qsgengine.cpp | 115 ------------------------------- src/quick/scenegraph/util/qsgengine.h | 100 --------------------------- 13 files changed, 1 insertion(+), 260 deletions(-) delete mode 100644 src/quick/scenegraph/util/qsgengine.cpp delete mode 100644 src/quick/scenegraph/util/qsgengine.h (limited to 'src') diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index d20862a026..c0b0e8e739 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp index 618178fd1c..7110351cc7 100644 --- a/src/quick/items/qquickanimatedsprite.cpp +++ b/src/quick/items/qquickanimatedsprite.cpp @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp index 17f9947b66..a6905b55aa 100644 --- a/src/quick/items/qquickcanvas.cpp +++ b/src/quick/items/qquickcanvas.cpp @@ -49,7 +49,6 @@ #include #include #include -#include #include @@ -350,10 +349,6 @@ void QQuickCanvasPrivate::init(QQuickCanvas *c) QObject::connect(context, SIGNAL(initialized()), q, SIGNAL(sceneGraphInitialized()), Qt::DirectConnection); QObject::connect(context, SIGNAL(invalidated()), q, SIGNAL(sceneGraphInvalidated()), Qt::DirectConnection); QObject::connect(context, SIGNAL(invalidated()), q, SLOT(cleanupSceneGraph()), Qt::DirectConnection); - - // ### TODO: remove QSGEngine - engine = new QSGEngine(); - engine->setCanvas(q); } QQmlListProperty QQuickCanvasPrivate::data() @@ -2126,26 +2121,6 @@ QOpenGLContext *QQuickCanvas::openglContext() const This signal will be emitted from the scene graph rendering thread. */ -/*! - Returns the QSGEngine used for this scene. - - The engine will only be available once the scene graph has been - initialized. Register for the sceneGraphEngine() signal to get - notification about this. - - \deprecated - */ - -QSGEngine *QQuickCanvas::sceneGraphEngine() const -{ - Q_D(const QQuickCanvas); - qWarning("QQuickCanvas::sceneGraphEngine() is deprecated, use members of QQuickCanvas instead"); - if (d->context && d->context->isReady()) - return d->engine; - return 0; -} - - /*! Sets the render target for this canvas to be \a fbo. diff --git a/src/quick/items/qquickcanvas.h b/src/quick/items/qquickcanvas.h index 396bc2b8ff..0e06202849 100644 --- a/src/quick/items/qquickcanvas.h +++ b/src/quick/items/qquickcanvas.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QSGEngine; class QQuickItem; class QSGTexture; class QInputMethodEvent; @@ -89,8 +88,6 @@ public: bool sendEvent(QQuickItem *, QEvent *); - QSGEngine *sceneGraphEngine() const; - QImage grabFrameBuffer(); void setRenderTarget(QOpenGLFramebufferObject *fbo); diff --git a/src/quick/items/qquickcanvas_p.h b/src/quick/items/qquickcanvas_p.h index 643d694400..d592121938 100644 --- a/src/quick/items/qquickcanvas_p.h +++ b/src/quick/items/qquickcanvas_p.h @@ -174,7 +174,6 @@ public: void fireFrameSwapped() { emit q_func()->frameSwapped(); } - QSGEngine *engine; QSGContext *context; QSGRenderer *renderer; diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index a0e1c2a650..88663411a9 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -2144,11 +2144,6 @@ QQuickItem *QQuickItem::parentItem() const return d->parentItem; } -QSGEngine *QQuickItem::sceneGraphEngine() const -{ - return canvas()->sceneGraphEngine(); -} - QQuickCanvas *QQuickItem::canvas() const { Q_D(const QQuickItem); diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 0d74cc0c4d..69122bdbcd 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -89,7 +89,6 @@ class QQuickKeyEvent; class QQuickAnchors; class QQuickItemPrivate; class QQuickCanvas; -class QSGEngine; class QTouchEvent; class QSGNode; class QSGTransformNode; @@ -195,8 +194,6 @@ public: QQuickItem(QQuickItem *parent = 0); virtual ~QQuickItem(); - QSGEngine *sceneGraphEngine() const; - QQuickCanvas *canvas() const; QQuickItem *parentItem() const; void setParentItem(QQuickItem *parent); diff --git a/src/quick/items/qquickspriteimage.cpp b/src/quick/items/qquickspriteimage.cpp index 2a151d02a8..fca6fbc19e 100644 --- a/src/quick/items/qquickspriteimage.cpp +++ b/src/quick/items/qquickspriteimage.cpp @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp index ce0a246748..80dad16fe3 100644 --- a/src/quick/items/qquickspritesequence.cpp +++ b/src/quick/items/qquickspritesequence.cpp @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h index 7cbff40a9b..35b97c3d15 100644 --- a/src/quick/scenegraph/qsgcontext_p.h +++ b/src/quick/scenegraph/qsgcontext_p.h @@ -68,7 +68,6 @@ class QQuickCanvas; class QSGTexture; class QSGMaterial; class QSGMaterialShader; -class QSGEngine; class QQuickWindowManager; class QOpenGLContext; diff --git a/src/quick/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri index b6f7a228d2..fea921163a 100644 --- a/src/quick/scenegraph/scenegraph.pri +++ b/src/quick/scenegraph/scenegraph.pri @@ -1,4 +1,4 @@ -!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL +qsg!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL # Core API HEADERS += \ @@ -24,7 +24,6 @@ SOURCES += \ HEADERS += \ $$PWD/util/qsgareaallocator_p.h \ $$PWD/util/qsgdepthstencilbuffer_p.h \ - $$PWD/util/qsgengine.h \ $$PWD/util/qsgflatcolormaterial.h \ $$PWD/util/qsgsimplematerial.h \ $$PWD/util/qsgsimplerectnode.h \ @@ -41,7 +40,6 @@ HEADERS += \ SOURCES += \ $$PWD/util/qsgareaallocator.cpp \ $$PWD/util/qsgdepthstencilbuffer.cpp \ - $$PWD/util/qsgengine.cpp \ $$PWD/util/qsgflatcolormaterial.cpp \ $$PWD/util/qsgsimplerectnode.cpp \ $$PWD/util/qsgsimpletexturenode.cpp \ diff --git a/src/quick/scenegraph/util/qsgengine.cpp b/src/quick/scenegraph/util/qsgengine.cpp deleted file mode 100644 index 5d50002870..0000000000 --- a/src/quick/scenegraph/util/qsgengine.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qsgengine.h" - -#include - -#include -#include - -QT_BEGIN_NAMESPACE - -class QSGEnginePrivate : public QObjectPrivate -{ -public: - QSGEnginePrivate() - : canvas(0) - { - } - - QQuickCanvas *canvas; -}; - -/*! - \class QSGEngine - \deprecated - */ - -QSGEngine::QSGEngine(QObject *parent) : - QObject(*(new QSGEnginePrivate), parent) -{ -} - - -QSGEngine::~QSGEngine() -{ -} - - -void QSGEngine::setCanvas(QQuickCanvas *canvas) -{ - d_func()->canvas = canvas; - connect(canvas, SIGNAL(afterRendering()), this, SIGNAL(afterRendering()), Qt::DirectConnection); - connect(canvas, SIGNAL(beforeRendering()), this, SIGNAL(beforeRendering()), Qt::DirectConnection); -} - -void QSGEngine::setClearBeforeRendering(bool enabled) -{ - d_func()->canvas->setClearBeforeRendering(enabled); -} - -bool QSGEngine::clearBeforeRendering() const -{ - return d_func()->canvas->clearBeforeRendering(); -} - -QSGTexture *QSGEngine::createTextureFromImage(const QImage &image) const -{ - return d_func()->canvas->createTextureFromImage(image); -} - -QSGTexture *QSGEngine::createTextureFromId(uint id, const QSize &size, TextureOptions options) const -{ - return d_func()->canvas->createTextureFromId(id, size, QQuickCanvas::CreateTextureOptions((int) options)); -} - -void QSGEngine::setClearColor(const QColor &color) -{ - d_func()->canvas->setClearColor(color); -} - -QColor QSGEngine::clearColor() const -{ - return d_func()->canvas->clearColor(); -} - -QT_END_NAMESPACE diff --git a/src/quick/scenegraph/util/qsgengine.h b/src/quick/scenegraph/util/qsgengine.h deleted file mode 100644 index f62bdb2ab3..0000000000 --- a/src/quick/scenegraph/util/qsgengine.h +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QSGENGINE_H -#define QSGENGINE_H - -#include - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -class QSGEnginePrivate; - -class QQuickCanvas; - -class Q_QUICK_EXPORT QSGEngine : public QObject -{ - Q_OBJECT - - Q_DECLARE_PRIVATE(QSGEngine) - -public: - - enum TextureOption { - TextureHasAlphaChannel = 0x0001, - TextureHasMipmaps = 0x0002, - TextureOwnsGLTexture = 0x0004 - }; - Q_DECLARE_FLAGS(TextureOptions, TextureOption) - - QSGTexture *createTextureFromImage(const QImage &image) const; - QSGTexture *createTextureFromId(uint id, const QSize &size, TextureOptions options = TextureOption(0)) const; - - void setClearBeforeRendering(bool enabled); - bool clearBeforeRendering() const; - - void setClearColor(const QColor &color); - QColor clearColor() const; - -Q_SIGNALS: - void beforeRendering(); - void afterRendering(); - -private: - QSGEngine(QObject *parent = 0); - ~QSGEngine(); - - friend class QSGContext; - friend class QSGContextPrivate; - friend class QQuickCanvasPrivate; - void setCanvas(QQuickCanvas *canvas); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QSGENGINE_H -- cgit v1.2.3