From c19ac812f763982fc0e2b8254465f766bf99e687 Mon Sep 17 00:00:00 2001 From: Igor Novikov Date: Tue, 12 Dec 2017 16:52:15 +0500 Subject: [PATCH] Fix spamming of: Failed to find compiled list of textures. --- src/Layers/xrRender/r__dsgraph_render.cpp | 32 +++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Layers/xrRender/r__dsgraph_render.cpp b/src/Layers/xrRender/r__dsgraph_render.cpp index aefbcd60040..ef0e86c07d7 100644 --- a/src/Layers/xrRender/r__dsgraph_render.cpp +++ b/src/Layers/xrRender/r__dsgraph_render.cpp @@ -42,32 +42,32 @@ template IC bool cmp_ps_val_ssa(const T &lhs, const T &rhs) template IC bool cmp_textures_lex2(const T &lhs, const T &rhs) { - auto t1 = *lhs->key; - auto t2 = *rhs->key; + auto t1 = lhs->key; + auto t2 = rhs->key; - if (t1[0] < t2[0]) return true; - if (t1[0] > t2[0]) return false; - if (t1[1] < t2[1]) return true; + if ((*t1)[0] < (*t2)[0]) return true; + if ((*t1)[0] > (*t2)[0]) return false; + if ((*t1)[1] < (*t2)[1]) return true; else return false; } template IC bool cmp_textures_lex3(const T &lhs, const T &rhs) { - auto t1 = *lhs->key; - auto t2 = *rhs->key; - - if (t1[0] < t2[0]) return true; - if (t1[0] > t2[0]) return false; - if (t1[1] < t2[1]) return true; - if (t1[1] > t2[1]) return false; - if (t1[2] < t2[2]) return true; + auto t1 = lhs->key; + auto t2 = rhs->key; + + if ((*t1)[0] < (*t2)[0]) return true; + if ((*t1)[0] > (*t2)[0]) return false; + if ((*t1)[1] < (*t2)[1]) return true; + if ((*t1)[1] > (*t2)[1]) return false; + if ((*t1)[2] < (*t2)[2]) return true; else return false; } template IC bool cmp_textures_lexN(const T &lhs, const T &rhs) { - auto t1 = *lhs->key; - auto t2 = *rhs->key; + auto t1 = lhs->key; + auto t2 = rhs->key; - return std::lexicographical_compare(t1.begin(), t1.end(), t2.begin(), t2.end()); + return std::lexicographical_compare(t1->begin(), t1->end(), t2->begin(), t2->end()); } template void sort_tlist(xr_vector>& lst, T& textures)