diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-06-19 10:37:25 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-06-19 10:37:25 +0100 |
| commit | 5af4e423be269a9edf3037ff0302d438f077de04 (patch) | |
| tree | a7e5eb78a718921141380658f00f1caedcdb1ba4 /src/render/renderstates/renderstates.cpp | |
| parent | 02e960493ef9a2f8dc25a06616fbde8fd869d1af (diff) | |
| parent | 01a6bcd086cecef3169e5d79bd72dbb0d1393a0f (diff) | |
Merge branch '5.9' into dev
Conflicts:
src/render/frontend/qcameralens_p.h
src/render/texture/qtexture.cpp
src/render/texture/qtexture_p.h
Change-Id: I20b25cf123f44c96f69ca5f8e042a38692e5cb49
Diffstat (limited to 'src/render/renderstates/renderstates.cpp')
| -rw-r--r-- | src/render/renderstates/renderstates.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/render/renderstates/renderstates.cpp b/src/render/renderstates/renderstates.cpp index 3f2573c8f..9f2735b25 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 |