Revert "Use function object when unrolling args."

This reverts commit c5216e7cfff20b9f2afc3701abe758c7d1660448.
This commit is contained in:
vlj 2014-08-12 16:38:43 +02:00
parent 05a63ac595
commit d9be494db1

View File

@ -31,7 +31,6 @@
#include "utils/tuple.hpp"
#include <algorithm>
#include <functional>
namespace RenderGeometry
{
@ -530,11 +529,6 @@ void renderShadow(const std::vector<GLuint> TextureUnits, const std::vector<STK:
}
}
template<typename T, typename... Args>
std::function<void(Args...)> getLambda()
{
return [](Args...args) {draw<T>(T::getInstance(), args...); };
}
template<int N>
struct rsm_unroll_args_impl;
@ -545,8 +539,7 @@ struct rsm_unroll_args_impl<0>
template<typename T, typename ...Args>
static void exec(const core::matrix4 &rsm_matrix, const GLMesh *mesh, const STK::Tuple<Args...> &t, Args... args)
{
auto draw_func = getLambda<T, const GLMesh*, core::matrix4, Args...>();
draw_func(mesh, rsm_matrix, args...);
draw<T>(T::getInstance(), mesh, rsm_matrix, args...);
}
};