diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-26 15:04:17 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-06-01 10:32:15 +0000 |
| commit | a6d3e3afcdd8f08893cff4deed7e866a5daf3cbd (patch) | |
| tree | 3f1b519e4f541b03b2b1a8c9c6fb0c1854e5735d /src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp | |
| parent | b34296671b0a1a314153cefd817c06478839d65d (diff) | |
D3D12: Get rid of the material's RenderState duplication
Change-Id: Icd42a1bfff0f12f8162e888f204ad9b3a79aa911
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp')
| -rw-r--r-- | src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp index e335fac0b0..b5c0b1d903 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp +++ b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp @@ -326,7 +326,7 @@ static inline QColor qsg_premultiply_color(const QColor &c) return QColor::fromRgbF(c.redF() * c.alphaF(), c.greenF() * c.alphaF(), c.blueF() * c.alphaF(), c.alphaF()); } -QSGD3D12Material::UpdateResults QSGD3D12ShaderEffectMaterial::updatePipeline(const RenderState &state, +QSGD3D12Material::UpdateResults QSGD3D12ShaderEffectMaterial::updatePipeline(const QSGD3D12MaterialRenderState &state, QSGD3D12PipelineState *pipelineState, ExtraState *, quint8 *constantBuffer) |