Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Renderer] Added missing calling convention in FnPtr template declaration

Browse Source 
This fixes compilation of Windows x86 builds when creating template instantiations of FnPtr with functions using __stdcall.
This commit is contained in:
Thomas Roß 2024-10-27 15:49:21 +01:00
parent 73d2764573
commit 09a961988d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renderer/dyna_gl.h
View File

@ -63,7 +63,7 @@ inline void CheckError() {
template <typename T> struct FnPtr; template <typename T> struct FnPtr;
template <typename Ret, typename... Args> template <typename Ret, typename... Args>
struct FnPtr<Ret(Args...)> { struct FnPtr<Ret GLFUNCCALL(Args...)> {
explicit FnPtr(std::string_view name, bool optional = false); explicit FnPtr(std::string_view name, bool optional = false);
Ret operator()(Args... args) const { Ret operator()(Args... args) const {
@ -99,7 +99,7 @@ static void LoadGLFnPtrs() {
} }
template<typename Ret, typename... Args> template<typename Ret, typename... Args>
FnPtr<Ret(Args...)>::FnPtr(std::string_view name, bool optional) : fn_{} { FnPtr<Ret GLFUNCCALL(Args...)>::FnPtr(std::string_view name, bool optional) : fn_{} {
inits_.push_back(std::make_tuple(reinterpret_cast<void**>(&fn_), name, optional)); inits_.push_back(std::make_tuple(reinterpret_cast<void**>(&fn_), name, optional));
} }