diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2020-03-27 13:54:06 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2020-03-30 17:10:12 +0100 |
| commit | eb7fc6b90c5138a9af3f83fb7aac58a8ea8b08c3 (patch) | |
| tree | d3cbba71f0aa3a345151a1316343b27376382870 | |
| parent | 08281b3661547688b19cdaa52d5cf7bbdc171f56 (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: Mike Krus <mike.krus@kdab.com>
| -rw-r--r-- | src/plugins/renderers/opengl/renderer/renderview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/renderers/opengl/renderer/renderview.cpp b/src/plugins/renderers/opengl/renderer/renderview.cpp index a15a1c66a..6e320e6d8 100644 --- a/src/plugins/renderers/opengl/renderer/renderview.cpp +++ b/src/plugins/renderers/opengl/renderer/renderview.cpp @@ -438,6 +438,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(); @@ -456,6 +457,7 @@ struct SubRangeSorter<QSortPolicy::Texture> return identicalTextureCount < originalTextureASize; }); +#endif } }; |