mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

Add call convention for wgl functions

master
Allen Webster 2020-01-09 18:52:53 -08:00
parent 65bfe172c4
commit 2e21156e66
2 changed files with 622 additions and 622 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/4ed_build.cpp
View File

@ -472,7 +472,7 @@ build_main(Arena *arena, char *cdir, b32 update_local_theme, u32 flags, u32 arch
END_TIME_SECTION("move files"); END_TIME_SECTION("move files");
} }
fflush(stdout); fflush(stdout);
} }
internal void internal void
@ -539,7 +539,7 @@ package(Arena *arena, char *cdir){
printf("zip_dir: %s\n", zip_dir); printf("zip_dir: %s\n", zip_dir);
fflush(stdout); fflush(stdout);
buildsuper(arena, cdir, fm_str(arena, default_custom_target), arch); buildsuper(arena, cdir, fm_str(arena, default_custom_target), arch);
build_main(arena, cdir, false, flags, arch); build_main(arena, cdir, false, flags, arch);
fm_make_folder_if_missing(arena, parent_dir); fm_make_folder_if_missing(arena, parent_dir);
@ -584,20 +584,20 @@ int main(int argc, char **argv){
Assert(n < sizeof(cdir)); Assert(n < sizeof(cdir));
END_TIME_SECTION("current directory"); END_TIME_SECTION("current directory");
u32 flags = SUPER; u32 flags = DEBUG_INFO | SUPER;
u32 arch = Arch_X64; u32 arch = Arch_X64;
#if defined(DEV_BUILD) || defined(DEV_BUILD_X86) #if defined(DEV_BUILD) || defined(DEV_BUILD_X86)
flags |= DEBUG_INFO | INTERNAL; flags |= INTERNAL;
#endif #endif
#if defined(OPT_BUILD) || defined(OPT_BUILD_X86) #if defined(OPT_BUILD) || defined(OPT_BUILD_X86)
flags |= OPTIMIZATION; flags |= OPTIMIZATION;
#endif #endif
#if defined(DEV_BUILD_X86) || defined(OPT_BUILD_X86) #if defined(DEV_BUILD_X86) || defined(OPT_BUILD_X86)
arch = Arch_X86; arch = Arch_X86;
#endif #endif
#if defined(DEV_BUILD) || defined(OPT_BUILD) || defined(DEV_BUILD_X86) #if defined(DEV_BUILD) || defined(OPT_BUILD) || defined(DEV_BUILD_X86) || defined(OPT_BUILD_X86)
standard_build(&arena, cdir, flags, arch); standard_build(&arena, cdir, flags, arch);
#elif defined(PACKAGE) #elif defined(PACKAGE)
package(&arena, cdir); package(&arena, cdir);

18
platform_win32/win32_4ed.cpp
View File

@ -1241,10 +1241,10 @@ win32_wgl_good(Void_Func *f){
f != (Void_Func*)-1); f != (Void_Func*)-1);
} }
typedef HGLRC (wglCreateContextAttribsARB_Function)(HDC,HGLRC,i32*); typedef HGLRC (CALL_CONVENTION wglCreateContextAttribsARB_Function)(HDC,HGLRC,i32*);
typedef BOOL (wglChoosePixelFormatARB_Function)(HDC,i32*,f32*,u32,i32*,u32*); typedef BOOL (CALL_CONVENTION wglChoosePixelFormatARB_Function)(HDC,i32*,f32*,u32,i32*,u32*);
typedef char* (wglGetExtensionsStringEXT_Function)(); typedef char* (CALL_CONVENTION wglGetExtensionsStringEXT_Function)();
typedef VOID (wglSwapIntervalEXT_Function)(i32); typedef VOID (CALL_CONVENTION wglSwapIntervalEXT_Function)(i32);
global wglCreateContextAttribsARB_Function *wglCreateContextAttribsARB = 0; global wglCreateContextAttribsARB_Function *wglCreateContextAttribsARB = 0;
global wglChoosePixelFormatARB_Function *wglChoosePixelFormatARB = 0; global wglChoosePixelFormatARB_Function *wglChoosePixelFormatARB = 0;
@ -1309,7 +1309,7 @@ win32_gl_create_window(HWND *wnd_out, HGLRC *context_out, DWORD style, RECT rect
// NOTE(allen): Load wgl extensions // NOTE(allen): Load wgl extensions
#define LoadWGL(f,l) Stmnt((f) = (f##_Function*)wglGetProcAddress(#f); \ #define LoadWGL(f,l) Stmnt((f) = (f##_Function*)wglGetProcAddress(#f); \
(l) = (l) && win32_wgl_good((Void_Func*)(f));) (l) = (l) && win32_wgl_good((Void_Func*)(f));)
b32 load_success = true; b32 load_success = true;
LoadWGL(wglCreateContextAttribsARB, load_success); LoadWGL(wglCreateContextAttribsARB, load_success);
@ -1414,10 +1414,10 @@ win32_gl_create_window(HWND *wnd_out, HGLRC *context_out, DWORD style, RECT rect
/*0*/WGL_CONTEXT_MAJOR_VERSION_ARB, 3, /*0*/WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
/*2*/WGL_CONTEXT_MINOR_VERSION_ARB, 2, /*2*/WGL_CONTEXT_MINOR_VERSION_ARB, 2,
/*4*/WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB /*4*/WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB
#if GL_DEBUG_MODE #if GL_DEBUG_MODE
|WGL_CONTEXT_DEBUG_BIT_ARB |WGL_CONTEXT_DEBUG_BIT_ARB
#endif #endif
, ,
/*6*/WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB, /*6*/WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
/*8*/0 /*8*/0
}; };