diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2020-03-27 13:54:06 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-04-06 08:14:31 +0000 |
commit | 71c3fe053d34dbc258e5d73f8389d853e4d4bb14 (patch) | |
tree | 66bc2800b824aba30195a0c9510cd2b7a7b04a5d | |
parent | 0ebf47400335c1a08c0f75474d23d107b4cf277f (diff) |
Disable sorting commands by textures on Windows
As it leads to a runtime assert based on the fact that the sorting
predicate might return true for (a, b) and (b, a)
This disables that part until it is rewritten properly.
Change-Id: I0e90d02583d402599e7a38bf0c5cca6f2460a9a8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/render/renderers/opengl/renderer/renderview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/render/renderers/opengl/renderer/renderview.cpp b/src/render/renderers/opengl/renderer/renderview.cpp index ef15d7fcd..65e65da3d 100644 --- a/src/render/renderers/opengl/renderer/renderview.cpp +++ b/src/render/renderers/opengl/renderer/renderview.cpp @@ -431,6 +431,7 @@ struct SubRangeSorter<QSortPolicy::Texture> { static void sortSubRange(CommandIt begin, const CommandIt end) { +#ifndef Q_OS_WIN std::stable_sort(begin, end, [] (const RenderCommand &a, const RenderCommand &b) { QVector<ShaderParameterPack::NamedResource> texturesA = a.m_parameterPack.textures(); QVector<ShaderParameterPack::NamedResource> texturesB = b.m_parameterPack.textures(); @@ -449,6 +450,7 @@ struct SubRangeSorter<QSortPolicy::Texture> return identicalTextureCount < originalTextureASize; }); +#endif } }; |