Added a few material flags

Change-Id: Id324ebb82df985f1a7380761cc4923f60c7d1f20
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>

diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index da92701..1b62222 100644 (file)
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -309,7 +309,7 @@ QQuickShaderEffectMaterial::QQuickShaderEffectMaterial(QQuickShaderEffectNode *n
     , m_node(node)
     , m_emittedLogChanged(false)
 {
-    setFlag(Blending, true);
+    setFlag(Blending | RequiresFullMatrix, true);
 }
 
 QSGMaterialType *QQuickShaderEffectMaterial::type() const

diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
index 709ab6c..d010394 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
@@ -471,6 +471,12 @@ QSGMaterial::~QSGMaterial()
 
     \value Blending Set this flag to true if the material requires GL_BLEND to be
     enabled during rendering.
+
+    \value RequiresDeterminant Set this flag to true if the material relies on
+    the determinant of the matrix of the geometry nodes for rendering.
+
+    \value RequiresFullMatrix Set this flag to true if the material relies on
+    the full matrix of the geometry nodes for rendering.
  */
 
 

diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h
index 320481f..cf437fa 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgmaterial.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.h
@@ -113,7 +113,9 @@ class Q_QUICK_EXPORT QSGMaterial
 {
 public:
     enum Flag {
-        Blending = 0x0001
+        Blending            = 0x0001,
+        RequiresDeterminant = 0x0002,
+        RequiresFullMatrix  = 0x0004 | RequiresDeterminant
     };
     Q_DECLARE_FLAGS(Flags, Flag)
 

diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
index f4e85c6..d44044f 100644 (file)
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
@@ -189,7 +189,7 @@ QSGDistanceFieldTextMaterial::QSGDistanceFieldTextMaterial()
     : m_glyph_cache(0)
     , m_texture(0)
 {
-   setFlag(Blending, true);
+   setFlag(Blending | RequiresDeterminant, true);
 }
 
 QSGDistanceFieldTextMaterial::~QSGDistanceFieldTextMaterial()