diff options
Diffstat (limited to 'src/plugins/scenegraph/d3d12')
4 files changed, 15 insertions, 14 deletions
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp index fc3ea4e22e..3351486bc6 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp +++ b/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp @@ -679,7 +679,7 @@ void QSGD3D12TextMaterial::populate(const QPointF &p, float glyphCacheInverseScaleX = 1.0 / glyphCacheScaleX; float glyphCacheInverseScaleY = 1.0 / glyphCacheScaleY; - Q_ASSERT(geometry->indexType() == QSGGeometry::TypeUnsignedShort); + Q_ASSERT(geometry->indexType() == QSGGeometry::UnsignedShortType); geometry->allocate(glyphIndexes.size() * 4, glyphIndexes.size() * 6); QVector4D *vp = reinterpret_cast<QVector4D *>(geometry->vertexDataAsTexturedPoint2D()); Q_ASSERT(geometry->sizeOfVertex() == sizeof(QVector4D)); diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp index 2644c693ce..a318ce23f7 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp +++ b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp @@ -585,31 +585,31 @@ QSGD3D12Format QSGD3D12Engine::toDXGIFormat(QSGGeometry::Type sgtype, int tupleS FmtFloat4 }; switch (sgtype) { - case QSGGeometry::TypeUnsignedByte: + case QSGGeometry::UnsignedByteType: format = formatMap_ub[tupleSize]; if (size) *size = tupleSize; break; - case QSGGeometry::TypeFloat: + case QSGGeometry::FloatType: format = formatMap_f[tupleSize]; if (size) *size = sizeof(float) * tupleSize; break; - case QSGGeometry::TypeUnsignedShort: + case QSGGeometry::UnsignedShortType: format = FmtUnsignedShort; if (size) *size = sizeof(ushort) * tupleSize; break; - case QSGGeometry::TypeUnsignedInt: + case QSGGeometry::UnsignedIntType: format = FmtUnsignedInt; if (size) *size = sizeof(uint) * tupleSize; break; - case QSGGeometry::TypeByte: - case QSGGeometry::TypeInt: - case QSGGeometry::TypeShort: + case QSGGeometry::ByteType: + case QSGGeometry::IntType: + case QSGGeometry::ShortType: qWarning("no mapping for GL type 0x%x", sgtype); break; diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12renderer.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12renderer.cpp index ce633ae996..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); @@ -718,7 +719,7 @@ void QSGD3D12Renderer::renderStencilClip(const QSGClipNode *clip, int elementInd const QSGGeometry *g = clip->geometry(); Q_ASSERT(g->attributeCount() == 1); Q_ASSERT(g->attributes()[0].tupleSize == 2); - Q_ASSERT(g->attributes()[0].type == QSGGeometry::TypeFloat); + Q_ASSERT(g->attributes()[0].type == QSGGeometry::FloatType); setInputLayout(g, &sps); m_engine->finalizePipeline(sps); diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12spritenode.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12spritenode.cpp index bad222dbaa..807fbcdcec 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12spritenode.cpp +++ b/src/plugins/scenegraph/d3d12/qsgd3d12spritenode.cpp @@ -166,8 +166,8 @@ QSGD3D12Material::UpdateResults QSGD3D12SpriteMaterial::updatePipeline(const QSG } static QSGGeometry::Attribute Sprite_Attributes[] = { - QSGGeometry::Attribute::createWithSemantic(0, 2, QSGGeometry::TypeFloat, QSGGeometry::Attribute::POSITION), - QSGGeometry::Attribute::createWithSemantic(1, 2, QSGGeometry::TypeFloat, QSGGeometry::Attribute::TEXCOORD), + QSGGeometry::Attribute::createWithAttributeType(0, 2, QSGGeometry::FloatType, QSGGeometry::PositionAttribute), + QSGGeometry::Attribute::createWithAttributeType(1, 2, QSGGeometry::FloatType, QSGGeometry::TexCoordAttribute), }; static QSGGeometry::AttributeSet Sprite_AttributeSet = { 2, 4 * sizeof(float), Sprite_Attributes }; |