From c204b176a5351d78e85bdc6ca78ee99429a81ff9 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 14 Oct 2016 12:27:44 +0200 Subject: Fix d3d12 plugin compilation after QSGGeometry API review Missed the fact the semantic is now attributeType in the public API. Change-Id: I9c967fd24d904c2886054768bb626a62d291b8ba Reviewed-by: Andy Nichols --- src/plugins/scenegraph/d3d12/qsgd3d12renderer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/plugins/scenegraph/d3d12') diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12renderer.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12renderer.cpp index 7f448ecd6f..c0f111ee83 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12renderer.cpp +++ b/src/plugins/scenegraph/d3d12/qsgd3d12renderer.cpp @@ -561,10 +561,11 @@ void QSGD3D12Renderer::setInputLayout(const QSGGeometry *g, QSGD3D12PipelineStat QSGD3D12InputElement &ie(pipelineState->inputElements[i]); static const char *semanticNames[] = { "UNKNOWN", "POSITION", "COLOR", "TEXCOORD", "TEXCOORD", "TEXCOORD" }; static const int semanticIndices[] = { 0, 0, 0, 0, 1, 2 }; - Q_ASSERT(attrs[i].semantic >= 1 && attrs[i].semantic < _countof(semanticNames)); + const int semantic = attrs[i].attributeType; + Q_ASSERT(semantic >= 1 && semantic < _countof(semanticNames)); const int tupleSize = attrs[i].tupleSize; - ie.semanticName = semanticNames[attrs[i].semantic]; - ie.semanticIndex = semanticIndices[attrs[i].semantic]; + ie.semanticName = semanticNames[semantic]; + ie.semanticIndex = semanticIndices[semantic]; ie.offset = offset; int bytesPerTuple = 0; ie.format = QSGD3D12Engine::toDXGIFormat(QSGGeometry::Type(attrs[i].type), tupleSize, &bytesPerTuple); -- cgit v1.2.3