diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 11:55:39 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-07 20:35:05 +0200 |
| commit | 471e4fcb226c4523efe93b1bdaf0db026495da94 (patch) | |
| tree | bb963937b2446eb32d7632568433083a386f2c68 /src/gui/rhi/qshaderdescription.cpp | |
| parent | 7f400522c39f6a1abf083dc1af49ea3109635cc8 (diff) | |
Use QList instead of QVector in gui implementation
Task-number: QTBUG-84469
Change-Id: I366e845249203d80d640355a7780ac2f91a762f1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/rhi/qshaderdescription.cpp')
| -rw-r--r-- | src/gui/rhi/qshaderdescription.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/rhi/qshaderdescription.cpp b/src/gui/rhi/qshaderdescription.cpp index 23772f4765..c159a25340 100644 --- a/src/gui/rhi/qshaderdescription.cpp +++ b/src/gui/rhi/qshaderdescription.cpp @@ -417,7 +417,7 @@ QShaderDescription QShaderDescription::deserialize(QDataStream *stream, int vers called attributes) for the vertex stage, and inputs for other stages (sometimes called varyings). */ -QVector<QShaderDescription::InOutVariable> QShaderDescription::inputVariables() const +QList<QShaderDescription::InOutVariable> QShaderDescription::inputVariables() const { return d->inVars; } @@ -425,7 +425,7 @@ QVector<QShaderDescription::InOutVariable> QShaderDescription::inputVariables() /*! \return the list of output variables. */ -QVector<QShaderDescription::InOutVariable> QShaderDescription::outputVariables() const +QList<QShaderDescription::InOutVariable> QShaderDescription::outputVariables() const { return d->outVars; } @@ -433,7 +433,7 @@ QVector<QShaderDescription::InOutVariable> QShaderDescription::outputVariables() /*! \return the list of uniform blocks. */ -QVector<QShaderDescription::UniformBlock> QShaderDescription::uniformBlocks() const +QList<QShaderDescription::UniformBlock> QShaderDescription::uniformBlocks() const { return d->uniformBlocks; } @@ -445,7 +445,7 @@ QVector<QShaderDescription::UniformBlock> QShaderDescription::uniformBlocks() co in combination with the Qt Rendering Hardware Interface since that currently has no support for them. */ -QVector<QShaderDescription::PushConstantBlock> QShaderDescription::pushConstantBlocks() const +QList<QShaderDescription::PushConstantBlock> QShaderDescription::pushConstantBlocks() const { return d->pushConstantBlocks; } @@ -516,7 +516,7 @@ QVector<QShaderDescription::PushConstantBlock> QShaderDescription::pushConstantB \note SSBOs are not available with some graphics APIs, such as, OpenGL 2.x or OpenGL ES older than 3.1. */ -QVector<QShaderDescription::StorageBlock> QShaderDescription::storageBlocks() const +QList<QShaderDescription::StorageBlock> QShaderDescription::storageBlocks() const { return d->storageBlocks; } @@ -543,7 +543,7 @@ QVector<QShaderDescription::StorageBlock> QShaderDescription::storageBlocks() co exist everywhere. For instance, a HLSL version will likely just use a Texture2D and SamplerState object with registers t1 and s1, respectively. */ -QVector<QShaderDescription::InOutVariable> QShaderDescription::combinedImageSamplers() const +QList<QShaderDescription::InOutVariable> QShaderDescription::combinedImageSamplers() const { return d->combinedImageSamplers; } @@ -570,7 +570,7 @@ QVector<QShaderDescription::InOutVariable> QShaderDescription::combinedImageSamp \note Separate image objects are not compatible with some graphics APIs, such as, OpenGL 2.x or OpenGL ES older than 3.1. */ -QVector<QShaderDescription::InOutVariable> QShaderDescription::storageImages() const +QList<QShaderDescription::InOutVariable> QShaderDescription::storageImages() const { return d->storageImages; } |