diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-29 16:43:37 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-05 16:03:37 +0000 |
| commit | c00cadf3853942721cf8eb79b43cba78ceea658b (patch) | |
| tree | b0f30a5cc99dee18b4c6c8cbf830f16296c4d077 /src/render/defaults/qphongalphamaterial.cpp | |
| parent | 6c0eecafa10ea3d8ff288d262bd0368bdf19a9c8 (diff) | |
QBlendState cleanup
* renamed to QBlendEquationArguments
* property names expanded
Change-Id: Id25f0181415b4f093f2054238dbf3be26e36ff32
Task-number: QTBUG-51509
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/defaults/qphongalphamaterial.cpp')
| -rw-r--r-- | src/render/defaults/qphongalphamaterial.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/render/defaults/qphongalphamaterial.cpp b/src/render/defaults/qphongalphamaterial.cpp index 08c0fbe6d..2853333cb 100644 --- a/src/render/defaults/qphongalphamaterial.cpp +++ b/src/render/defaults/qphongalphamaterial.cpp @@ -48,7 +48,7 @@ #include <Qt3DRender/qrenderpass.h> #include <Qt3DRender/qgraphicsapifilter.h> #include <Qt3DRender/qblendequation.h> -#include <Qt3DRender/qblendstate.h> +#include <Qt3DRender/qblendequationarguments.h> #include <Qt3DRender/qdepthmask.h> #include <QUrl> #include <QVector3D> @@ -75,7 +75,7 @@ QPhongAlphaMaterialPrivate::QPhongAlphaMaterialPrivate() , m_phongAlphaGL3Shader(new QShaderProgram()) , m_phongAlphaGL2ES2Shader(new QShaderProgram()) , m_depthMask(new QDepthMask()) - , m_blendState(new QBlendState()) + , m_blendState(new QBlendEquationArguments()) , m_blendEquation(new QBlendEquation()) , m_annotation(new QAnnotation) { @@ -125,8 +125,9 @@ void QPhongAlphaMaterialPrivate::init() m_phongAlphaES2Technique->addAnnotation(m_annotation); m_depthMask->setMask(false); - m_blendState->setSrcRGB(QBlendState::SrcAlpha); - m_blendState->setDstRGB(QBlendState::OneMinusSrcAlpha); + + m_blendState->setSourceRgb(QBlendEquationArguments::SourceAlpha); + m_blendState->setDestinationRgb(QBlendEquationArguments::OneMinusSourceAlpha); m_blendEquation->setBlendFunction(QBlendEquation::Add); m_phongAlphaGL3RenderPass->setShaderProgram(m_phongAlphaGL3Shader); |