Remove redundant code in AlphaCoverage/SeamlessCubemap render states

The render states AlphaCoverage and SeamlessCubemap will only be added
to the render set when their nodes are enabled, so there's no need for
an additional boolean field in their backend nodes.

Task-number: QTBUG-60419
Change-Id: I3184c665b1d1bd10c067428b2acac6cfb68bd638
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 6 insertions, 19 deletions

diff --git a/src/render/renderstates/renderstates.cpp b/src/render/renderstates/renderstates.cpp
index 9b99162d0..49ccf9ae7 100644
--- a/src/render/renderstates/renderstates.cpp
+++ b/src/render/renderstates/renderstates.cpp
@@ -194,13 +194,7 @@ void StencilTest::apply(GraphicsContext *gc) const
 
 void AlphaCoverage::apply(GraphicsContext *gc) const
 {
-    gc->setAlphaCoverageEnabled(std::get<0>(m_values));
-}
-
-void AlphaCoverage::updateProperty(const char *name, const QVariant &value)
-{
-    if (name == QByteArrayLiteral("enabled"))
-        std::get<0>(m_values) = value.toBool();
+    gc->setAlphaCoverageEnabled(true);
 }
 
 void PointSize::apply(GraphicsContext *gc) const
@@ -254,12 +248,7 @@ void ClipPlane::updateProperty(const char *name, const QVariant &value)
 
 void SeamlessCubemap::apply(GraphicsContext *gc) const
 {
-    gc->setSeamlessCubemap(std::get<0>(m_values));
-}
-
-void SeamlessCubemap::updateProperty(const char *name, const QVariant &value)
-{
-    if (name == QByteArrayLiteral("enabled")) std::get<0>(m_values) = value.toBool();
+    gc->setSeamlessCubemap(true);
 }
 
 void StencilOp::apply(GraphicsContext *gc) const
diff --git a/src/render/renderstates/renderstates_p.h b/src/render/renderstates/renderstates_p.h
index c0062bb3d..66e9e079a 100644
--- a/src/render/renderstates/renderstates_p.h
+++ b/src/render/renderstates/renderstates_p.h
@@ -134,11 +134,10 @@ public:
     void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
 };
 
-class Q_AUTOTEST_EXPORT AlphaCoverage : public GenericState<AlphaCoverage, AlphaCoverageStateMask, GLboolean>
+class Q_AUTOTEST_EXPORT AlphaCoverage : public GenericState<AlphaCoverage, AlphaCoverageStateMask>
 {
 public:
     void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
 };
 
 class Q_AUTOTEST_EXPORT PointSize : public GenericState<PointSize, PointSizeMask, bool, GLfloat>
@@ -169,11 +168,10 @@ public:
     void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
 };
 
-class Q_AUTOTEST_EXPORT SeamlessCubemap : public GenericState<SeamlessCubemap, SeamlessCubemapMask, GLboolean>
+class Q_AUTOTEST_EXPORT SeamlessCubemap : public GenericState<SeamlessCubemap, SeamlessCubemapMask>
 {
 public:
     virtual void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
 };
 
 class Q_AUTOTEST_EXPORT StencilOp : public GenericState<StencilOp, StencilOpMask, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum>
diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderstates/renderstateset.cpp
index 992d649e8..afe900997 100644
--- a/src/render/renderstates/renderstateset.cpp
+++ b/src/render/renderstates/renderstateset.cpp
@@ -249,7 +249,7 @@ StateVariant RenderStateSet::initializeStateFromPeer(const Qt3DRender::QRenderSt
 {
     switch (change->renderStateType()) {
     case AlphaCoverageStateMask: {
-        return RenderStateSet::createState<AlphaCoverage>(change->isNodeEnabled());
+        return RenderStateSet::createState<AlphaCoverage>();
     }
 
     case AlphaTestMask: {
@@ -347,7 +347,7 @@ StateVariant RenderStateSet::initializeStateFromPeer(const Qt3DRender::QRenderSt
     }
 
     case SeamlessCubemapMask: {
-        return RenderStateSet::createState<SeamlessCubemap>(change->isNodeEnabled());
+        return RenderStateSet::createState<SeamlessCubemap>();
     }
 
     case StencilOpMask: {