ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-02-24 20:56:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed extension (and core) loading on windows.

Browse source
This commit is contained in:
the_fiddler 2011-12-06 15:14:58 +00:00
parent d8432cc521
commit bf90e156f3
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Source/Bind/CppSpecWriter.cs
View file

@ -42,14 +42,13 @@ namespace Bind
sealed class CppSpecWriter : ISpecWriter sealed class CppSpecWriter : ISpecWriter
{ {
readonly char[] numbers = "0123456789".ToCharArray(); readonly char[] numbers = "0123456789".ToCharArray();
const string AllowDeprecated = "ALLOW_DEPRECATED_GL"; const string AllowDeprecated = "GLPP_COMPATIBLE";
const string DigitPrefix = "T"; // Prefix for identifiers that start with a digit const string DigitPrefix = "T"; // Prefix for identifiers that start with a digit
const string OutputFileHeader = "gl++.h"; const string OutputFileHeader = "gl++.h";
#region Verbatim parts of output file #region Verbatim parts of output file
const string GetAddressDefinition = @" const string GetAddressDefinition = @"
namespace Internals namespace Internals
{ {
#if defined(_WIN32) #if defined(_WIN32)
@ -59,7 +58,25 @@ namespace Bind
typedef int (*PROC)(); typedef int (*PROC)();
extern void* __stdcall wglGetCurrentContext(); extern void* __stdcall wglGetCurrentContext();
extern PROC __stdcall wglGetProcAddress(const char *procname); extern PROC __stdcall wglGetProcAddress(const char *procname);
extern void* __stdcall LoadLibraryA(const char *libname);
extern PROC __stdcall GetProcAddress(void *module, const char *procname);
} }
inline void*& LoadGLAddress()
{
static void* address = LoadLibraryA(""opengl32.dll"");
return address;
}
inline void*& GetGLAddress()
{
static void* address = LoadGLAddress();
return address;
}
inline PROC winGetAddress(const char *procname)
{
PROC addr = GetProcAddress(GetGLAddress(), procname);
return addr ? addr : wglGetProcAddress(procname);
}
#elif !defined(__APPLE__) #elif !defined(__APPLE__)
extern ""C"" extern ""C""
{ {
@ -145,7 +162,7 @@ namespace Bind
inline void* GetAddress(const char* name) inline void* GetAddress(const char* name)
{ {
#if defined(_WIN32) #if defined(_WIN32)
return (void*)wglGetProcAddress(name); return (void*)winGetAddress(name);
#elif defined(__APPLE__) #elif defined(__APPLE__)
return (void*)NSGLGetProcAddress(name); return (void*)NSGLGetProcAddress(name);
#elif defined(__sgi) || defined(__sun) #elif defined(__sgi) || defined(__sun)