summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2017-09-03 12:06:59 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2017-09-04 21:20:22 +0000
commite2a214855303f9579fc5c5e941a7e1a7e4080566 (patch)
tree615d69cc40440c318a7cdf5f7083763066f296e6
parentde18ae07cd3f036e8b9a873bf124369ec3b1c1ee (diff)
Remove dead sorting code
Change-Id: I4ca68d777c057c0430e42f34e99acde9f9eb9b03 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/render/backend/rendercommand.cpp1
-rw-r--r--src/render/backend/rendercommand_p.h2
-rw-r--r--src/render/backend/renderview.cpp20
-rw-r--r--src/render/backend/renderview_p.h1
4 files changed, 0 insertions, 24 deletions
diff --git a/src/render/backend/rendercommand.cpp b/src/render/backend/rendercommand.cpp
index 85c4858cf..e60b17668 100644
--- a/src/render/backend/rendercommand.cpp
+++ b/src/render/backend/rendercommand.cpp
@@ -49,7 +49,6 @@ RenderCommand::RenderCommand()
, m_depth(0.0f)
, m_changeCost(0)
, m_type(RenderCommand::Draw)
- , m_sortBackToFront(false)
, m_primitiveCount(0)
, m_primitiveType(QGeometryRenderer::Triangles)
, m_restartIndexValue(-1)
diff --git a/src/render/backend/rendercommand_p.h b/src/render/backend/rendercommand_p.h
index 57fb553b7..67e02d35b 100644
--- a/src/render/backend/rendercommand_p.h
+++ b/src/render/backend/rendercommand_p.h
@@ -101,8 +101,6 @@ public:
};
CommandType m_type;
-
- bool m_sortBackToFront;
int m_workGroups[3];
// Values filled for draw calls
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index c372f5c20..dca660ad0 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -652,7 +652,6 @@ QVector<RenderCommand *> RenderView::buildDrawRenderCommands(const QVector<Entit
command->m_verticesPerPatch = geometryRenderer->verticesPerPatch();
}
- prepareForSorting(command);
commands.append(command);
}
}
@@ -873,25 +872,6 @@ void RenderView::setDefaultUniformBlockShaderDataValue(ShaderParameterPack &unif
}
}
-void RenderView::prepareForSorting(RenderCommand *command) const
-{
- // Build a bitset key depending on the SortingCriterion
- const int sortCount = m_data.m_sortingTypes.count();
-
- // If sortCount == 0, no sorting is applied
-
- // Handle at most 4 filters at once
- for (int i = 0; i < sortCount && i < 4; i++) {
- switch (m_data.m_sortingTypes.at(i)) {
- case QSortPolicy::BackToFront:
- command->m_sortBackToFront = true; // Depth value
- break;
- default:
- break;
- }
- }
-}
-
void RenderView::setShaderAndUniforms(RenderCommand *command,
RenderPass *rPass,
ParameterInfoList &parameters,
diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h
index c7d242e44..bc68e2a63 100644
--- a/src/render/backend/renderview_p.h
+++ b/src/render/backend/renderview_p.h
@@ -375,7 +375,6 @@ private:
Shader *shader,
ShaderData *shaderData,
const QString &structName) const;
- void prepareForSorting(RenderCommand *command) const;
};
} // namespace Render