qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix usage of C++14 features 

Change-Id: Ibd460eceafdd29d7d88ac2418496dc7002de1095
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
This commit is contained in:
Mike Krus 2020-01-09 11:36:39 +00:00
parent 65ed4fa2ff
commit df5a63b059
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/render/materialsystem/shaderbuilder.cpp
View File

@ -278,7 +278,7 @@ void ShaderBuilder::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
markDirty(AbstractRenderer::ShadersDirty);
}
static const std::pair<QShaderProgram::ShaderType, QUrl (QShaderProgramBuilder::*)() const> shaderTypesToGetters[] = {
static const QVector<std::pair<QShaderProgram::ShaderType, QUrl (QShaderProgramBuilder::*)() const>> shaderTypesToGetters = {
{QShaderProgram::Vertex, &QShaderProgramBuilder::vertexShaderGraph},
{QShaderProgram::TessellationControl, &QShaderProgramBuilder::tessellationControlShaderGraph},
{QShaderProgram::TessellationEvaluation, &QShaderProgramBuilder::tessellationEvaluationShaderGraph},
@ -287,7 +287,7 @@ void ShaderBuilder::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
{QShaderProgram::Compute, &QShaderProgramBuilder::computeShaderGraph},
};
for (auto it = std::cbegin(shaderTypesToGetters), end = std::cend(shaderTypesToGetters); it != end; ++it) {
for (auto it = shaderTypesToGetters.cbegin(), end = shaderTypesToGetters.cend(); it != end; ++it) {
const QUrl url = (node->*(it->second))();
if (url != m_graphs.value(it->first)) {
setShaderGraph(it->first, url);

4
src/render/renderers/opengl/renderer/renderviewbuilder.cpp
View File

@ -326,8 +326,8 @@ public:
filteredCommandData->reserve(renderableEntities.size());
// Because dataCacheForLeaf.renderableEntities or computeEntities are sorted
// What we get out of EntityRenderCommandData is also sorted by Entity
auto eIt = std::cbegin(renderableEntities);
const auto eEnd = std::cend(renderableEntities);
auto eIt = renderableEntities.cbegin();
const auto eEnd = renderableEntities.cend();
int cIt = 0;
const int cEnd = commandData.size();

4
tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp
View File

@ -143,6 +143,8 @@ private slots:
void checkStartupAndShutdownImmediately()
{
QSKIP("Fails on CI for some unexplained reason");
// GIVEN
QWindow *win = new QWindow();
win->setSurfaceType(QSurface::OpenGLSurface);
@ -170,6 +172,8 @@ private slots:
void checkStartupAndShutdownAfterAFewFrames()
{
QSKIP("Fails on CI for some unexplained reason");
// GIVEN
QWindow *win = new QWindow();
win->setSurfaceType(QSurface::OpenGLSurface);