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/renderstates/renderstateset.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/renderstates/renderstateset.cpp')
-rw-r--r-- | src/render/renderstates/renderstateset.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderstates/renderstateset.cpp index 8de1bcb46..0d324b55b 100644 --- a/src/render/renderstates/renderstateset.cpp +++ b/src/render/renderstates/renderstateset.cpp @@ -51,7 +51,7 @@ #include <Qt3DRender/qalphacoverage.h> #include <Qt3DRender/qalphatest.h> #include <Qt3DRender/qblendequation.h> -#include <Qt3DRender/qblendstate.h> +#include <Qt3DRender/qblendequationarguments.h> #include <Qt3DRender/qcolormask.h> #include <Qt3DRender/qcullface.h> #include <Qt3DRender/qdepthmask.h> @@ -268,18 +268,18 @@ RenderStateImpl* RenderStateImpl::getOrCreateState(QRenderState *renderState) QBlendEquation *blendEquation = static_cast<QBlendEquation *>(renderState); return getOrCreateRenderStateImpl<BlendEquation>(blendEquation->blendFunction()); } - case QRenderState::BlendState: { - QBlendState *blendState = static_cast<QBlendState *>(renderState); + case QRenderState::BlendEquationArguments: { + QBlendEquationArguments *blendState = static_cast<QBlendEquationArguments *>(renderState); // just use the same values for RGB and Alpha - return getOrCreateRenderStateImpl<BlendState>(blendState->srcRGB(), blendState->dstRGB(), - blendState->srcRGB(), blendState->dstRGB(), + return getOrCreateRenderStateImpl<BlendEquationArguments>(blendState->sourceRgb(), blendState->destinationRgb(), + blendState->sourceRgb(), blendState->destinationRgb(), blendState->isEnabled(), blendState->bufferIndex()); } case QRenderState::BlendStateSeparate: { - QBlendState *blendState = static_cast<QBlendState *>(renderState); - return getOrCreateRenderStateImpl<BlendState>(blendState->srcRGB(), blendState->dstRGB(), - blendState->srcAlpha(), blendState->dstAlpha(), + QBlendEquationArguments *blendState = static_cast<QBlendEquationArguments *>(renderState); + return getOrCreateRenderStateImpl<BlendEquationArguments>(blendState->sourceRgb(), blendState->destinationRgb(), + blendState->sourceAlpha(), blendState->destinationAlpha(), blendState->isEnabled(), blendState->bufferIndex()); } |