diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp b/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp index 7a028282c..be69bde50 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp @@ -69,11 +69,13 @@ namespace Nz::GL template bool Load(Func& func, const char* funcName, bool mandatory, bool implementFallback = true) { - FuncType originalFunc = LoadRaw(funcName); - func = originalFunc; + const Loader& loader = context.GetLoader(); + GLFunction originalFuncPtr = loader.LoadFunction(funcName); + + func = reinterpret_cast(originalFuncPtr); #if NAZARA_OPENGLRENDERER_DEBUG - if (originalFunc) + if (func) { if (std::strcmp(funcName, "glGetError") != 0) //< Prevent infinite recursion func = GLWrapper>::template WrapErrorHandling(); @@ -89,18 +91,11 @@ namespace Nz::GL } } - context.m_originalFunctionPointer[FuncIndex] = reinterpret_cast(originalFunc); + context.m_originalFunctionPointer[FuncIndex] = originalFuncPtr; return func != nullptr; } - template - FuncType LoadRaw(const char* funcName) - { - const Loader& loader = context.GetLoader(); - return reinterpret_cast(loader.LoadFunction(funcName)); - } - Context& context; };