aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickshadereffectsource_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-08-08 16:33:58 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2014-08-22 21:13:28 +0200
commitd9c531781e6c95f80681b3c82700833e1de88794 (patch)
tree70aa7216b7c3198c88049f94ffbee042981be27e /src/quick/items/qquickshadereffectsource_p.h
parent595340f1622783e97c53b035b78691572537f00a (diff)
Cleanup: Remove ShaderEffectSourceNode
We can simply use a standard image node and do the dirty marking also directly in the texture (both live in the same thread). Change-Id: I7345c702613782adec3c6a36a7705a2a54ed82ec Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/quick/items/qquickshadereffectsource_p.h')
-rw-r--r--src/quick/items/qquickshadereffectsource_p.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h
index 13b81cede5..4caeaab52c 100644
--- a/src/quick/items/qquickshadereffectsource_p.h
+++ b/src/quick/items/qquickshadereffectsource_p.h
@@ -64,17 +64,6 @@ class QSGSimpleRectNode;
class QQuickShaderEffectSourceTextureProvider;
-class QQuickShaderEffectSourceNode : public QObject, public QSGDefaultImageNode
-{
- Q_OBJECT
-
-public:
- QQuickShaderEffectSourceNode();
-
-private Q_SLOTS:
- void markDirtyTexture();
-};
-
class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectTexture : public QSGDynamicTexture
{
Q_OBJECT
@@ -88,6 +77,8 @@ public:
QSGNode *item() const { return m_item; }
void setItem(QSGNode *item);
+ void setShaderSourceNode(QSGNode *node) { m_shaderSourceNode = node; }
+
QRectF rect() const { return m_rect; }
void setRect(const QRectF &rect);
@@ -125,11 +116,16 @@ Q_SIGNALS:
public Q_SLOTS:
void markDirtyTexture();
void invalidated();
+ void markDirtyTextureLater();
+
+protected:
+ virtual void customEvent(QEvent *);
private:
void grab();
QSGNode *m_item;
+ QSGNode *m_shaderSourceNode;
QRectF m_rect;
QSize m_size;
qreal m_device_pixel_ratio;